Merge remote-tracking branch 'origin/fourthStage' into fourthStage

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardPurchaseController.java

@@ -98,9 +98,9 @@ public class ProcessFbStandardPurchaseController extends JeroController<ProcessF
     @AutoLog(value = "法规采购流程表-抄送")
     @ApiOperation(value = "法规采购流程表-抄送", notes = "法规采购流程表-抄送")
     @GetMapping(value = "/carbonCopy")
-    public Result<T> carbonCopy(@RequestParam(name = "processInstanceId") String processInstanceId,
-                                @RequestParam(name = "userIds") String userIds) {
-        processFbStandardPurchaseService.carbonCopy(processInstanceId, userIds);
+    public Result<T> carbonCopy(@RequestParam(name = "taskId") String taskId,
+                                @RequestParam(name = "userId") String userIds) {
+        processFbStandardPurchaseService.carbonCopy(taskId, userIds);
         return Result.OK();
     }
 

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

@@ -62,5 +62,5 @@ public interface IProcessFbStandardPurchaseService extends IService<ProcessFbSta
      * @Date: 2023/11/14 15:07
      * @Description: 抄送
      **/
-    void carbonCopy(String processInstanceId, String userIds);
+    void carbonCopy(String taskId, String userIds);
 }

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

@@ -3,7 +3,9 @@ package com.jero.modules.activiti.process.fb.service.impl;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.api.dto.message.SendMessageDTO;
 import com.jero.common.api.vo.ResultCommon;
+import com.jero.common.api.vo.SendMessageAPI;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.util.UUIDUtils;
@@ -21,9 +23,11 @@ import com.jero.modules.activiti.process.fb.mapper.ProcessFbStandardPurchaseMapp
 import com.jero.modules.activiti.process.fb.service.IProcessFbStandardPurchaseService;
 import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
+import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
 import com.jero.modules.activiti.service.WorkCenterService;
 import com.jero.modules.activiti.util.SpringContextUtil;
+import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon;
 import com.jero.modules.laws.common.util.CurrentUserUtil;
 import com.jero.modules.sys.utils.UserUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -42,6 +46,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.annotation.Resource;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -76,6 +81,12 @@ public class ProcessFbStandardPurchaseServiceImpl extends ServiceImpl<ProcessFbS
     @Resource
     private TaskService taskService;
 
+    @Resource
+    private ProcessAllService processAllService;
+
+    @Resource
+    private SendMessageAPI sendMessageAPI;
+
     /**
      * @Author: liao
      * @Date: 2023/11/14 14:08
@@ -276,8 +287,41 @@ public class ProcessFbStandardPurchaseServiceImpl extends ServiceImpl<ProcessFbS
      * @Description: 抄送
      **/
     @Override
-    public void carbonCopy(String processInstanceId, String userIds) {
-        log.info("已发送抄送消息...");
+    public void carbonCopy(String taskId, String userIds) {
+        // 获取流程实例ID
+        String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
+        LambdaQueryWrapper<ProcessAll> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ProcessAll::getProcessInstanceId, processInstanceId);
+        ProcessAll processAll = processAllService.getOne(queryWrapper);
+        String projectId = processAll.getProjectId();
+        LambdaQueryWrapper<ProcessFbStandardPurchase> purchaseLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        purchaseLambdaQueryWrapper.eq(ProcessFbStandardPurchase::getBusinessId, projectId);
+        List<ProcessFbStandardPurchase> 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<String, String> 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<ProcessFbStandardPurchase> 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

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"; // 【法规采购】流程结束
 
 }