楚江ERP-发起审核流调整（抽离成公共通用方法）

@@ -10,10 +10,10 @@ 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.service.FlowInstanceWrapperService;
 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.components.resp.PageResult;
@@ -46,7 +46,7 @@ import java.util.stream.Collectors;
 public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDevelopPlanMapper, CustomerDevelopPlan> implements CustomerDevelopPlanService {
 
 
-    private static final String BPM_FLAG = "CustomerDevelop";
+    private static final String BPM_FLAG = "CUSTOMER_DEVELOP";
 
 
     @Resource
@@ -55,6 +55,8 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
     private InsService insService;
     @Resource
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
+    @Resource
+    private FlowInstanceWrapperService flowInstanceWrapperService;
 
 
 
@@ -82,18 +84,17 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
             workshopNameList.add("紫铜分厂");
             vo.setWorkshopNames(workshopNameList);
         }
-        List<String> ids = new ArrayList<>();
         // 待办类型
         String todoType = vo.getTodoType();
         if ("COMPLETED".equals(todoType)) {
-
+            vo.setStatus(CustomerDevelopStatus.PASS.getCode());
         } 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());
+            List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
             vo.setIds(ids);
         }
         PageHelperUtil.startPage(pageIndex, pageSize);
@@ -178,16 +179,7 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
         }
         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);
+        Instance instance = flowInstanceWrapperService.startInstance("CUSTOMER_DEVELOP", id, BPM_FLAG, data);
         data.setFlowInstanceId(instance.getId());
 
         getBaseMapper().insert(data);
@@ -205,6 +197,13 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
         if (ObjectUtil.isNull(data)) {
             throw new DefaultClientException("客户开发计划不存在！");
         }
+        CustomerDevelopStatus status = data.getStatus();
+        if (!CustomerDevelopStatus.REFUSE.equals(status)) {
+            throw new DefaultClientException("仅驳回状态下可编辑！");
+        }
+        // 重新发起流程
+        Instance instance = flowInstanceWrapperService.startInstance("CUSTOMER_DEVELOP", vo.getId(), BPM_FLAG, vo);
+
         LambdaUpdateWrapper<CustomerDevelopPlan> updateWrapper = Wrappers.lambdaUpdate(CustomerDevelopPlan.class)
                 .set(CustomerDevelopPlan::getCustomerId, vo.getCustomerId())
                 .set(CustomerDevelopPlan::getWorkshopId, StringUtil.isBlank(vo.getWorkshopId()) ? null : vo.getWorkshopId())
@@ -224,6 +223,7 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
                 .set(CustomerDevelopPlan::getSettleDays, vo.getSettleDays() == null ? null : vo.getSettleDays())
                 .set(CustomerDevelopPlan::getChargeUserId, vo.getChargeUserId())
                 .set(CustomerDevelopPlan::getStatus, CustomerDevelopStatus.AUDIT)
+                .set(CustomerDevelopPlan::getFlowInstanceId, instance.getId())
                 .eq(CustomerDevelopPlan::getId, vo.getId());
         getBaseMapper().update(updateWrapper);
 
@@ -250,30 +250,4 @@ 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);
-    }
 }