楚江ERP-客户开发审核通过后消息通知功能开发

@@ -97,7 +97,7 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
         // 更新业务数据
         // 更新业务数据
         switch (businessType) {
         switch (businessType) {
             case "CUSTOMER_DEVELOP":
             case "CUSTOMER_DEVELOP":
-                handleCustomerDevelopData(flowStatus, businessId);
+                handleCustomerDevelopData(flowStatus, businessId, String.valueOf(instance.getId()));
                 break;
                 break;
             case "CUSTOMER_CREDIT":
             case "CUSTOMER_CREDIT":
                 handleCustomerCreditData(flowStatus, businessId);
                 handleCustomerCreditData(flowStatus, businessId);
@@ -155,12 +155,12 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
      *
      *
      * @param businessId 业务ID
      * @param businessId 业务ID
      */
      */
-    private void handleCustomerDevelopData(String flowStatus, String businessId) {
+    private void handleCustomerDevelopData(String flowStatus, String businessId, String instanceId) {
         if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
         if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
                 || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
                 || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
             customerDevelopPlanService.updateStatus(businessId, CustomerDevelopStatus.PASS);
             customerDevelopPlanService.updateStatus(businessId, CustomerDevelopStatus.PASS);
             // 消息通知
             // 消息通知
-            customerDevelopPlanService.sendMsg(businessId);
+            customerDevelopPlanService.sendMsg(businessId, instanceId);
         } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
         } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
                 || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)
                 || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)
                 || FlowInstanceStatus.TERMINATION.getCode().equals(flowStatus)) {
                 || FlowInstanceStatus.TERMINATION.getCode().equals(flowStatus)) {

@@ -56,7 +56,7 @@ public class MessageHandler {
         String bizKey = "";
         String bizKey = "";
         if ("SPEC_CHANGE_SUBMIT".equals(businessType)) {
         if ("SPEC_CHANGE_SUBMIT".equals(businessType)) {
         }
         }
-        sendMsg(receiveUserIds, title, content, bizKey, null);
+        sendMsg(receiveUserIds, title, content, bizKey, sendUserId);
         log.info("================== MessageHandler sendMsg invoke end!");
         log.info("================== MessageHandler sendMsg invoke end!");
     }
     }
 
 

@@ -61,12 +61,13 @@ public class TransactorHandler {
      * 根据角色code和厂房类型来获取办理人数据
      * 根据角色code和厂房类型来获取办理人数据
      * 客户开发
      * 客户开发
      *
      *
-     * @param roleCode      角色编号
+     * @param roleCodes     角色编号集合
      * @param workshopType  厂房类型
      * @param workshopType  厂房类型
      * @return  List<String>
      * @return  List<String>
      */
      */
-    public List<String> listByRoleAndWorkshop(String roleCode, String workshopType, String workshopId) {
-        log.info("================== listByRoleAndWorkshop invoke start, roleCode:{}, workshopType:{}, workshopId:{}", roleCode, workshopType, workshopId);
+    public List<String> listByRoleAndWorkshop(List<String> roleCodes, String workshopType, String workshopId) {
+        log.info("================== listByRoleAndWorkshop invoke start, roleCodes:{}, workshopType:{}, workshopId:{}",
+                JsonUtil.toJsonString(roleCodes), workshopType, workshopId);
         // 获取厂房数据
         // 获取厂房数据
         Workshop workshop = workshopService.findById(workshopId);
         Workshop workshop = workshopService.findById(workshopId);
         if (workshop == null) {
         if (workshop == null) {
@@ -75,7 +76,7 @@ public class TransactorHandler {
         }
         }
         String workshopName = workshop.getName();
         String workshopName = workshop.getName();
         // 获取角色下人员
         // 获取角色下人员
-        List<String> userIdList = sysUserRoleService.listUserIdByRoleCodes(Collections.singletonList(roleCode));
+        List<String> userIdList = sysUserRoleService.listUserIdByRoleCodes(roleCodes);
         if (CollectionUtils.isEmpty(userIdList)) {
         if (CollectionUtils.isEmpty(userIdList)) {
             return new ArrayList<>();
             return new ArrayList<>();
         }
         }

@@ -9,6 +9,7 @@ import com.lframework.starter.bpm.service.FlowTaskWrapperService;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.utils.*;
 import com.lframework.starter.web.core.utils.*;
 import com.lframework.starter.web.inner.service.system.SysUserRoleService;
 import com.lframework.starter.web.inner.service.system.SysUserRoleService;
+import com.lframework.xingyun.basedata.entity.Customer;
 import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
@@ -59,6 +60,8 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
     private MessageHandler messageHandler;
     private MessageHandler messageHandler;
     @Resource
     @Resource
     private SysUserRoleService sysUserRoleService;
     private SysUserRoleService sysUserRoleService;
+    @Resource
+    private CustomerService customerService;
 
 
 
 
     @Override
     @Override
@@ -349,7 +352,7 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
     }
     }
 
 
     @Override
     @Override
-    public void sendMsg(String id) {
+    public void sendMsg(String id, String bizKey) {
         CustomerDevelopPlan plan = findById(id);
         CustomerDevelopPlan plan = findById(id);
         if (plan == null) {
         if (plan == null) {
             log.error("=================== customerDevelopApprovedNotice plan is null!");
             log.error("=================== customerDevelopApprovedNotice plan is null!");
@@ -370,12 +373,59 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
         }
         }
         roleCodeList.clear();
         roleCodeList.clear();
         // 营销部分管
         // 营销部分管
-        roleCodeList.add("ssyxbfg");
+        roleCodeList.add("yxbfg");
         // 市场科统计员
         // 市场科统计员
         roleCodeList.add("scktjy");
         roleCodeList.add("scktjy");
         // 运作科主管
         // 运作科主管
         roleCodeList.add("yzkzg");
         roleCodeList.add("yzkzg");
+        // 获取厂房信息
+        Workshop workshop = workshopService.findById(plan.getWorkshopId());
+        String workshopName = workshop.getName();
+        if ("一分厂".equals(workshopName)) {
+            // 市场科主管
+            roleCodeList.add("yfcsckzg");
+            // 经营办主管
+            roleCodeList.add("yfcjybzg");
+            // 生产经理
+            roleCodeList.add("yfcscjl");
+            // 品质经理
+            roleCodeList.add("yfcpzjl");
+        } else if ("二分厂".equals(workshopName)) {
+            // 市场科主管
+            roleCodeList.add("efcsckzg");
+            // 经营办主管
+            roleCodeList.add("efcjybzg");
+            // 生产经理
+            roleCodeList.add("efcscjl");
+            // 品质经理
+            roleCodeList.add("efcpzjl");
+        } else if ("三分厂".equals(workshopName)) {
+            // 市场科主管
+            roleCodeList.add("sfcsckzg");
+            // 经营办主管
+            roleCodeList.add("sfcjybzg");
+            // 生产经理
+            roleCodeList.add("sfcscjl");
+            // 品质经理
+            roleCodeList.add("sfcpzjl");
+        } else if ("四分厂".equals(workshopName) || "紫铜厂".equals(workshopName)) {
+            // 市场科主管
+            roleCodeList.add("ztcsckzg");
+            // 经营办主管
+            roleCodeList.add("ztcjybzg");
+            // 生产经理
+            roleCodeList.add("ztcscjl");
+            // 品质经理
+            roleCodeList.add("ztcpzjl");
+        }
+        userIds = sysUserRoleService.listUserIdByRoleCodes(roleCodeList);
+        if (CollectionUtils.isNotEmpty(userIds)) {
+            receiveUserIds.addAll(userIds);
+        }
+        // 获取客户信息
+        Customer customer = customerService.findById(plan.getCustomerId());
 
 
-        messageHandler.sendMsg(receiveUserIds, "", "", "", null);
+        messageHandler.sendMsg(receiveUserIds, customer.getName() + "开发审核通过消息通知测试"
+                , customer.getName() +"开发审核通过消息通知测试", bizKey, null);
     }
     }
 }
 }

@@ -98,5 +98,5 @@ public interface CustomerDevelopPlanService extends BaseMpService<CustomerDevelo
      *
      *
      * @param id    主键ID
      * @param id    主键ID
      */
      */
-    void sendMsg(String id);
+    void sendMsg(String id, String bizKey);
 }
 }