cr пре 1 месец
родитељ
комит
5b895464f6

+ 7 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/NodeBaseInfoController.java

@@ -37,6 +37,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.manager.entity.WbsTreeContract;
 import org.springblade.manager.service.IExcelTabService;
 import org.springblade.manager.service.IWbsTreeContractService;
+import org.springblade.manager.utils.RandomNumberHolder;
 import org.springblade.manager.vo.AppWbsTreeContractVO;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -158,7 +159,12 @@ public class NodeBaseInfoController extends BladeController {
                 this.synPDFInfo(wbsTreeContract.get(0).getContractId(), nodeBaseInfo.getNodeId()+"", "2", wbsTreeContract.get(0).getProjectId(),dataMap2);
             }
         }
-        return R.status(update);
+        String logMessage = RandomNumberHolder.getLogMessage();
+        RandomNumberHolder.clearLogMessage();
+        if(StringUtils.isNotEmpty(logMessage)){
+            return R.success("保存成功,表单"+logMessage+" 刷新失败");
+        }
+        return R.success("保存成功");
 	}
 
 

+ 4 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -1330,6 +1330,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 for (TableInfo tableInfo : tableInfoList) {
                     WbsTreeContract wbsTreeContract = wbsTreeContractService.getBaseMapper().selectOne(Wrappers.<WbsTreeContract>query().lambda()
                             .eq(WbsTreeContract::getPKeyId, tableInfo.getPkeyId()));
+                    StringBuilder tableName = new StringBuilder("");
                     if (wbsTreeContract == null) {
                         continue;
                     }
@@ -1408,10 +1409,12 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                             log.append(e.getMessage()).append("@@");
                             e.printStackTrace();
                             return R.fail(reason(e.getMessage()));
+                        }else {
+                            tableName.append(wbsTreeContract.getNodeName()+",");
+                            RandomNumberHolder.setLogMessage(tableName.toString());
                         }
                     }
                 }
-
                 //获取节点
                 WbsTreeContract wbsTreeContract = this.wbsTreeContractService.getOne(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getPKeyId, tableInfoList.get(0).getPkeyId()));
                 WbsTreeContract wbsTreeContractByP = wbsTreeContractService.getBaseMapper().selectOne(Wrappers.<WbsTreeContract>query().lambda()

+ 12 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/utils/RandomNumberHolder.java

@@ -9,7 +9,8 @@ public class RandomNumberHolder {
         private static final ThreadLocal<HashMap<Long,String>> randomNumberThreadLocal = new ThreadLocal<>();
         private static final ThreadLocal<Integer> randomTemplateTypeThreadLocal = new ThreadLocal<>();
         private static final ThreadLocal<List<WbsTreeContract>> randomWbsTreeContractThreadLocal = new ThreadLocal<>();
-    private static final ThreadLocal<Long> randomTrialSelfInspectionRecordGroupId = new ThreadLocal<>();
+        private static final ThreadLocal<Long> randomTrialSelfInspectionRecordGroupId = new ThreadLocal<>();
+        private static final ThreadLocal<String> LogMessage =new ThreadLocal<>();
 
     public static void setRandomNumber(HashMap<Long,String> map) {
         randomNumberThreadLocal.set(map);
@@ -57,5 +58,15 @@ public class RandomNumberHolder {
     public static void clearTrialSelfInspectionRecordGroupId() {
         randomTrialSelfInspectionRecordGroupId.remove();
     }
+
+    public static String getLogMessage() {
+    	return LogMessage.get();
+    }
+    public static void setLogMessage(String logMessage) {
+    	LogMessage.set(logMessage);
+    }
+    public static void clearLogMessage() {
+    	LogMessage.remove();
+    }
 }