diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardPurchaseController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardPurchaseController.java index 6c424d24..2c5d63ea 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardPurchaseController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardPurchaseController.java @@ -98,9 +98,9 @@ public class ProcessFbStandardPurchaseController extends JeroController carbonCopy(@RequestParam(name = "processInstanceId") String processInstanceId, - @RequestParam(name = "userIds") String userIds) { - processFbStandardPurchaseService.carbonCopy(processInstanceId, userIds); + public Result carbonCopy(@RequestParam(name = "taskId") String taskId, + @RequestParam(name = "userId") String userIds) { + processFbStandardPurchaseService.carbonCopy(taskId, userIds); return Result.OK(); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardPurchaseService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardPurchaseService.java index de667bf8..98ea5ba3 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardPurchaseService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardPurchaseService.java @@ -62,5 +62,5 @@ public interface IProcessFbStandardPurchaseService extends IService queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ProcessAll::getProcessInstanceId, processInstanceId); + ProcessAll processAll = processAllService.getOne(queryWrapper); + String projectId = processAll.getProjectId(); + LambdaQueryWrapper purchaseLambdaQueryWrapper = new LambdaQueryWrapper<>(); + purchaseLambdaQueryWrapper.eq(ProcessFbStandardPurchase::getBusinessId, projectId); + List dataList = list(purchaseLambdaQueryWrapper); + String prcName = processAll.getPrcName(); + String prcNum = processAll.getPrcNum(); + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.FB_STANDARD_PURCHASE); + sendMessageDTO.setToUserId(userIds); + Map sendMap = new HashMap<>(); + sendMap.put("prcNum", prcNum); + sendMap.put("prcName", prcName); + sendMap.put("content", this.generateMsg(dataList)); + sendMessageDTO.setMap(sendMap); + sendMessageAPI.sendMessage(sendMessageDTO); + } + + /** + * 构造消息内容 + */ + private String generateMsg(List dataList) { + StringBuilder builder = new StringBuilder(); + for (ProcessFbStandardPurchase processFbStandardPurchase : dataList) { + builder.append(processFbStandardPurchase.getStandardNumber()) + .append(" ") + .append(processFbStandardPurchase.getStandardName()).append("、"); + } + return builder.substring(0, builder.length() - 1); } @Override 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 14a950b3..1daed6fe 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 @@ -28,5 +28,6 @@ public class MessageTemplateCodeCommon { public static final String ES_REVISION_STANDARD_RELEASE = "es_revision_standard_release"; // 【企标修订】标准发布 public static final String ES_REVISION_ADVICE = "es_revision_advice"; // 【企标修订】征求意见 public static final String ES_ANNUAL_REPORT_CONTACT_USER = "es_annual_report_contact_user"; // 【企标年度制修订-各部门主动上报】部门联络人下发 + public static final String FB_STANDARD_PURCHASE = "fb_standard_purchase"; // 【法规采购】流程结束 }