From 8b29dc75bec0d5f9d1023647f3f4336a7b2d277d Mon Sep 17 00:00:00 2001 From: liao Date: Wed, 22 Nov 2023 09:58:38 +0800 Subject: [PATCH] =?UTF-8?q?fix=2078634=20=E6=88=91=E7=9A=84=E6=B6=88?= =?UTF-8?q?=E6=81=AF-=E9=A2=84=E8=AD=A6=E6=B6=88=E6=81=AF=20=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E5=86=85=E5=AE=B9=E9=9C=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fb/entity/ProcessFbConsultationList.java | 4 ++ ...cessFbStandardConsultationServiceImpl.java | 47 +++++++++++++++++-- .../LawsStandardEarlyWarningServiceImpl.java | 2 +- 3 files changed, 47 insertions(+), 6 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationList.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationList.java index cb1c6e28..e395c07a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationList.java +++ b/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") diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java index 88912fb4..008af485 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java @@ -113,7 +113,38 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl 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 { 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 processInfoVO) { ProcessFbStandardConsultationVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); // 全部业务信息 List 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 consultation.setUserLinkId(userLinkId)); + processFbConsultationLists.forEach(consultation -> { + consultation.setUserLinkId(userLinkId); + consultation.setBusinessId(businessId); + }); processFbConsultationListService.saveBatch(processFbConsultationLists, processFbConsultationLists.size()); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java index 49de8f8f..2307cb31 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java +++ b/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);