废除任务节点颜色

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

@@ -381,7 +381,7 @@ public class TaskController extends BladeController {
                     String userId = entry.getKey();
                     if (userId.equals(AuthUtil.getUserId().toString())) { //只推送当前用户
                         String projectAndContractId = entry.getValue();
-                        if (StringUtils.isNotEmpty(projectAndContractId) && StringUtils.isNotEmpty(userId)) {
+                        if (StringUtils.isNotEmpty(projectAndContractId) && StringUtils.isNotEmpty(userId) && projectAndContractId.contains(",")) {
                             String projectId = projectAndContractId.split(",")[0];
                             String contractId = projectAndContractId.split(",")[1];
                             Map<String, String> stringMap = iTaskService.getTaskCount(projectId, contractId, userId);

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

@@ -214,7 +214,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
         if (query != null) {
             // 添加项目Id
             ProjectInfo projectInfo = this.projectClient.getById(query.getProjectId() + "");
-            vo.setRemarkType(projectInfo.getRemarkType()+"");
+            vo.setRemarkType(projectInfo.getRemarkType() + "");
 
             if (new Integer("3").equals(query.getType())) {
                 //首件，首件的资料由三个部分组成：封面、关联资料、总结报告
@@ -556,7 +556,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
         List<TaskBatch> taskList = new ArrayList<>();
         for (TaskApprovalVO taskApprovalVO : taskApprovalVOS) {
             //重签时，需要对应任务的签字人
-            if (ObjectUtil.isNotEmpty(taskApprovalVO.getYsNickName())){
+            if (ObjectUtil.isNotEmpty(taskApprovalVO.getYsNickName())) {
                 nickName = taskApprovalVO.getYsNickName();
             }
 
@@ -576,12 +576,12 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
         //执行代码
         logger.debug("扫描开始");
 
-      //  List<TaskBatch> maps = taskBatchService.getBaseMapper().selectList(Wrappers.<TaskBatch>lambdaQuery().eq(TaskBatch::getIsDeleted, 0)).stream().limit(50).collect(Collectors.toList());
+        //  List<TaskBatch> maps = taskBatchService.getBaseMapper().selectList(Wrappers.<TaskBatch>lambdaQuery().eq(TaskBatch::getIsDeleted, 0)).stream().limit(50).collect(Collectors.toList());
 
         List<TaskBatch> maps = taskBatchService.queryDataInfo();
 
 
-        if (maps != null && maps.size() >= 1 && executor.getQueue().size()<=0) {
+        if (maps != null && maps.size() >= 1 && executor.getQueue().size() <= 0) {
             for (TaskBatch dataInfo : maps) {
                 String jsonData = dataInfo.getJsonData();
                 TaskApprovalVO taskApprovalVO = JSON.parseObject(jsonData, TaskApprovalVO.class);
@@ -627,7 +627,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
         String pdfUrlEVisa = this.completeApprovalTask(taskApprovalVO);
 
 
-        System.out.println("电签操作成功buss-----" + pdfUrlEVisa+"---batchId="+batchId);
+        System.out.println("电签操作成功buss-----" + pdfUrlEVisa + "---batchId=" + batchId);
         //TODO ============== 电签成功，修改试验状态，关联工程部位信息pdf（只有电签成功，才修改） liuYc 2023-03-16 ==============
         if ("OK".equals(taskApprovalVO.getFlag()) && StringUtils.isNotEmpty(pdfUrlEVisa)) {
             //已审批
@@ -673,12 +673,12 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
             //todo ============================ 执行电签区域 ============================
 
             //电签状态分为success/notPfxOrFile/error,当状态为error时就需要重新提交请求
-            if(eVisaStatus==null || StringUtils.isEmpty(eVisaStatus)){
+            if (eVisaStatus == null || StringUtils.isEmpty(eVisaStatus)) {
                 this.taskBatchService.update(Wrappers.<TaskBatch>lambdaUpdate()
                         .set(TaskBatch::getIsDeleted, 4)
                         .eq(TaskBatch::getId, taskApprovalVO.getId())
                 );
-            }else if ("success".equals(eVisaStatus) || eVisaStatus.contains("success")) {
+            } else if ("success".equals(eVisaStatus) || eVisaStatus.contains("success")) {
                 //审批通过会返回签章成功的文件，需要设置替换
                 //完成/审批当前分支流程
                 this.newFlowClient.completeApprovalTask(taskId, parallelProcessInstanceId, comment).getData();
@@ -712,15 +712,15 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                     //todo ===================== 执行合同章
 
                     //根据主表的业务ID（processInstanceId）获取主流程的taskId
-                 //   String masterTaskId = this.newFlowClient.queryTaskIdByProcessInstanceId(masterTask.getProcessInstanceId());
-                   // if (StringUtils.isNotEmpty(masterTaskId)) {
-                        //完成流程
-                      //  this.newFlowClient.completeApprovalTask(taskId, masterTask.getProcessInstanceId(), "审批完成");
-                        //修改主流程状态为已完成
-                        this.update(Wrappers.<Task>lambdaUpdate().set(Task::getStatus, 2).set(Task::getUpdateTime, new Date()).eq(Task::getId, masterTask.getId()));
-                        //修改对应的业务数据状态为已审批
-                        this.updateBusinessDataByFormDataId(masterTask, 2, finalPdfUrl, taskApprovalVO.getUserId());
-                  //  }
+                    //   String masterTaskId = this.newFlowClient.queryTaskIdByProcessInstanceId(masterTask.getProcessInstanceId());
+                    // if (StringUtils.isNotEmpty(masterTaskId)) {
+                    //完成流程
+                    //  this.newFlowClient.completeApprovalTask(taskId, masterTask.getProcessInstanceId(), "审批完成");
+                    //修改主流程状态为已完成
+                    this.update(Wrappers.<Task>lambdaUpdate().set(Task::getStatus, 2).set(Task::getUpdateTime, new Date()).eq(Task::getId, masterTask.getId()));
+                    //修改对应的业务数据状态为已审批
+                    this.updateBusinessDataByFormDataId(masterTask, 2, finalPdfUrl, taskApprovalVO.getUserId());
+                    //  }
                     //返回电签成功的pdf路径，给试验用
                     return finalPdfUrl;
                 } else {
@@ -1088,7 +1088,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
             for (String iId : list) {
                 //获取
                 InformationQuery queryinfo = informationQueryService.getById(iId);
-                if (StringUtils.isNotBlank(queryinfo.getFileUserIdAndName())){
+                if (StringUtils.isNotBlank(queryinfo.getFileUserIdAndName())) {
                     String userIdAndName = queryinfo.getFileUserIdAndName();
                     String[] split = userIdAndName.split("-");
                     userId = Long.parseLong(split[0]);
@@ -1132,8 +1132,13 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                         .set(InformationQuery::getBusinessTime, dateInfo)
                         .in(InformationQuery::getId, Arrays.asList(formDataId.split(","))));
 
+                //如果废除后，那么删除当前合同段缓存
+                if (status == 3) {
+                    informationQueryService.delAsyncWbsTree(queryinfo.getContractId().toString());
+                }
+
                 //修改试验业务状态
-                if (new Integer(2).equals(queryinfo.getType()) && ObjectUtil.isNotEmpty(queryinfo.getWbsId())) {
+                if (new Integer(2).equals(queryinfo.getType()) && ObjectUtil.isNotEmpty(queryinfo.getWbsId()) && status != 3) {
                     jdbcTemplate.execute("update u_trial_self_inspection_record set task_status = '已审批' where id = " + queryinfo.getWbsId());
                 }