楚江ERP:客户资信-保存审核人

@@ -402,6 +402,42 @@ public class GetCustomerCreditBo extends BaseBo<CustomerCredit> implements BaseD
     private String shareholderFileId;
     private String shareholderFileId;
 
 
     /**
     /**
+     * 所属营销部分管
+     */
+    @ApiModelProperty(value = "所属营销部分管")
+    private String marketingDepartmentManagement;
+
+    /**
+     * 所属营销部分管名称（非持久化字段）
+     */
+    @ApiModelProperty(value = "所属营销部分管名称")
+    private String marketingDepartmentManagementName;
+
+    /**
+     * 营销部主管
+     */
+    @ApiModelProperty(value = "营销部主管")
+    private String marketingDepartmentSupervisor;
+
+    /**
+     * 营销部主管名称（非持久化字段）
+     */
+    @ApiModelProperty(value = "营销部主管名称")
+    private String marketingDepartmentSupervisorName;
+
+    /**
+     * 营销中心主管
+     */
+    @ApiModelProperty(value = "营销中心主管")
+    private String marketingCenterSupervisor;
+
+    /**
+     * 营销中心主管名称（非持久化字段）
+     */
+    @ApiModelProperty(value = "营销中心主管名称")
+    private String marketingCenterSupervisorName;
+
+    /**
      * 核心人员
      * 核心人员
      */
      */
     @ApiModelProperty("核心人员")
     @ApiModelProperty("核心人员")

@@ -112,9 +112,9 @@ public class CustomerCreditController extends DefaultBaseController {
     /**
     /**
      * 根据ID查询变更审核的数据
      * 根据ID查询变更审核的数据
      */
      */
-    @ApiOperation("根据ID查询")
+    @ApiOperation("根据ID查询变更审核的数据")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"customer-credit-manage:customer-credit-plan:examine"})
+    @HasPermission({"customer-credit-manage:customer-credit-plan:approve", "customer-credit-manage:customer-credit-plan:review"})
     @GetMapping("/getExamineById")
     @GetMapping("/getExamineById")
     public InvokeResult<GetCustomerCreditBo> getExamineById(@NotBlank(message = "id不能为空！") String id) {
     public InvokeResult<GetCustomerCreditBo> getExamineById(@NotBlank(message = "id不能为空！") String id) {
 
 
@@ -176,7 +176,7 @@ public class CustomerCreditController extends DefaultBaseController {
      * 取消
      * 取消
      */
      */
     @ApiOperation("取消")
     @ApiOperation("取消")
-    @HasPermission({"customer-credit-manage:customer-credit-plan:modify"})
+    @HasPermission({"customer-credit-manage:customer-credit-plan:close"})
     @GetMapping("/cancel")
     @GetMapping("/cancel")
     public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id) {
     public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id) {
 
 

@@ -317,6 +317,21 @@ public class CustomerCredit extends BaseEntity implements BaseDto {
     private String shareholderFileId;
     private String shareholderFileId;
 
 
     /**
     /**
+     * 所属营销部分管
+     */
+    private String marketingDepartmentManagement;
+
+    /**
+     * 营销部主管
+     */
+    private String marketingDepartmentSupervisor;
+
+    /**
+     * 营销中心主管
+     */
+    private String marketingCenterSupervisor;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

@@ -727,6 +727,8 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
             }
             }
             String jsonString = JsonUtil.toJsonString(vo);
             String jsonString = JsonUtil.toJsonString(vo);
             redisHandler.set(vo.getId(), jsonString);
             redisHandler.set(vo.getId(), jsonString);
+            //修改状态
+            updateStatus(vo.getId(), "AUDIT");
         } else {
         } else {
             //变更审核通过后再修改入库
             //变更审核通过后再修改入库
             LambdaUpdateWrapper<CustomerCredit> updateWrapper = Wrappers.lambdaUpdate(CustomerCredit.class)
             LambdaUpdateWrapper<CustomerCredit> updateWrapper = Wrappers.lambdaUpdate(CustomerCredit.class)
@@ -1065,6 +1067,37 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
         cleanCacheByKey(id);
         cleanCacheByKey(id);
     }
     }
 
 
+    @OpLog(type = OtherOpLogType.class, name = "更新审核人，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateExamineUser(UpdateCustomerCreditVo vo) {
+        if (vo == null) {
+            return;
+        }
+        if (StringUtil.isNotEmpty(vo.getSupervisorReview())) {
+            LambdaUpdateWrapper<CustomerCredit> updateWrapper = Wrappers.lambdaUpdate(CustomerCredit.class)
+                    .set(CustomerCredit::getSupervisorReview, vo.getSupervisorReview())
+                    .eq(CustomerCredit::getId, vo.getId());
+            getBaseMapper().update(updateWrapper);
+        } else if (StringUtil.isNotEmpty(vo.getMarketingDepartmentManagement())) {
+            LambdaUpdateWrapper<CustomerCredit> updateWrapper = Wrappers.lambdaUpdate(CustomerCredit.class)
+                    .set(CustomerCredit::getMarketingDepartmentManagement, vo.getMarketingDepartmentManagement())
+                    .eq(CustomerCredit::getId, vo.getId());
+            getBaseMapper().update(updateWrapper);
+        } else if (StringUtil.isNotEmpty(vo.getMarketingDepartmentSupervisor())) {
+            LambdaUpdateWrapper<CustomerCredit> updateWrapper = Wrappers.lambdaUpdate(CustomerCredit.class)
+                    .set(CustomerCredit::getMarketingDepartmentSupervisor, vo.getMarketingDepartmentSupervisor())
+                    .eq(CustomerCredit::getId, vo.getId());
+            getBaseMapper().update(updateWrapper);
+        } else if (StringUtil.isNotEmpty(vo.getMarketingCenterSupervisor())) {
+            LambdaUpdateWrapper<CustomerCredit> updateWrapper = Wrappers.lambdaUpdate(CustomerCredit.class)
+                    .set(CustomerCredit::getMarketingCenterSupervisor, vo.getMarketingCenterSupervisor())
+                    .eq(CustomerCredit::getId, vo.getId());
+            getBaseMapper().update(updateWrapper);
+        }
+        cleanCacheByKey(vo.getId());
+    }
+
     @OpLog(type = OtherOpLogType.class, name = "取消，ID：{}", params = {"#id"})
     @OpLog(type = OtherOpLogType.class, name = "取消，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @Override
     @Override
@@ -1237,7 +1270,7 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
             }
             }
             dataModel.put("enterpriseType", enterpriseType);
             dataModel.put("enterpriseType", enterpriseType);
         }
         }
-        
+
         // 核心人员列表 - 确保放入数据模型供模板遍历
         // 核心人员列表 - 确保放入数据模型供模板遍历
         List<GetCorePersonnelBo> corePersonnelBoList = new ArrayList<>();
         List<GetCorePersonnelBo> corePersonnelBoList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(corePersonnelList)) {
         if (CollectionUtils.isNotEmpty(corePersonnelList)) {

 package com.lframework.xingyun.sc.listeners.flow;
 package com.lframework.xingyun.sc.listeners.flow;
 
 
-import com.lframework.starter.bpm.enums.FlowInstanceStatus;
-import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
+import com.lframework.starter.bpm.dto.FlowInstanceExtDto;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
+import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
-import com.lframework.xingyun.sc.service.customer.CustomerDevelopPlanService;
+import com.lframework.xingyun.sc.vo.customer.credit.UpdateCustomerCreditVo;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.dromara.warm.flow.core.entity.Instance;
 import org.dromara.warm.flow.core.entity.Instance;
+import org.dromara.warm.flow.core.entity.Node;
 import org.dromara.warm.flow.core.listener.Listener;
 import org.dromara.warm.flow.core.listener.Listener;
 import org.dromara.warm.flow.core.listener.ListenerVariable;
 import org.dromara.warm.flow.core.listener.ListenerVariable;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
@@ -18,9 +21,6 @@ import java.util.Map;
 @Slf4j
 @Slf4j
 public class NodeFinishListener implements Listener {
 public class NodeFinishListener implements Listener {
 
 
-
-    @Resource
-    private CustomerDevelopPlanService customerDevelopPlanService;
     @Resource
     @Resource
     private CustomerCreditService customerCreditService;
     private CustomerCreditService customerCreditService;
 
 
@@ -38,48 +38,66 @@ public class NodeFinishListener implements Listener {
         if (MapUtils.isEmpty(variable)) {
         if (MapUtils.isEmpty(variable)) {
             return;
             return;
         }
         }
+        Node node = listenerVariable.getNode();
+        String nodeCode = null;
+        if (node != null) {
+            nodeCode = node.getNodeCode();
+        }
+        log.info("nodeCode==" + nodeCode);
         String businessId = instance.getBusinessId();
         String businessId = instance.getBusinessId();
-        String businessType = (String) variable.get("businessType");
-        // 获取审核结果
-        String flowStatus = listenerVariable.getFlowParams().getFlowStatus();
-        // 更新业务数据
-        switch (businessType) {
-            case "CUSTOMER_DEVELOP":
-                handleCustomerDevelopData(flowStatus, businessId);
-                break;
-            case "CUSTOMER_CREDIT":
-                handleCustomerCreditData(flowStatus, businessId);
-                break;
-            default:
-                break;
+        // 获取业务数据标识
+        String ext = instance.getExt();
+        String businessType = null;
+        if (StringUtils.isNotBlank(ext)) {
+            FlowInstanceExtDto flowInstanceExtDto = JsonUtil.parseObject(ext, FlowInstanceExtDto.class);
+            businessType = flowInstanceExtDto.getBizFlag();
+        }
+        if ("CUSTOMER_CREDIT".equals(businessType)) {
+            // 更新业务数据
+            switch (nodeCode) {
+                //办事处主管审核
+                case "customer_credit_office_manager":
+                    handleCustomerCreditData(businessId, nodeCode);
+                    break;
+                //所属营销部分管审核
+                case "customer_credit_marketing_department_management":
+                    handleCustomerCreditData(businessId, nodeCode);
+                    break;
+                //营销部主管审核
+                case "customer_credit_marketing_department_supervisor":
+                    handleCustomerCreditData(businessId, nodeCode);
+                    break;
+                //营销中心主管
+                case "customer_credit_marketing_center_supervisor":
+                    handleCustomerCreditData(businessId, nodeCode);
+                    break;
+                default:
+                    break;
+            }
         }
         }
         log.info("==================== 流程节点完成监听器结束......");
         log.info("==================== 流程节点完成监听器结束......");
     }
     }
 
 
-
     /**
     /**
-     * 客户开发业务数据处理
+     * 客户资信-办事处主管审核人存储数据处理
      *
      *
      * @param businessId 业务ID
      * @param businessId 业务ID
      */
      */
-    private void handleCustomerDevelopData(String flowStatus, String businessId) {
-        if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)) {
-            customerDevelopPlanService.updateStatus(businessId, CustomerDevelopStatus.PASS);
-        } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)) {
-            customerDevelopPlanService.updateStatus(businessId, CustomerDevelopStatus.REFUSE);
+    private void handleCustomerCreditData(String businessId, String nodeCode) {
+        UpdateCustomerCreditVo vo = new UpdateCustomerCreditVo();
+        String currentUserId = SecurityUtil.getCurrentUser().getId();
+        log.info("当前人id:" + currentUserId);
+        if ("customer_credit_office_manager".equals(nodeCode)) {
+            vo.setSupervisorReview(currentUserId);
+        } else if ("customer_credit_marketing_department_management".equals(nodeCode)) {
+            vo.setMarketingDepartmentManagement(currentUserId);
+        } else if ("customer_credit_marketing_department_supervisor".equals(nodeCode)) {
+            vo.setMarketingDepartmentSupervisor(currentUserId);
+        } else if ("customer_credit_marketing_center_supervisor".equals(nodeCode)) {
+            vo.setMarketingCenterSupervisor(currentUserId);
         }
         }
-    }
+        vo.setId(businessId);
 
 
-    /**
-     * 客户资信业务数据处理
-     *
-     * @param businessId 业务ID
-     */
-    private void handleCustomerCreditData(String flowStatus, String businessId) {
-        if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)) {
-            customerCreditService.updateStatus(businessId, "PASS");
-        } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)) {
-            customerCreditService.updateStatus(businessId, "REFUSE");
-        }
+        customerCreditService.updateExamineUser(vo);
     }
     }
 }
 }

@@ -74,6 +74,13 @@ public interface CustomerCreditService extends BaseMpService<CustomerCredit> {
     void updateStatus(String id, String status);
     void updateStatus(String id, String status);
 
 
     /**
     /**
+     * 更新审核人
+     *
+     * @param vo
+     */
+    void updateExamineUser(UpdateCustomerCreditVo vo);
+
+    /**
      * 取消
      * 取消
      *
      *
      * @param id
      * @param id

@@ -434,4 +434,22 @@ public class UpdateCustomerCreditVo implements BaseVo, Serializable {
     @ApiModelProperty(value = "客户资信历史记录id")
     @ApiModelProperty(value = "客户资信历史记录id")
     private String creditHistoryId;
     private String creditHistoryId;
 
 
+    /**
+     * 所属营销部分管
+     */
+    @ApiModelProperty(value = "所属营销部分管")
+    private String marketingDepartmentManagement;
+
+    /**
+     * 营销部主管
+     */
+    @ApiModelProperty(value = "营销部主管")
+    private String marketingDepartmentSupervisor;
+
+    /**
+     * 营销中心主管
+     */
+    @ApiModelProperty(value = "营销中心主管")
+    private String marketingCenterSupervisor;
+
 }
 }

@@ -60,6 +60,9 @@
         <result column="business_file_id" property="businessFileId"/>
         <result column="business_file_id" property="businessFileId"/>
         <result column="shareholder_file_name" property="shareholderFileName"/>
         <result column="shareholder_file_name" property="shareholderFileName"/>
         <result column="shareholder_file_id" property="shareholderFileId"/>
         <result column="shareholder_file_id" property="shareholderFileId"/>
+        <result column="marketing_department_management" property="marketingDepartmentManagement"/>
+        <result column="marketing_department_supervisor" property="marketingDepartmentSupervisor"/>
+        <result column="marketing_center_supervisor" property="marketingCenterSupervisor"/>
         <result column="status" property="status"/>
         <result column="status" property="status"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="create_by" property="createBy"/>
@@ -128,6 +131,9 @@
             tb.business_file_name,
             tb.business_file_name,
             tb.business_file_id,
             tb.business_file_id,
             tb.shareholder_file_name,
             tb.shareholder_file_name,
+            tb.marketing_department_management,
+            tb.marketing_department_supervisor,
+            tb.marketing_center_supervisor,
             tb.shareholder_file_id,
             tb.shareholder_file_id,
             tb.create_by_id,
             tb.create_by_id,
             tb.create_by,
             tb.create_by,