From 428a2b0c2d3b3a41fc7059b11f45b4fc11301396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 11 Jul 2024 11:23:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=96=B0=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activiti/enums/ProcessTypeEnum.java | 2 +- .../impl/ProcessHandleServiceImpl.java | 1 - .../ProcessNewStandardImportController.java | 5 ++- .../ni/entity/ProcessNewStandardImport.java | 4 ++ ... ProcessNewStandardImportEndListener.java} | 12 ++++-- .../xml/ProcessNewStandardImportMapper.xml | 6 +-- .../IProcessNewStandardImportService.java | 3 +- .../ProcessNewStandardImportServiceImpl.java | 42 ++++++++++++++++--- 8 files changed, 59 insertions(+), 16 deletions(-) rename laws-modules/src/main/java/com/jero/modules/activiti/process/ni/listener/{ProcessNewStandardImportFlowListener.java => ProcessNewStandardImportEndListener.java} (52%) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java b/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java index 19fac3e8..ef598d76 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java @@ -11,7 +11,7 @@ import lombok.Getter; @AllArgsConstructor public enum ProcessTypeEnum { DEMO("测试流程", 0, "com.jero.modules.activiti.process.demo.service.ProcessDemoService", "/workCenter/StandardEntryOrChangeProcess", "/workCenter/StandardEntryOrChangeProcess"), - NEW_STANDARD_IMPORT("新法规导入流程", 1, "com.jero.modules.activiti.process.ni.service.ProcessNewStandardImportService", "/workCenter/ProcessNewStandardImportProcess", "/workCenter/StandardComplianceCheckProcess"), + NEW_STANDARD_IMPORT("新法规导入流程", 1, "com.jero.modules.activiti.process.ni.service.impl.ProcessNewStandardImportServiceImpl", "/workCenter/ProcessNewStandardImportProcess", "/workCenter/StandardComplianceCheckProcess"), STANDARD_INTERPRET("标准解读流程", 2, "com.jero.modules.activiti.process.standardinterpret.service.impl.StandardInterpretFlow", "", ""), STANDARD_COMPLIANCE_CHECK("法规符合性排查流程", 3, "com.jero.modules.activiti.process.standardComplianceCheck.service.ProcessStandardComplianceCheckService", "/workCenter/StandardComplianceCheckProcess", "/workCenter/StandardComplianceCheckProcess"), MARKET_STANDARD_PUBLISH("市场清单发布流程", 4, "com.jero.modules.activiti.process.ni.service.ProcessNewStandardImportService", "/workCenter/ProcessNewStandardImportProcess", "/workCenter/StandardComplianceCheckProcess"), diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java index aa36b7f8..b26f09c9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java @@ -188,7 +188,6 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { * @Description: 转办 **/ @Override - @Transactional(rollbackFor = JeroBootException.class) public void transfer(String taskId, String toUserId) { isMyTask(taskId); // 判断是否拥有任务处理权限 ProcessApprovalRecord processApprovalRecord = processApprovalRecordService.getToDoByTaskId(taskId); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/controller/ProcessNewStandardImportController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/controller/ProcessNewStandardImportController.java index df244986..0707c810 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/controller/ProcessNewStandardImportController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/controller/ProcessNewStandardImportController.java @@ -12,6 +12,7 @@ import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport; import com.jero.modules.activiti.process.ni.service.IProcessNewStandardImportService; +import com.jero.modules.activiti.vo.DelegateTaskParam; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -95,8 +96,8 @@ public class ProcessNewStandardImportController extends JeroController transfer(@RequestBody TransferVO transferVO) { - processHandleService.transfer(transferVO.getTaskId(), transferVO.getUserId()); + public Result transfer(@RequestBody DelegateTaskParam param) { + processHandleService.transfer(param.getTaskId(), param.getUserId()); return Result.OK(); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/entity/ProcessNewStandardImport.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/entity/ProcessNewStandardImport.java index 9933b7d3..de509143 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/entity/ProcessNewStandardImport.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/entity/ProcessNewStandardImport.java @@ -87,6 +87,10 @@ public class ProcessNewStandardImport implements Serializable { @ApiModelProperty(value = "标准类型") @Dict(dicCode = "standard_type") private String standardCategory; + /**实施日期*/ + @ApiModelProperty(value = "实施日期") + @TableField(exist = false) + private String implementationDate; /**标准名称*/ @ApiModelProperty(value = "标准名称") @TableField(exist = false) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/listener/ProcessNewStandardImportFlowListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/listener/ProcessNewStandardImportEndListener.java similarity index 52% rename from laws-modules/src/main/java/com/jero/modules/activiti/process/ni/listener/ProcessNewStandardImportFlowListener.java rename to laws-modules/src/main/java/com/jero/modules/activiti/process/ni/listener/ProcessNewStandardImportEndListener.java index 593f1456..f542b9bc 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/listener/ProcessNewStandardImportFlowListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/listener/ProcessNewStandardImportEndListener.java @@ -1,10 +1,16 @@ package com.jero.modules.activiti.process.ni.listener; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.jero.common.util.SpringContextUtils; +import com.jero.modules.activiti.process.common.enums.StandardStateEnum; import com.jero.modules.activiti.process.ni.service.IProcessNewStandardImportService; import com.jero.modules.activiti.process.standardinterpret.service.StandardInterpretFlowService; +import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import lombok.extern.slf4j.Slf4j; +import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.ExecutionListener; import org.activiti.engine.delegate.TaskListener; import org.springframework.stereotype.Component; @@ -16,13 +22,13 @@ import javax.annotation.Resource; */ @Slf4j @Component -public class ProcessNewStandardImportFlowListener implements TaskListener { +public class ProcessNewStandardImportEndListener implements ExecutionListener { @Resource private IProcessNewStandardImportService processNewStandardImportService; @Override - public void notify(DelegateTask delegateTask) { - processNewStandardImportService.flowListener(delegateTask); + public void notify(DelegateExecution delegateExecution) { + processNewStandardImportService.flowListener(delegateExecution); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/mapper/xml/ProcessNewStandardImportMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/mapper/xml/ProcessNewStandardImportMapper.xml index ae58cb39..df5404e7 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/mapper/xml/ProcessNewStandardImportMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/mapper/xml/ProcessNewStandardImportMapper.xml @@ -5,12 +5,12 @@ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/IProcessNewStandardImportService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/IProcessNewStandardImportService.java index cb85a12e..c1a186c2 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/IProcessNewStandardImportService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/IProcessNewStandardImportService.java @@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.ni.service; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport; +import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.DelegateTask; import org.springframework.web.multipart.MultipartFile; @@ -25,5 +26,5 @@ public interface IProcessNewStandardImportService extends IService implements IProcessNewStandardImportService { @@ -65,6 +71,9 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl processInfoVO) { @@ -99,6 +108,7 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl queryWrapperProcessNewStandardImport = new LambdaQueryWrapper<>(); + queryWrapperProcessNewStandardImport.eq(ProcessNewStandardImport::getProcessInstanceId, processInstanceId); + ProcessNewStandardImport processNewStandardImport = getOne(queryWrapperProcessNewStandardImport,false); + if(Objects.isNull(processNewStandardImport)){ + return; + } + String copyUser = processNewStandardImport.getCopyUser(); + ProcessNewStandardImport standardImport = processNewStandardImportMapper. + getStandardNameById(processNewStandardImport.getStandardId()); + if(Objects.isNull(standardImport)){ + return; + } + // 流程Key + String processDefinitionKey = ProcessType.NEW_STANDARD_IMPORT.getProcessKey(); + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + sendMessageDTO.setTemplateCode(processDefinitionKey); + sendMessageDTO.setToUserId(copyUser); + Map sendMap = new HashMap<>(); + sendMap.put("standardNumber", standardImport.getStandardNumber()); + sendMap.put("standardName", standardImport.getStandardName()); + sendMessageDTO.setMap(sendMap); + sendMessageAPI.sendMessage(sendMessageDTO); } @Override @@ -196,8 +230,6 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl result = new ProcessInfoVO<>(); - String userId = actFlowCommonService.getOriginTaskAssignee(taskId); - String executionId = taskService.createTaskQuery().taskId(taskId).singleResult().getExecutionId(); // 使用流程引擎根据taskId找到流程实例Id String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId); // 获取流程通用数据 @@ -222,7 +254,7 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl