fix 78634 我的消息-预警消息 消息内容需修改

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationList.java

@@ -31,6 +31,10 @@ public class ProcessFbConsultationList implements Serializable {
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键ID")
     private java.lang.String id;
+    /**业务id*/
+    @Excel(name = "业务id", width = 15)
+    @ApiModelProperty(value = "业务id")
+    private java.lang.String businessId;
 	/**用户关联表id*/
 	@Excel(name = "用户关联表id", width = 15)
     @ApiModelProperty(value = "用户关联表id")

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java

@@ -113,7 +113,38 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
      **/
     @Override
     public void approveTask(ProcessInfoVO<ProcessFbStandardConsultationVO> processInfoVO, boolean pass) {
-        throw new JeroBootException("目前还未开发，请联系管理员");
+        BasicTaskInfoDTO taskInfo = processInfoVO.getBasicTaskInfoDTO(); // 任务信息
+
+        ProcessFbStandardConsultationVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); // 全部业务信息
+        ProcessFbStandardConsultation businessBasicInfo = businessInfoDTO.getProcessFbStandardConsultation(); // 业务基本信息
+        processInfoVO.setBusinessId(businessBasicInfo.getId());
+
+        String taskId = taskInfo.getTaskId();
+
+        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+        processHandleService.isMyTask(taskId); // 判断是否拥有任务处理权
+
+        Execution execution = runtimeService.createExecutionQuery().executionId(task.getExecutionId()).singleResult();
+
+        log.info("================================审批节点=================================");
+        log.info("任务Id: {}", task.getId());
+        log.info("TaskDefinitionKey: {}", task.getTaskDefinitionKey());
+        log.info("任务Name: {}", task.getName());
+        log.info("任务FormKey: {}", task.getFormKey());
+        log.info("任务ProcessInstanceId: {}", task.getProcessInstanceId());
+        log.info("任务ExecutionId: {}", task.getExecutionId());
+        log.info("任务父ExecutionId: {}", execution.getParentId());
+        log.info("=======================================================================");
+
+        if (pass) { // 同意
+            taskInfo.setCommitFlag(CommitFlagEnum.PASS.getValue());
+        } else { // 驳回
+            taskInfo.setCommitFlag(CommitFlagEnum.REJECT.getValue());
+            throw new JeroBootException("目前还未开发，请联系管理员");
+        }
+        processHandleService.updateApprovalRecord(processInfoVO);
+        // 完成任务
+        taskService.complete(taskId);
     }
 
     /**
@@ -177,8 +208,6 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
         ProcessFbStandardConsultation businessBasicInfo = businessInfoDTO.getProcessFbStandardConsultation(); // 业务基本信息
         processInfoVO.setBusinessId(businessBasicInfo.getId());
 
-        updateById(businessBasicInfo); // 更新业务基本信息
-
         String taskId = taskInfo.getTaskId();
 
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
@@ -199,19 +228,24 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
         log.info("任务父ExecutionId: {}", execution.getParentId());
         log.info("=======================================================================");
 
+        String realName = CurrentUserUtil.getRealName();
         switch (taskDefinitionKey) {
             case ConsultationTaskKey.DEPART_LEADER_START_1:
+                log.info("各部所主管级领导 {} 分发", realName);
                 processDepartLeaderStart_1(processInfoVO); // 各部所主管级领导分发
                 break;
             case ConsultationTaskKey.DESIGN_ENGINEER_1: // 设计工程师填写征求意见（分发给模块负责人）
             case ConsultationTaskKey.DESIGN_ENGINEER_2: // 设计工程师填写征求意见（不分发给模块负责人）
+                log.info("设计工程师 {} 填写征求意见", realName);
                 designEngineer(processInfoVO);
                 break;
             case ConsultationTaskKey.MODULE_OWNER_END_1: // 模块负责人汇总填写意见（可跳过）
             case ConsultationTaskKey.DEPART_LEADER_COLLECT_2: // 各部所主管级领导汇总（不分发给模块负责人）
+                log.info("{} 汇总", realName);
                 collect(processInfoVO);
                 break;
             case ConsultationTaskKey.MODULE_OWNER_START: // 模块负责人分发
+                log.info("模块负责人 {} 分发", realName);
                 moduleOwnerStart(processInfoVO);
                 break;
             default:
@@ -244,7 +278,6 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
 
         designEngineerIdList.forEach(designEngineer -> {
             ProcessFbConsultationUserLink userLink = new ProcessFbConsultationUserLink();
-            userLink.setId(UUIDUtils.randomUUID20());
             userLink.setUserType(processFbConsultationUserLink.getUserType());
             userLink.setBusinessId(processFbConsultationUserLink.getBusinessId());
             userLink.setDepartLeaderId(processFbConsultationUserLink.getDepartLeaderId());
@@ -292,6 +325,7 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
     private void designEngineer(ProcessInfoVO<ProcessFbStandardConsultationVO> processInfoVO) {
         ProcessFbStandardConsultationVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); // 全部业务信息
         List<ProcessFbConsultationList> processFbConsultationLists = businessInfoDTO.getProcessFbConsultationLists();
+        String businessId = processInfoVO.getBusinessId();
 
         String taskId = processInfoVO.getBasicTaskInfoDTO().getTaskId();
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
@@ -306,7 +340,10 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
 
         // 保存业务信息
         if (CollectionUtils.isNotEmpty(processFbConsultationLists)) {
-            processFbConsultationLists.forEach(consultation -> consultation.setUserLinkId(userLinkId));
+            processFbConsultationLists.forEach(consultation -> {
+                consultation.setUserLinkId(userLinkId);
+                consultation.setBusinessId(businessId);
+            });
             processFbConsultationListService.saveBatch(processFbConsultationLists, processFbConsultationLists.size());
         }
 

laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java

@@ -163,7 +163,7 @@ public class LawsStandardEarlyWarningServiceImpl implements ILawsStandardEarlyWa
                     e.printStackTrace();
                     throw new JeroBootException("时间格式转换错误");
                 }
-                long days = getBetweenDays(date, toDay);
+                long days = getBetweenDays(toDay, date);
                 map.put("days", days + "");
                 sendMessageDTO.setMap(map);
                 sendMessageAPI.sendMessage(sendMessageDTO);