楚江ERP-客户开发审核流程相关逻辑开发

@@ -48,7 +48,7 @@ public class GetCustomerDevelopPlanBo extends BaseBo<CustomerDevelopPlan> {
      * 客户类型
      */
     @ApiModelProperty("客户类型")
-    private TypeInfo customerType;
+    private String customerType;
 
     /**
      * 产品品种
@@ -141,10 +141,10 @@ public class GetCustomerDevelopPlanBo extends BaseBo<CustomerDevelopPlan> {
     private Integer status;
 
     /**
-     * 状态字典值
+     * 流程任务ID
      */
-    @ApiModelProperty("状态字典值")
-    private String statusDicValue;
+    @ApiModelProperty("流程任务ID")
+    private Long flowTaskId;
 
     /**
      * 创建人

 package com.lframework.xingyun.sc.controller.customer;
 
+import com.lframework.starter.bpm.dto.FlowTaskDto;
+import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
+import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.inner.entity.SysUser;
 import com.lframework.starter.web.inner.service.system.SysUserService;
@@ -62,7 +66,7 @@ public class CustomerDevelopPlanController extends DefaultBaseController {
     @Resource
     private OfficeService officeService;
     @Resource
-    private TypeInfoService typeInfoService;
+    private FlowTaskWrapperMapper flowTaskWrapperMapper;
     @Resource
     private ProductVarietyService productVarietyService;
     @Resource
@@ -160,14 +164,12 @@ public class CustomerDevelopPlanController extends DefaultBaseController {
         List<String> customerIds = new ArrayList<>();
         List<String> workshopIds = new ArrayList<>();
         List<String> officeIds = new ArrayList<>();
-        List<String> typeIds = new ArrayList<>();
         List<String> productVarietyIds = new ArrayList<>();
         List<String> chargeUserIds = new ArrayList<>();
         for (CustomerDevelopPlan plan : dataList) {
             String customerId = plan.getCustomerId();
             String workshopId = plan.getWorkshopId();
             String officeId = plan.getOfficeId();
-            String customerTypeId = plan.getCustomerTypeId();
             String productVarietyId = plan.getProductVarietyId();
             String chargeUserId = plan.getChargeUserId();
             if (StringUtils.isNotBlank(customerId) && !customerIds.contains(customerId)) {
@@ -179,9 +181,6 @@ public class CustomerDevelopPlanController extends DefaultBaseController {
             if (StringUtils.isNotBlank(officeId) && !officeIds.contains(officeId)) {
                 officeIds.add(officeId);
             }
-            if (StringUtils.isNotBlank(customerTypeId) && !typeIds.contains(customerTypeId)) {
-                typeIds.add(customerTypeId);
-            }
             if (StringUtils.isNotBlank(productVarietyId) && !productVarietyIds.contains(productVarietyId)) {
                 productVarietyIds.add(productVarietyId);
             }
@@ -207,11 +206,12 @@ public class CustomerDevelopPlanController extends DefaultBaseController {
         if (CollectionUtils.isNotEmpty(officeList)) {
             officeMap = officeList.stream().collect(Collectors.toMap(Office::getId, Function.identity()));
         }
-        // 获取客户类型信息
-        List<TypeInfo> typeInfoList = typeInfoService.listByIds(typeIds);
-        Map<String, TypeInfo> typeInfoMap = new HashMap<>();
-        if (CollectionUtils.isNotEmpty(typeInfoList)) {
-            typeInfoMap = typeInfoList.stream().collect(Collectors.toMap(TypeInfo::getId, Function.identity()));
+        // 获取流程任务数据
+        List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo()
+                , SecurityUtil.getCurrentUser().getId());
+        Map<String, FlowTaskDto> flowTaskMap = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(flowTaskList)) {
+            flowTaskMap = flowTaskList.stream().collect(Collectors.toMap(FlowTaskDto::getBusinessId, Function.identity()));
         }
         // 获取产品品种信息
         List<ProductVariety> productVarietyList = productVarietyService.listByIds(productVarietyIds);
@@ -237,9 +237,9 @@ public class CustomerDevelopPlanController extends DefaultBaseController {
             // 办事处/科办
             Office office = officeMap.get(plan.getOfficeId());
             data.setOffice(office);
-            // 客户类型
-            TypeInfo typeInfo = typeInfoMap.get(plan.getCustomerTypeId());
-            data.setCustomerType(typeInfo);
+            // 流程任务
+            FlowTaskDto task = flowTaskMap.get(plan.getId());
+            data.setFlowTaskId(task == null ? null : task.getTaskId());
             // 产品品种
             ProductVariety productVariety = productVarietyMap.get(plan.getProductVarietyId());
             data.setProductVariety(productVariety);
@@ -264,7 +264,6 @@ public class CustomerDevelopPlanController extends DefaultBaseController {
         String customerId = plan.getCustomerId();
         String workshopId = plan.getWorkshopId();
         String officeId = plan.getOfficeId();
-        String customerTypeId = plan.getCustomerTypeId();
         String productVarietyId = plan.getProductVarietyId();
         String chargeUserId = plan.getChargeUserId();
 
@@ -278,9 +277,6 @@ public class CustomerDevelopPlanController extends DefaultBaseController {
         // 获取办事处/科办信息
         Office office = officeService.findById(officeId);
         data.setOffice(office);
-        // 获取客户类型信息
-        TypeInfo customerType = typeInfoService.findById(customerTypeId);
-        data.setCustomerType(customerType);
         // 获取产品品种信息
         ProductVariety productVariety = productVarietyService.findById(productVarietyId);
         data.setProductVariety(productVariety);

@@ -48,7 +48,7 @@ public class CustomerDevelopPlan extends BaseEntity implements BaseDto {
     /**
      * 客户类型ID
      */
-    private String customerTypeId;
+    private String customerType;
 
     /**
      * 产品品种ID
@@ -121,6 +121,11 @@ public class CustomerDevelopPlan extends BaseEntity implements BaseDto {
     private CustomerDevelopStatus status;
 
     /**
+     * 关联的审批流程ID
+     */
+    private Long flowInstanceId;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

@@ -3,21 +3,32 @@ 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.dto.FlowTaskDto;
+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.mappers.FlowTaskWrapperMapper;
+import com.lframework.starter.bpm.service.FlowDefinitionWrapperService;
+import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
+import com.lframework.starter.web.core.utils.*;
+import com.lframework.xingyun.sc.bo.customer.develop.GetCustomerDevelopPlanBo;
 import com.lframework.xingyun.sc.entity.CustomerDevelopPlan;
 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 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.enums.CustomerDevelopStatus;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+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.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.CustomerDevelopPlanMapper;
 import com.lframework.xingyun.sc.service.customer.CustomerDevelopPlanService;
@@ -26,13 +37,26 @@ import com.lframework.xingyun.sc.vo.customer.develop.QueryCustomerDevelopPlanVo;
 import com.lframework.xingyun.sc.vo.customer.develop.UpdateCustomerDevelopPlanVo;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDevelopPlanMapper, CustomerDevelopPlan> implements CustomerDevelopPlanService {
 
 
+    private static final String BPM_FLAG = "CustomerDevelop";
+
+
+    @Resource
+    private FlowDefinitionWrapperService flowDefinitionWrapperService;
+    @Resource
+    private InsService insService;
+    @Resource
+    private FlowTaskWrapperMapper flowTaskWrapperMapper;
+
+
 
     @Override
     public PageResult<CustomerDevelopPlan> query(Integer pageIndex, Integer pageSize, QueryCustomerDevelopPlanVo vo) {
@@ -58,12 +82,19 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
             workshopNameList.add("紫铜分厂");
             vo.setWorkshopNames(workshopNameList);
         }
+        List<String> ids = new ArrayList<>();
         // 待办类型
         String todoType = vo.getTodoType();
         if ("COMPLETED".equals(todoType)) {
 
         } else if ("WAIT".equals(todoType)) {
-            
+            // 获取当前人员的待办任务数据
+            List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
+            if (CollectionUtils.isEmpty(flowTaskList)) {
+                return PageResultUtil.convert(new PageInfo<>());
+            }
+            ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
+            vo.setIds(ids);
         }
         PageHelperUtil.startPage(pageIndex, pageSize);
         List<CustomerDevelopPlan> dataList = this.query(vo);
@@ -98,7 +129,8 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
     @Override
     public String create(CreateCustomerDevelopPlanVo vo) {
         CustomerDevelopPlan data = new CustomerDevelopPlan();
-        data.setId(IdUtil.getId());
+        String id = IdUtil.getId();
+        data.setId(id);
         // 审核中
         data.setStatus(CustomerDevelopStatus.AUDIT);
         data.setCustomerId(vo.getCustomerId());
@@ -108,9 +140,6 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
         if (!StringUtil.isBlank(vo.getOfficeId())) {
             data.setOfficeId(vo.getOfficeId());
         }
-        if (!StringUtil.isBlank(vo.getCustomerTypeId())) {
-            data.setCustomerTypeId(vo.getCustomerTypeId());
-        }
         if (!StringUtil.isBlank(vo.getProductVarietyId())) {
             data.setProductVarietyId(vo.getProductVarietyId());
         }
@@ -148,6 +177,18 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
             data.setSettleDays(vo.getSettleDays());
         }
         data.setChargeUserId(vo.getChargeUserId());
+        // 流程处理
+        FlowDefinitionWrapper flowDefinitionWrapper = flowDefinitionWrapperService.getBaseMapper().selectOne(
+                Wrappers.<FlowDefinitionWrapper>query()
+                        .eq("mode", "CUSTOMER_DEVELOP")
+                        .eq("is_publish", FlowDefinitionIsPublish.Y.getCode())
+                        .select("id", "flow_code")
+        );
+        if (flowDefinitionWrapper == null) {
+            throw new DefaultClientException("客户开发未设计审核流程或流程未发布！");
+        }
+        Instance instance = this.startCustomerDevelopInstance(flowDefinitionWrapper.getFlowCode(), id);
+        data.setFlowInstanceId(instance.getId());
 
         getBaseMapper().insert(data);
 
@@ -168,7 +209,7 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
                 .set(CustomerDevelopPlan::getCustomerId, vo.getCustomerId())
                 .set(CustomerDevelopPlan::getWorkshopId, StringUtil.isBlank(vo.getWorkshopId()) ? null : vo.getWorkshopId())
                 .set(CustomerDevelopPlan::getOfficeId, StringUtil.isBlank(vo.getOfficeId()) ? null : vo.getOfficeId())
-                .set(CustomerDevelopPlan::getCustomerTypeId, StringUtil.isBlank(vo.getCustomerTypeId()) ? null : vo.getCustomerTypeId())
+                .set(CustomerDevelopPlan::getCustomerType, StringUtil.isBlank(vo.getCustomerType()) ? null : vo.getCustomerType())
                 .set(CustomerDevelopPlan::getProductVarietyId, StringUtil.isBlank(vo.getProductVarietyId()) ? null : vo.getProductVarietyId())
                 .set(CustomerDevelopPlan::getMonthlyUsage, vo.getMonthlyUsage() == null ? null : vo.getMonthlyUsage())
                 .set(CustomerDevelopPlan::getTargetQuantity, vo.getTargetQuantity() == null ? null : vo.getTargetQuantity())
@@ -209,4 +250,30 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
                 .eq(CustomerDevelopPlan::getId, id);
         getBaseMapper().update(updateWrapper);
     }
+
+
+    /**
+     * 发起流程实例
+     *
+     * @param processCode   流程code
+     * @param businessId    业务ID
+     * @return  Instance
+     */
+    public Instance startCustomerDevelopInstance(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));
+        // 需要传入表单变量
+        GetCustomerDevelopPlanBo detail = new GetCustomerDevelopPlanBo(this.findById(businessId));
+        flowParams.variable(JsonUtil.parseMap(JsonUtil.toJsonString(detail), String.class, Object.class));
+
+        return insService.start(businessId, flowParams);
+    }
 }

@@ -38,11 +38,11 @@ public class CreateCustomerDevelopPlanVo implements BaseVo, Serializable {
     private String officeId;
 
     /**
-     * 客户类型ID
+     * 客户类型
      */
-    @ApiModelProperty("客户类型ID")
-    @Length(message = "客户类型ID最多允许32个字符！")
-    private String customerTypeId;
+    @ApiModelProperty("客户类型")
+    @Length(message = "客户类型最多允许20个字符！")
+    private String customerType;
 
     /**
      * 产品品种ID

@@ -19,6 +19,12 @@ public class QueryCustomerDevelopPlanVo extends SortPageVo implements BaseVo, Se
 
 
     /**
+     * ID集合
+     */
+    @ApiModelProperty("ID集合")
+    private List<String> ids;
+
+    /**
      * 客户ID
      */
     @ApiModelProperty("客户ID")

@@ -45,11 +45,11 @@ public class UpdateCustomerDevelopPlanVo implements BaseVo, Serializable {
     private String officeId;
 
     /**
-     * 客户类型ID
+     * 客户类型
      */
-    @ApiModelProperty("客户类型ID")
-    @Length(message = "客户类型ID最多允许32个字符！")
-    private String customerTypeId;
+    @ApiModelProperty("客户类型")
+    @Length(message = "客户类型最多允许20个字符！")
+    private String customerType;
 
     /**
      * 产品品种ID

@@ -7,7 +7,7 @@
         <result column="customer_id" property="customerId"/>
         <result column="workshop_id" property="workshopId"/>
         <result column="office_id" property="officeId"/>
-        <result column="customer_type_id" property="customerTypeId"/>
+        <result column="customer_type" property="customerType"/>
         <result column="product_variety_id" property="productVarietyId"/>
         <result column="monthly_usage" property="monthlyUsage"/>
         <result column="target_quantity" property="targetQuantity"/>
@@ -22,6 +22,7 @@
         <result column="settle_days" property="settleDays"/>
         <result column="charge_user_id" property="chargeUserId"/>
         <result column="status" property="status"/>
+        <result column="flow_instance_id" property="flowInstanceId"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
@@ -35,7 +36,7 @@
                tb.customer_id,
                tb.workshop_id,
                tb.office_id,
-               tb.customer_type_id,
+               tb.customer_type,
                tb.product_variety_id,
                tb.monthly_usage,
                tb.target_quantity,
@@ -50,6 +51,7 @@
                tb.settle_days,
                tb.charge_user_id,
                tb.status,
+               tb.flow_instance_id,
                tb.create_by_id,
                tb.create_by,
                tb.update_by_id,
@@ -66,6 +68,12 @@
             LEFT JOIN base_data_workshop w ON tb.workshop_id = w.id
         </if>
         <where>
+            <if test="vo.ids != null and vo.ids.size() > 0">
+                AND tb.id in
+                <foreach collection="vo.ids" open="(" separator="," close=")" item="id">
+                    #{id}
+                </foreach>
+            </if>
             <if test="vo.customerId != null and vo.customerId != ''">
                 AND tb.customer_id = #{vo.customerId}
             </if>