楚江ERP-业务状态数据处理

@@ -145,7 +145,7 @@ public class GetCustomerDevelopPlanBo extends BaseBo<CustomerDevelopPlan> implem
      * 流程任务ID
      */
     @ApiModelProperty("流程任务ID")
-    private Long flowTaskId;
+    private String flowTaskId;
 
     /**
      * 创建人

@@ -91,7 +91,6 @@ public class CustomerDevelopPlanController extends DefaultBaseController {
         if (!CollectionUtil.isEmpty(dataList)) {
             results = this.packCustomerDevelopData(dataList);
         }
-        log.info("====================== CustomerDevelopPlanController.query results:{}", JsonUtil.toJsonString(results));
         return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
     }
 
@@ -229,7 +228,6 @@ public class CustomerDevelopPlanController extends DefaultBaseController {
         // 获取流程任务数据
         List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo()
                 , SecurityUtil.getCurrentUser().getId());
-        log.info("=================== packCustomerDevelopData flowTaskList =================={}", JsonUtil.toJsonString(flowTaskList));
         Map<String, FlowTaskDto> flowTaskMap = new HashMap<>();
         if (CollectionUtils.isNotEmpty(flowTaskList)) {
             flowTaskMap = flowTaskList.stream().collect(Collectors.toMap(FlowTaskDto::getBusinessId, Function.identity()));
@@ -260,7 +258,7 @@ public class CustomerDevelopPlanController extends DefaultBaseController {
             data.setOffice(office);
             // 流程任务
             FlowTaskDto task = flowTaskMap.get(plan.getId());
-            data.setFlowTaskId(task == null ? null : task.getTaskId());
+            data.setFlowTaskId(task == null ? null : String.valueOf(task.getTaskId()));
             // 产品品种
             ProductVariety productVariety = productVarietyMap.get(plan.getProductVarietyId());
             data.setProductVariety(productVariety);

+package com.lframework.xingyun.sc.handlers;
+
+import com.lframework.starter.bpm.dto.FlowInstanceExtDto;
+import com.lframework.starter.bpm.enums.FlowInstanceStatus;
+import com.lframework.starter.bpm.service.BusinessDataHandlerService;
+import com.lframework.starter.web.core.utils.JsonUtil;
+import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
+import com.lframework.xingyun.sc.service.customer.CustomerDevelopPlanService;
+import lombok.extern.slf4j.Slf4j;
+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.listener.ListenerVariable;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+@Component
+@Slf4j
+public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerService {
+
+
+    @Resource
+    private CustomerDevelopPlanService customerDevelopPlanService;
+
+
+    /**
+     * 业务状态数据处理器
+     *
+     * @param listenerVariable  流程变量
+     */
+    @Override
+    public void businessStatusHandler(ListenerVariable listenerVariable) {
+        log.info("==================== 业务状态数据处理开始......");
+        Instance instance = listenerVariable.getInstance();
+        Map<String, Object> variable = listenerVariable.getVariable();
+        if (MapUtils.isEmpty(variable)) {
+            return;
+        }
+        String businessId = instance.getBusinessId();
+        // 获取业务数据标识
+        String ext = instance.getExt();
+        String businessType = null;
+        if (StringUtils.isNotBlank(ext)) {
+            FlowInstanceExtDto flowInstanceExtDto = JsonUtil.parseObject(ext, FlowInstanceExtDto.class);
+            businessType = flowInstanceExtDto.getBizFlag();
+        }
+        if (StringUtils.isBlank(businessType)) {
+            return;
+        }
+        // 获取审核结果
+        String flowStatus = instance.getFlowStatus();
+        // 更新业务数据
+        switch (businessType) {
+            case "CUSTOMER_DEVELOP":
+                handleCustomerDevelopData(flowStatus, businessId);
+                break;
+            default:
+                break;
+        }
+        log.info("==================== 业务状态数据处理结束......");
+    }
+
+
+    /**
+     * 客户开发业务数据处理
+     *
+     * @param businessId        业务ID
+     */
+    private void handleCustomerDevelopData(String flowStatus, String businessId) {
+        if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
+                || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
+            customerDevelopPlanService.updateStatus(businessId, CustomerDevelopStatus.PASS);
+        } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)) {
+            customerDevelopPlanService.updateStatus(businessId, CustomerDevelopStatus.REFUSE);
+        }
+    }
+}

@@ -91,7 +91,6 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
                     , JsonUtil.toJsonString(SecurityUtil.getCurrentUser().getId()));
             // 获取当前人员的待办任务数据
             List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
-            log.info("=================== CustomerDevelopPlanService.query flowTaskList =================={}", JsonUtil.toJsonString(flowTaskList));
             if (CollectionUtils.isEmpty(flowTaskList)) {
                 return new PageResult<>();
             }