楚江ERP:客户资信审核流程

@@ -63,6 +63,7 @@ public class CustomerCredit extends BaseEntity implements BaseDto {
     /**
     /**
      * 单位名称(非持久化字段)
      * 单位名称(非持久化字段)
      */
      */
+    @TableField(exist = false)
     private String companyName;
     private String companyName;
 
 
     /**
     /**

@@ -3,11 +3,8 @@ package com.lframework.xingyun.sc.impl.customer;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
 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.bpm.service.FlowDefinitionWrapperService;
+import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
 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.bo.system.user.GetSysUserBo;
 import com.lframework.starter.web.inner.bo.system.user.GetSysUserBo;
@@ -16,7 +13,6 @@ 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.SysDeptService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.starter.web.inner.vo.system.user.QuerySysUserVo;
 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.CorePersonnel;
 import com.lframework.xingyun.sc.entity.CustomerCredit;
 import com.lframework.xingyun.sc.entity.CustomerCredit;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
@@ -36,9 +32,6 @@ import com.lframework.xingyun.sc.service.customer.CustomerCreditHistoryService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.vo.customer.credit.*;
 import com.lframework.xingyun.sc.vo.customer.credit.*;
 import org.apache.commons.collections.CollectionUtils;
 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.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -72,7 +65,7 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
     @Resource
     @Resource
     private FlowDefinitionWrapperService flowDefinitionWrapperService;
     private FlowDefinitionWrapperService flowDefinitionWrapperService;
     @Resource
     @Resource
-    private InsService insService;
+    private FlowInstanceWrapperService flowInstanceWrapperService;
 
 
     @Override
     @Override
     public PageResult<CustomerCredit> query(Integer pageIndex, Integer pageSize, QueryCustomerCreditVo vo) {
     public PageResult<CustomerCredit> query(Integer pageIndex, Integer pageSize, QueryCustomerCreditVo vo) {
@@ -266,17 +259,8 @@ 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());
+        // 开启审核
+        flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
 
 
         return data.getId();
         return data.getId();
     }
     }
@@ -636,17 +620,8 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
         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());
+        //开启审核
+        flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, vo);
     }
     }
 
 
     @OpLog(type = OtherOpLogType.class, name = "删除客户资信表，ID：{}", params = {"#id"})
     @OpLog(type = OtherOpLogType.class, name = "删除客户资信表，ID：{}", params = {"#id"})
@@ -824,31 +799,6 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
                 .orElseThrow(() -> new RuntimeException("办事处 " + prefix + " 的编号已用尽 (001-999)"));
                 .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")
     @CacheEvict(value = CustomerCredit.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
     @Override
     @Override
     public void cleanCacheByKey(Serializable key) {
     public void cleanCacheByKey(Serializable key) {