diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java index f7a75ed2..6f1b4c67 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java @@ -199,6 +199,14 @@ public class WorkCenterController { processHandleService.transfer(param.getTaskId(), param.getUserId()); return Result.OK(); } - + /** + * 催办 + */ + @ApiOperation(value="催办") + @PostMapping("/urging") + public Result urging(@RequestBody DelegateTaskParam param) { + processAllService.urging(param.getTaskId()); + return Result.OK(); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java index f6521d9e..e99c26f6 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.api.dto.message.SendMessageDTO; +import com.jero.common.api.vo.SendMessageAPI; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; @@ -14,6 +16,7 @@ import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.vo.DelegateTaskParam; import com.jero.modules.activiti.vo.ResolveTaskParam; import com.jero.common.api.vo.ResultCommon; +import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon; import org.activiti.engine.HistoryService; import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; @@ -23,9 +26,7 @@ import org.activiti.engine.task.Task; import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.Date; -import java.util.List; -import java.util.Objects; +import java.util.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.activiti.mapper.ProcessAllMapper; @@ -47,6 +48,8 @@ public class ProcessAllService extends ServiceImpl private TaskService taskService; @Resource private HistoryService historyService; + @Resource + private SendMessageAPI sendMessageAPI; public ProcessAll getByProcessInstanceId(String processInstanceId){ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -154,4 +157,21 @@ public class ProcessAllService extends ServiceImpl approvalRecordService.update(updateWrapper1); } + public void urging(String taskId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProcessApprovalRecord::getTaskId,taskId); + ProcessApprovalRecord approvalRecord = approvalRecordService.getOne(wrapper); + String processInstanceId = approvalRecord.getProcessInstanceId(); + //获得流程总表 + ProcessAll processAll = getByProcessInstanceId(processInstanceId); + + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.URGING); + sendMessageDTO.setToUserId(approvalRecord.getUserId()); + Map sendMap = new HashMap<>(); + sendMap.put("prcNum", processAll.getPrcNum()); + sendMap.put("prcName", processAll.getPrcName()); + sendMessageDTO.setMap(sendMap); + sendMessageAPI.sendMessage(sendMessageDTO); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java index 74a2db25..f1899d67 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java @@ -20,5 +20,6 @@ public class MessageTemplateCodeCommon { public static final String STANDARD_CHANGE_REPLACE = "standard_change_replace"; // 【法规变更】代替/被代替标准变更 public static final String STANDARD_CHANGE_REFERENCE = "standard_change_reference"; // 【法规变更】引用标准变更 public static final String STANDARD_CONSULTATION = "standard_consultation"; // 【征求意见结果提醒】 - public static final String PROJECT_ASSESS_COMPLETE = "项目合规评估完成提醒"; // 【项目合规评估完成提醒】 + public static final String PROJECT_ASSESS_COMPLETE = "project_assess_complete"; // 【项目合规评估完成提醒】 + public static final String URGING = "urging"; // 催办 }