调整部分接口

blade-ops/blade-flow/src/main/java/org/springblade/flow/business/feign/NewFlowClientImpl.java

@@ -62,7 +62,11 @@ public class NewFlowClientImpl implements NewFlowClient {
     public R<Boolean> completeApprovalTask(String taskId, String processInstanceId, String comment) {
         //添加审批意见
         if(StringUtils.isNoneBlank(processInstanceId, comment)){
-            this.taskService.addComment(taskId, processInstanceId, comment);
+            try{
+                this.taskService.addComment(taskId, processInstanceId, comment);
+            }catch (Exception e){
+                e.printStackTrace();
+            }
         }
         //完成任务
         this.taskService.complete(taskId, Kv.create());

blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.xml

@@ -125,6 +125,7 @@
                     wtc.contract_id = #{contractId}
                 and wtc.parent_id = #{parentId}
                 and wtc.is_deleted= '0'
+                AND wtc.type = #{classify}
                 group by wtc.p_key_id
             ) AS querys
         ) AS querys ON wtc.p_key_id = querys.pKeyId

blade-service/blade-manager/src/main/java/org/springblade/manager/bean/TableInfo.java

@@ -23,4 +23,9 @@ public class TableInfo {
      */
     private String isFirst;
 
+    /**
+     * huangjn 2022-09-14 15:27 是否是日志填报
+     */
+    private String isTheLog;
+
 }

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

@@ -170,6 +170,12 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 				}
 				//huangjn 判断是否是首件
 
+				//huangjn 判断是否是日志
+				if(dataInfo2.containsKey("isTheLog")){
+					tableInfo.setIsTheLog(dataInfo2.getString("isTheLog"));
+				}
+				//huangjn 判断是否是日志
+
 				dataInfo2.fluentRemove("contractId")
 						 .fluentRemove("pkeyId")
 						 .fluentRemove("p_key_id")
@@ -178,6 +184,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 				         .fluentRemove("pickerKey")
 				         .fluentRemove("id")
 						 .fluentRemove("isFirst")
+						 .fluentRemove("isTheLog")
 				         .fluentRemove("");
 				// 计算数据
 				LinkedHashMap<String,List<String>> dataMap =dataInfo2.keySet().stream().filter(e->e.contains("__")).collect(Collectors.groupingBy(e->e.split("__")[0], LinkedHashMap<String,List<String>>::new,Collectors.toList()));
@@ -279,15 +286,6 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 				valStr=valStr.substring(0,valStr.lastIndexOf(","));
 				sqlInfo = sqlInfo + keyStr+") VALUES (" +valStr +")";
 
-				WbsTreeContract wbsTreeContractByP = wbsTreeContractService.getBaseMapper().selectOne(Wrappers.<WbsTreeContract>query().lambda()
-							.eq(WbsTreeContract::getId, wbsTreeContract.getParentId()).eq(WbsTreeContract::getContractId,tableInfo.getContractId()));
-					//处理文件提名
-				String fileName = this.wbsParamService.createFileTitle(Func.isNotEmpty(wbsTreeContractByP.getOldId())? Long.valueOf(wbsTreeContractByP.getOldId()) :wbsTreeContractByP.getId(), Long.parseLong(wbsTreeContractByP.getContractId()));
-					fileName = StringUtils.isNotEmpty(fileName) ? fileName : "缺少文件提名配置";
-
-					//huangjn 保存成功后调用生成资料查询列表数据
-				this.informationQueryClient.saveOrUpdateInformationQueryData(wbsTreeContractByP.getPKeyId()+"", "业务ID(主要将来给首件使用)", fileName, Integer.parseInt(tableInfo.getClassify()), 2,"是否是首件(临时，暂时没用到)");
-
 				UpdateWrapper<WbsTreeContract> updateWrapper = new UpdateWrapper<>();
 				updateWrapper.in("p_key_id",tableInfo.getPkeyId());
 				updateWrapper.set("is_tab_pdf",2);
@@ -297,6 +295,22 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 				// pdf 预览添加
 			   //this.getBussPdfInfo(Long.parseLong(tableInfo.getPkeyId()));
 			}
+
+			try{
+				//获取节点
+				WbsTreeContract wbsTreeContract = this.wbsTreeContractService.getOne(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getPKeyId, tableInfoList.get(0).getPkeyId()));
+
+				WbsTreeContract wbsTreeContractByP = wbsTreeContractService.getBaseMapper().selectOne(Wrappers.<WbsTreeContract>query().lambda()
+						.eq(WbsTreeContract::getId, wbsTreeContract.getParentId()).eq(WbsTreeContract::getContractId, wbsTreeContract.getContractId()));
+				//处理文件提名
+				String fileName = this.wbsParamService.createFileTitle(Func.isNotEmpty(wbsTreeContractByP.getOldId())? Long.valueOf(wbsTreeContractByP.getOldId()) :wbsTreeContractByP.getId(), Long.parseLong(wbsTreeContractByP.getContractId()));
+				fileName = StringUtils.isNotEmpty(fileName) ? fileName : "缺少文件提名配置";
+
+				//huangjn 保存成功后调用生成资料查询列表数据
+				this.informationQueryClient.saveOrUpdateInformationQueryData(wbsTreeContractByP.getPKeyId()+"", "业务ID(主要将来给首件使用)", fileName, Integer.parseInt(tableInfoList.get(0).getClassify()), 2,"是否是首件(临时，暂时没用到)");
+			}catch (Exception e){
+				e.printStackTrace();
+			}
 		}
 	}