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

@@ -3,26 +3,29 @@ package com.lframework.xingyun.sc.impl.customer;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.bpm.dto.FlowInstanceExtDto;
+import com.lframework.starter.bpm.entity.FlowDefinitionWrapper;
+import com.lframework.starter.bpm.enums.FlowDefinitionExtBizType;
+import com.lframework.starter.bpm.enums.FlowDefinitionIsPublish;
+import com.lframework.starter.bpm.service.FlowDefinitionWrapperService;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
+import com.lframework.starter.web.core.utils.*;
 import com.lframework.starter.web.inner.bo.system.user.GetSysUserBo;
 import com.lframework.starter.web.inner.entity.SysDept;
 import com.lframework.starter.web.inner.entity.SysUser;
 import com.lframework.starter.web.inner.service.system.SysDeptService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.starter.web.inner.vo.system.user.QuerySysUserVo;
+import com.lframework.xingyun.sc.bo.customer.credit.GetCustomerCreditBo;
 import com.lframework.xingyun.sc.entity.CorePersonnel;
 import com.lframework.xingyun.sc.entity.CustomerCredit;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
-import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
-import com.lframework.starter.web.core.utils.OpLogUtil;
 import com.lframework.starter.common.utils.StringUtil;
 import java.io.Serializable;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
-import com.lframework.starter.web.core.utils.IdUtil;
 import com.lframework.starter.common.utils.ObjectUtil;
 import com.lframework.starter.web.core.annotations.oplog.OpLog;
-import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.xingyun.sc.entity.CustomerCreditHistory;
@@ -33,6 +36,9 @@ import com.lframework.xingyun.sc.service.customer.CustomerCreditHistoryService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.vo.customer.credit.*;
 import org.apache.commons.collections.CollectionUtils;
+import org.dromara.warm.flow.core.dto.FlowParams;
+import org.dromara.warm.flow.core.entity.Instance;
+import org.dromara.warm.flow.core.service.InsService;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -49,6 +55,7 @@ import java.util.stream.IntStream;
 
 @Service
 public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditMapper, CustomerCredit> implements CustomerCreditService {
+    private static final String BPM_FLAG = "CUSTOMER_CREDIT";
 
     @Resource
     private CorePersonnelService corePersonnelService;
@@ -62,6 +69,10 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
     private CorePersonnelHistoryService corePersonnelHistoryService;
     @Resource
     private SysDeptService sysDeptService;
+    @Resource
+    private FlowDefinitionWrapperService flowDefinitionWrapperService;
+    @Resource
+    private InsService insService;
 
     @Override
     public PageResult<CustomerCredit> query(Integer pageIndex, Integer pageSize, QueryCustomerCreditVo vo) {
@@ -255,6 +266,18 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
             }
         }
 
+        // 流程处理
+        FlowDefinitionWrapper flowDefinitionWrapper = flowDefinitionWrapperService.getBaseMapper().selectOne(
+                Wrappers.<FlowDefinitionWrapper>query()
+                        .eq("mode", "CUSTOMER_CREDIT")
+                        .eq("is_publish", FlowDefinitionIsPublish.Y.getCode())
+                        .select("id", "flow_code")
+        );
+        if (flowDefinitionWrapper == null) {
+            throw new DefaultClientException("客户资信未设计审核流程或流程未发布！");
+        }
+        this.startCustomerCreditInstance(flowDefinitionWrapper.getFlowCode(), data.getId());
+
         return data.getId();
     }
 
@@ -529,12 +552,11 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
                 .set(CustomerCredit::getCompanyCreditLimit, StringUtil.isBlank(vo.getCompanyCreditLimit()) ? null : vo.getCompanyCreditLimit())
                 .set(CustomerCredit::getCompanyMaterialSupplyPlan, StringUtil.isBlank(vo.getCompanyMaterialSupplyPlan()) ? null : vo.getCompanyMaterialSupplyPlan())
                 .set(CustomerCredit::getCompanySuggestedCategory, vo.getCompanySuggestedCategory())
-                .set(CustomerCredit::getStatus, vo.getStatus())
+                .set(CustomerCredit::getStatus, "AUDIT")
                 .eq(CustomerCredit::getId, vo.getId());
 
         getBaseMapper().update(updateWrapper);
         //更新核心人员
-        //todo fys 考虑删除怎么做
         List<UpdateCorePersonnelVo> corePersonnelListNew = vo.getCorePersonnelList();
         if (CollectionUtils.isNotEmpty(corePersonnelListNew)) {
             Set<String> oldIds = corePersonnelList.stream().map(CorePersonnel::getId).collect(Collectors.toSet());
@@ -613,6 +635,18 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
         }
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
+
+        // 流程处理
+        FlowDefinitionWrapper flowDefinitionWrapper = flowDefinitionWrapperService.getBaseMapper().selectOne(
+                Wrappers.<FlowDefinitionWrapper>query()
+                        .eq("mode", "CUSTOMER_CREDIT")
+                        .eq("is_publish", FlowDefinitionIsPublish.Y.getCode())
+                        .select("id", "flow_code")
+        );
+        if (flowDefinitionWrapper == null) {
+            throw new DefaultClientException("客户资信未设计审核流程或流程未发布！");
+        }
+        this.startCustomerCreditInstance(flowDefinitionWrapper.getFlowCode(), data.getId());
     }
 
     @OpLog(type = OtherOpLogType.class, name = "删除客户资信表，ID：{}", params = {"#id"})
@@ -790,6 +824,31 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
                 .orElseThrow(() -> new RuntimeException("办事处 " + prefix + " 的编号已用尽 (001-999)"));
     }
 
+    /**
+     * 发起流程实例
+     *
+     * @param processCode   流程code
+     * @param businessId    业务ID
+     * @return  Instance
+     */
+    public Instance startCustomerCreditInstance(String processCode, String businessId) {
+        if (this.getById(businessId) != null) {
+            throw new DefaultClientException("客户资信已办理完成，无法重新发起！");
+        }
+        FlowParams flowParams = new FlowParams();
+        flowParams.flowCode(processCode);
+
+        FlowInstanceExtDto ext = new FlowInstanceExtDto();
+        ext.setBizType(FlowDefinitionExtBizType.SYSTEM.getCode());
+        ext.setBizFlag(BPM_FLAG);
+        flowParams.ext(JsonUtil.toJsonString(ext));
+        // 需要传入表单变量
+        GetCustomerCreditBo detail = new GetCustomerCreditBo(this.findById(businessId));
+        flowParams.variable(JsonUtil.parseMap(JsonUtil.toJsonString(detail), String.class, Object.class));
+
+        return insService.start(businessId, flowParams);
+    }
+
     @CacheEvict(value = CustomerCredit.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
     @Override
     public void cleanCacheByKey(Serializable key) {