任务上报bug

Signed-off-by: liuyc <56808083@qq.com>

blade-service/blade-business/src/main/java/org/springblade/business/controller/ArchiveFileController.java

@@ -293,9 +293,7 @@ public class ArchiveFileController extends BladeController {
             taskVO.setReportUserId(SecureUtil.getUserId().toString());
             taskVO.setReportUserName(SecureUtil.getNickName());
 
-            //启动流程（不清楚为什么之前的开发在同一个服务内用feign调用）
-            /*this.taskClient.startTask(taskVO);*/
-            this.iTaskService.startApproval(taskVO);
+            this.taskClient.startTask(taskVO);
             //修改状态为待审批
             String[] archiveTaskIdArray = archiveTaskIds.split(",");
             boolean update = this.archiveFileService.update(Wrappers.<ArchiveFile>lambdaUpdate().set(ArchiveFile::getStatus, 1).in(ArchiveFile::getId, Arrays.asList(archiveTaskIdArray)));
@@ -345,9 +343,7 @@ public class ArchiveFileController extends BladeController {
                 taskVO.setReportUserId(SecureUtil.getUserId().toString());
                 taskVO.setReportUserName(SecureUtil.getNickName());
 
-                //启动流程（不清楚为什么之前的开发在同一个服务内用feign调用）
-                /*this.taskClient.startTask(taskVO);*/
-                this.iTaskService.startApproval(taskVO);
+                this.taskClient.startTask(taskVO);
                 //修改状态为待审批
                 String[] archiveTaskIdArray = id.split(",");
                 boolean update = this.archiveFileService.update(Wrappers.<ArchiveFile>lambdaUpdate().set(ArchiveFile::getStatus, 1).in(ArchiveFile::getId, Arrays.asList(archiveTaskIdArray)));

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -1271,9 +1271,7 @@ public class InformationWriteQueryController extends BladeController {
                         taskVO.setReportUserId(SecureUtil.getUserId().toString());
                         taskVO.setReportUserName(SecureUtil.getNickName());
 
-                        //启动流程（不清楚为什么之前的开发在同一个服务内用feign调用）
-                        /*if (this.taskClient.startTask(taskVO).getData()) {*/
-                        if (iTaskService.startApproval(taskVO)) {
+                        if (this.taskClient.startTask(taskVO).getData()) {
                             LambdaUpdateWrapper<InformationQuery> wrappers = Wrappers.lambdaUpdate();
                             wrappers.set(InformationQuery::getReportNumber, taskVO.getBatch()).set(InformationQuery::getStatus, 1);
 

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -964,14 +964,14 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                 return false;
             }
             //获取选择的固定流程
-            List<FixedFlowLink> links;
+            List<FixedFlowLink> links = new ArrayList<>();
             if (Long.valueOf("0").equals(vo.getFixedFlowId())) {
-                //自定义流程
-                links = new ArrayList<>();
                 //获取自定义流程
                 List<TaskVO.CustomUserTask> userTasks = vo.getUserTasks();
                 //设置人员及姓名
-                userTasks.forEach(userTask -> links.add(new FixedFlowLink(userTask.getUserName(), userTask.getUserId())));
+                for (TaskVO.CustomUserTask userTask : userTasks) {
+                    links.add(new FixedFlowLink(userTask.getUserName(), userTask.getUserId()));
+                }
 
             } else {
                 //预设流程
@@ -1417,7 +1417,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                 for (Task task : taskList) {
                     //重新保存
                     long startTime_1 = System.currentTimeMillis();
-                    R result = this.saveNodePdf(classify,queryMap.get(task.getFormDataId()), contractId, projectId, header);
+                    R result = this.saveNodePdf(classify, queryMap.get(task.getFormDataId()), contractId, projectId, header);
                     long endTime_1 = System.currentTimeMillis();
                     long executionTime_1 = endTime_1 - startTime_1;
                     log.info("saveNodePdf执行时间：" + executionTime_1 + " 毫秒");
@@ -1463,7 +1463,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
         throw new ServiceException("未获取到任务信息，操作失败！");
     }
 
-    R saveNodePdf(String classify,String nodePKeyIds, String contractId, String projectId, String header) throws Exception {
+    R saveNodePdf(String classify, String nodePKeyIds, String contractId, String projectId, String header) throws Exception {
         return excelTabClient.synPDFInfo(contractId, nodePKeyIds, classify, projectId, header);
     }