!943 回退 'Pull Request !937 : feat: 客户成交周期分析(按区域、按产品)'

Merge pull request !943 from 芋道源码/revert-merge-937-develop

yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java

@@ -75,8 +75,4 @@ public interface ErrorCodeConstants {
     // ========== BPM 流程表达式 1-009-014-000 ==========
     ErrorCode PROCESS_EXPRESSION_NOT_EXISTS = new ErrorCode(1_009_014_000, "流程表达式不存在");
 
-    // ========== BPM 仿钉钉流程设计器 1-009-015-000 ==========
-    // TODO @芋艿：这个错误码，需要关注下
-    ErrorCode CONVERT_TO_SIMPLE_MODEL_NOT_SUPPORT = new ErrorCode(1_009_015_000, "该流程模型不支持仿钉钉设计流程");
-
 }

yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModelNodeType.java

@@ -1,47 +0,0 @@
-package cn.iocoder.yudao.module.bpm.enums.definition;
-
-import cn.hutool.core.util.ArrayUtil;
-import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-import java.util.Objects;
-
-/**
- * 仿钉钉的流程器设计器的模型节点类型
- *
- * @author jason
- */
-@Getter
-@AllArgsConstructor
-public enum BpmSimpleModelNodeType implements IntArrayValuable {
-
-    // TODO @jaosn：-1、0、1、4、-2 是前端已经定义好的么？感觉未来可以考虑搞成和 BPMN 尽量一致的单词哈；类似 usertask 用户审批；
-    START_EVENT_NODE(0, "开始节点"),
-    APPROVE_USER_NODE (1, "审批人节点"),
-    // 抄送人节点、对应 BPMN 的 ScriptTask. 使用ScriptTask 原因。好像 ServiceTask 自定义属性不能写入 XML
-    SCRIPT_TASK_NODE(2, "抄送人节点"),
-    EXCLUSIVE_GATEWAY_NODE(4, "排他网关"),
-    END_EVENT_NODE(-2, "结束节点");
-
-    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(BpmSimpleModelNodeType::getType).toArray();
-
-    private final Integer type;
-    private final String name;
-
-    public static boolean isGatewayNode(Integer type) {
-        // TODO 后续增加并行网关的支持
-        return Objects.equals(EXCLUSIVE_GATEWAY_NODE.getType(), type);
-    }
-
-    public static BpmSimpleModelNodeType valueOf(Integer type) {
-        return ArrayUtil.firstMatch(nodeType -> nodeType.getType().equals(type), values());
-    }
-
-    @Override
-    public int[] array() {
-        return ARRAYS;
-    }
-
-}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmSimpleModelController.java

@@ -1,39 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.simple.BpmSimpleModelNodeVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.simple.BpmSimpleModelSaveReqVO;
-import cn.iocoder.yudao.module.bpm.service.definition.BpmSimpleModelService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-// TODO @芋艿：后续考虑下，怎么放这个 Controller
-@Tag(name = "管理后台 - BPM 仿钉钉流程设计器")
-@RestController
-@RequestMapping("/bpm/simple")
-public class BpmSimpleModelController {
-    @Resource
-    private BpmSimpleModelService bpmSimpleModelService;
-
-    @PostMapping("/save")
-    @Operation(summary = "保存仿钉钉流程设计模型")
-    @PreAuthorize("@ss.hasPermission('bpm:model:update')")
-    public CommonResult<Boolean> saveSimpleModel(@Valid @RequestBody BpmSimpleModelSaveReqVO reqVO) {
-        return success(bpmSimpleModelService.saveSimpleModel(reqVO));
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得仿钉钉流程设计模型")
-    @Parameter(name = "modelId", description = "流程模型编号", required = true, example = "a2c5eee0-eb6c-11ee-abf4-0c37967c420a")
-    public CommonResult<BpmSimpleModelNodeVO> getSimpleModel(@RequestParam("modelId") String modelId){
-        return success(bpmSimpleModelService.getSimpleModel(modelId));
-    }
-
-}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/simple/BpmSimpleModelNodeVO.java

@@ -1,40 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.simple;
-
-import cn.iocoder.yudao.framework.common.validation.InEnum;
-import cn.iocoder.yudao.module.bpm.enums.definition.BpmSimpleModelNodeType;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.util.List;
-import java.util.Map;
-
-@Schema(description = "管理后台 - 仿钉钉流程设计模型节点 VO")
-@Data
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class BpmSimpleModelNodeVO {
-
-    @Schema(description = "模型节点编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "StartEvent_1")
-    @NotEmpty(message = "模型节点编号不能为空")
-    private String id;
-
-    @Schema(description = "模型节点类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "模型节点类型不能为空")
-    @InEnum(BpmSimpleModelNodeType.class)
-    private Integer type;
-
-    @Schema(description = "模型节点名称", example = "领导审批")
-    private String name;
-
-    @Schema(description = "孩子节点")
-    private BpmSimpleModelNodeVO childNode;
-
-    @Schema(description = "网关节点的条件节点")
-    private List<BpmSimpleModelNodeVO> conditionNodes;
-
-    @Schema(description = "节点的属性")
-    private Map<String, Object> attributes;
-
-}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/simple/BpmSimpleModelSaveReqVO.java

@@ -1,23 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.simple;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-// TODO @芋艿：或许挪到 model 里的 simple 包
-@Schema(description = "管理后台 - 仿钉钉流程设计模型的新增/修改 Request VO")
-@Data
-public class BpmSimpleModelSaveReqVO {
-
-    @Schema(description = "流程模型编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotEmpty(message = "流程模型编号不能为空")
-    private String modelId; // 对应 Flowable act_re_model 表 ID_ 字段
-
-    @Schema(description = "仿钉钉流程设计模型对象", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "仿钉钉流程设计模型对象不能为空")
-    @Valid
-    private BpmSimpleModelNodeVO simpleModelBody;
-
-}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/enums/BpmnModelConstants.java

@@ -1,10 +1,5 @@
 package cn.iocoder.yudao.module.bpm.framework.flowable.core.enums;
 
-import com.google.common.collect.ImmutableSet;
-import org.flowable.bpmn.model.*;
-
-import java.util.Set;
-
 /**
  * BPMN XML 常量信息
  *
@@ -28,15 +23,4 @@ public interface BpmnModelConstants {
      */
     String USER_TASK_CANDIDATE_PARAM = "candidateParam";
 
-    // TODO @芋艿：这里后面得关注下；
-    /**
-     * BPMN End Event 节点 Id， 用于后端生成 End Event 节点
-     */
-    String END_EVENT_ID = "EndEvent_1";
-
-    /**
-     * 支持转仿钉钉设计模型的 Bpmn 节点
-     */
-    Set<Class<? extends FlowNode>> SUPPORT_CONVERT_SIMPLE_FlOW_NODES = ImmutableSet.of(UserTask.class, EndEvent.class);
-
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmnModelUtils.java

@@ -1,35 +1,21 @@
 package cn.iocoder.yudao.module.bpm.framework.flowable.core.util;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.simple.BpmSimpleModelNodeVO;
-import cn.iocoder.yudao.module.bpm.enums.definition.BpmSimpleModelNodeType;
 import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants;
-import org.flowable.bpmn.BpmnAutoLayout;
 import org.flowable.bpmn.converter.BpmnXMLConverter;
 import org.flowable.bpmn.model.Process;
 import org.flowable.bpmn.model.*;
-import org.flowable.common.engine.impl.scripting.ScriptingEngines;
 import org.flowable.common.engine.impl.util.io.BytesStreamSource;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static org.flowable.bpmn.constants.BpmnXMLConstants.*;
+import java.util.*;
 
 /**
  * 流程模型转操作工具类
  */
 public class BpmnModelUtils {
 
-    public static final String BPMN_SIMPLE_COPY_EXECUTION_SCRIPT = "#{bpmSimpleNodeService.copy(execution)}";
-
     public static Integer parseCandidateStrategy(FlowElement userTask) {
         return NumberUtils.parseInt(userTask.getAttributeValue(
                 BpmnModelConstants.NAMESPACE, BpmnModelConstants.USER_TASK_CANDIDATE_STRATEGY));
@@ -340,196 +326,4 @@ public class BpmnModelUtils {
         return userTaskList;
     }
 
-    // ========== TODO 芋艿：这里得捉摸下； ==========
-
-    /**
-     * 仿钉钉流程设计模型数据结构(json) 转换成 Bpmn Model (待完善）
-     *
-     * @param processId       流程标识
-     * @param processName     流程名称
-     * @param simpleModelNode 仿钉钉流程设计模型数据结构
-     * @return Bpmn Model
-     */
-    public static BpmnModel convertSimpleModelToBpmnModel(String processId, String processName, BpmSimpleModelNodeVO simpleModelNode) {
-        BpmnModel bpmnModel = new BpmnModel();
-        Process mainProcess = new Process();
-        mainProcess.setId(processId);
-        mainProcess.setName(processName);
-        mainProcess.setExecutable(Boolean.TRUE);
-        bpmnModel.addProcess(mainProcess);
-        // 前端模型数据结构。 有 start event 节点. 没有 end event 节点。
-        // 添加 FlowNode
-        addBpmnFlowNode(mainProcess, simpleModelNode);
-        // 单独添加 end event 节点
-        addBpmnEndEventNode(mainProcess);
-        // 添加节点之间的连线 Sequence Flow
-        addBpmnSequenceFlow(mainProcess, simpleModelNode, BpmnModelConstants.END_EVENT_ID);
-        // 自动布局
-        new BpmnAutoLayout(bpmnModel).execute();
-        return bpmnModel;
-    }
-
-    private static void addBpmnSequenceFlow(Process mainProcess, BpmSimpleModelNodeVO node, String endId) {
-        // 节点为 null 退出
-        if (node == null || node.getId() == null) {
-            return;
-        }
-        BpmSimpleModelNodeVO childNode = node.getChildNode();
-        // 如果不是网关节点、且后续节点为 null. 添加与结束节点的连线
-        if (!BpmSimpleModelNodeType.isGatewayNode(node.getType()) && (childNode == null || childNode.getId() == null)) {
-            addBpmnSequenceFlowElement(mainProcess, node.getId(), endId, null, null);
-            return;
-        }
-        BpmSimpleModelNodeType nodeType = BpmSimpleModelNodeType.valueOf(node.getType());
-        Assert.notNull(nodeType, "模型节点类型不支持");
-        switch (nodeType) {
-            case START_EVENT_NODE:
-            case APPROVE_USER_NODE:
-            case SCRIPT_TASK_NODE: {
-                addBpmnSequenceFlowElement(mainProcess, node.getId(), childNode.getId(), null, null);
-                // 递归调用后续节点
-                addBpmnSequenceFlow(mainProcess, childNode, endId);
-                break;
-            }
-            case EXCLUSIVE_GATEWAY_NODE: {
-                String gateWayEndId = (childNode == null || childNode.getId() == null) ? BpmnModelConstants.END_EVENT_ID : childNode.getId();
-                List<BpmSimpleModelNodeVO> conditionNodes = node.getConditionNodes();
-                Assert.notEmpty(conditionNodes, "网关节点的条件节点不能为空");
-                for (int i = 0; i < conditionNodes.size(); i++) {
-                    BpmSimpleModelNodeVO item = conditionNodes.get(i);
-                    BpmSimpleModelNodeVO nextNodeOnCondition = item.getChildNode();
-                    if (nextNodeOnCondition != null && nextNodeOnCondition.getId() != null) {
-                        addBpmnSequenceFlowElement(mainProcess, node.getId(), nextNodeOnCondition.getId(),
-                                String.format("%s_SequenceFlow_%d", node.getId(), i + 1), null);
-                        addBpmnSequenceFlow(mainProcess, nextNodeOnCondition, gateWayEndId);
-                    } else {
-                        addBpmnSequenceFlowElement(mainProcess, node.getId(), gateWayEndId,
-                                String.format("%s_SequenceFlow_%d", node.getId(), i + 1), null);
-                    }
-                }
-                // 递归调用后续节点
-                addBpmnSequenceFlow(mainProcess, childNode, endId);
-                break;
-            }
-            default: {
-                // TODO 其它节点类型的实现
-            }
-        }
-
-    }
-
-    private static void addBpmnSequenceFlowElement(Process mainProcess, String sourceId, String targetId, String seqFlowId, String conditionExpression) {
-        SequenceFlow sequenceFlow = new SequenceFlow(sourceId, targetId);
-        if (StrUtil.isNotEmpty(conditionExpression)) {
-            sequenceFlow.setConditionExpression(conditionExpression);
-        }
-        if (StrUtil.isNotEmpty(seqFlowId)) {
-            sequenceFlow.setId(seqFlowId);
-        }
-        mainProcess.addFlowElement(sequenceFlow);
-    }
-
-    private static void addBpmnFlowNode(Process mainProcess, BpmSimpleModelNodeVO simpleModelNode) {
-        // 节点为 null 退出
-        if (simpleModelNode == null || simpleModelNode.getId() == null) {
-            return;
-        }
-        BpmSimpleModelNodeType nodeType = BpmSimpleModelNodeType.valueOf(simpleModelNode.getType());
-        Assert.notNull(nodeType, "模型节点类型不支持");
-        switch (nodeType) {
-            case START_EVENT_NODE:
-                addBpmnStartEventNode(mainProcess, simpleModelNode);
-                break;
-            case APPROVE_USER_NODE:
-                addBpmnUserTaskNode(mainProcess, simpleModelNode);
-                break;
-            case SCRIPT_TASK_NODE:
-                addBpmnScriptTaSskNode(mainProcess, simpleModelNode);
-                break;
-            case EXCLUSIVE_GATEWAY_NODE:
-                addBpmnExclusiveGatewayNode(mainProcess, simpleModelNode);
-                break;
-            default: {
-                // TODO 其它节点类型的实现
-            }
-        }
-
-        // 如果不是网关类型的接口， 并且chileNode为空退出
-        if (!BpmSimpleModelNodeType.isGatewayNode(simpleModelNode.getType()) && simpleModelNode.getChildNode() == null) {
-            return;
-        }
-
-        // 如果是网关类型接口. 递归添加条件节点
-        if (BpmSimpleModelNodeType.isGatewayNode(simpleModelNode.getType()) && ArrayUtil.isNotEmpty(simpleModelNode.getConditionNodes())) {
-            for (BpmSimpleModelNodeVO node : simpleModelNode.getConditionNodes()) {
-                addBpmnFlowNode(mainProcess, node.getChildNode());
-            }
-        }
-
-        // chileNode不为空，递归添加子节点
-        if (simpleModelNode.getChildNode() != null) {
-            addBpmnFlowNode(mainProcess, simpleModelNode.getChildNode());
-        }
-    }
-
-    private static void addBpmnScriptTaSskNode(Process mainProcess, BpmSimpleModelNodeVO node) {
-        ScriptTask scriptTask = new ScriptTask();
-        scriptTask.setId(node.getId());
-        scriptTask.setName(node.getName());
-        scriptTask.setScriptFormat(ScriptingEngines.DEFAULT_SCRIPTING_LANGUAGE);
-        scriptTask.setScript(BPMN_SIMPLE_COPY_EXECUTION_SCRIPT);
-        // 添加自定义属性
-        addExtensionAttributes(node, scriptTask);
-        mainProcess.addFlowElement(scriptTask);
-    }
-
-    private static void addExtensionAttributes(BpmSimpleModelNodeVO node, FlowElement flowElement) {
-        Integer candidateStrategy = MapUtil.getInt(node.getAttributes(), BpmnModelConstants.USER_TASK_CANDIDATE_STRATEGY);
-        addExtensionAttributes(flowElement, BpmnModelConstants.NAMESPACE, BpmnModelConstants.USER_TASK_CANDIDATE_STRATEGY,
-                candidateStrategy == null ? null : String.valueOf(candidateStrategy));
-        addExtensionAttributes(flowElement, BpmnModelConstants.NAMESPACE, BpmnModelConstants.USER_TASK_CANDIDATE_PARAM,
-                MapUtil.getStr(node.getAttributes(), BpmnModelConstants.USER_TASK_CANDIDATE_PARAM));
-    }
-
-    private static void addBpmnExclusiveGatewayNode(Process mainProcess, BpmSimpleModelNodeVO node) {
-        Assert.notEmpty(node.getConditionNodes(), "网关节点的条件节点不能为空");
-        ExclusiveGateway exclusiveGateway = new ExclusiveGateway();
-        exclusiveGateway.setId(node.getId());
-        // 条件节点的最后一个条件为 网关的 default sequence flow
-        exclusiveGateway.setDefaultFlow(String.format("%s_SequenceFlow_%d", node.getId(), node.getConditionNodes().size()));
-        mainProcess.addFlowElement(exclusiveGateway);
-    }
-
-    private static void addBpmnEndEventNode(Process mainProcess) {
-        EndEvent endEvent = new EndEvent();
-        endEvent.setId(BpmnModelConstants.END_EVENT_ID);
-        endEvent.setName("结束");
-        mainProcess.addFlowElement(endEvent);
-    }
-
-    private static void addBpmnUserTaskNode(Process mainProcess, BpmSimpleModelNodeVO node) {
-        UserTask userTask = new UserTask();
-        userTask.setId(node.getId());
-        userTask.setName(node.getName());
-        addExtensionAttributes(node, userTask);
-        mainProcess.addFlowElement(userTask);
-    }
-
-    private static void addExtensionAttributes(FlowElement element, String namespace, String name, String value) {
-        if (value == null) {
-            return;
-        }
-        ExtensionAttribute extensionAttribute = new ExtensionAttribute(name, value);
-        extensionAttribute.setNamespace(namespace);
-        extensionAttribute.setNamespacePrefix(FLOWABLE_EXTENSIONS_PREFIX);
-        element.addAttribute(extensionAttribute);
-    }
-
-    private static void addBpmnStartEventNode(Process mainProcess, BpmSimpleModelNodeVO node) {
-        StartEvent startEvent = new StartEvent();
-        startEvent.setId(node.getId());
-        startEvent.setName(node.getName());
-        mainProcess.addFlowElement(startEvent);
-    }
-
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java

@@ -46,30 +46,6 @@ public interface BpmModelService {
      */
     byte[] getModelBpmnXML(String id);
 
-
-    /**
-     * 保存流程模型的 BPMN XML
-     *
-     * @param id 编号
-     * @param xmlBytes BPMN XML bytes
-     */
-    // TODO @芋艿：可能要关注下；
-    void saveModelBpmnXml(String id, byte[] xmlBytes);
-
-    /**
-     * 获得仿钉钉快搭模型的 JSON 数据
-     * @param id 编号
-     * @return JSON bytes
-     */
-    byte[] getModelSimpleJson(String id);
-
-    /**
-     * 保存仿钉钉快搭模型的 JSON 数据
-     * @param id 编号
-     * @param jsonBytes JSON bytes
-     */
-    void saveModelSimpleJson(String id, byte[] jsonBytes);
-
     /**
      * 修改流程模型
      *

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java

@@ -1,6 +1,5 @@
 package cn.iocoder.yudao.module.bpm.service.definition;
 
-import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
@@ -104,7 +103,7 @@ public class BpmModelServiceImpl implements BpmModelService {
         // 保存流程定义
         repositoryService.saveModel(model);
         // 保存 BPMN XML
-        saveModelBpmnXml(model.getId(), StrUtil.utf8Bytes(bpmnXml));
+        saveModelBpmnXml(model, bpmnXml);
         return model.getId();
     }
 
@@ -122,7 +121,7 @@ public class BpmModelServiceImpl implements BpmModelService {
         // 更新模型
         repositoryService.saveModel(model);
         // 更新 BPMN XML
-        saveModelBpmnXml(model.getId(), StrUtil.utf8Bytes(updateReqVO.getBpmnXml()));
+        saveModelBpmnXml(model, updateReqVO.getBpmnXml());
     }
 
     @Override
@@ -237,25 +236,11 @@ public class BpmModelServiceImpl implements BpmModelService {
         }
     }
 
-    @Override
-    public void saveModelBpmnXml(String id,  byte[] xmlBytes) {
-        if (ArrayUtil.isEmpty(xmlBytes)) {
-            return;
-        }
-        repositoryService.addModelEditorSource(id, xmlBytes);
-    }
-
-    @Override
-    public byte[] getModelSimpleJson(String id) {
-        return repositoryService.getModelEditorSourceExtra(id);
-    }
-
-    @Override
-    public void saveModelSimpleJson(String id, byte[] jsonBytes) {
-        if (ArrayUtil.isEmpty(jsonBytes)) {
+    private void saveModelBpmnXml(Model model, String bpmnXml) {
+        if (StrUtil.isEmpty(bpmnXml)) {
             return;
         }
-        repositoryService.addModelEditorSourceExtra(id, jsonBytes);
+        repositoryService.addModelEditorSource(model.getId(), StrUtil.utf8Bytes(bpmnXml));
     }
 
     /**

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmSimpleModelService.java

@@ -1,29 +0,0 @@
-package cn.iocoder.yudao.module.bpm.service.definition;
-
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.simple.BpmSimpleModelNodeVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.simple.BpmSimpleModelSaveReqVO;
-import jakarta.validation.Valid;
-
-/**
- * 仿钉钉流程设计 Service 接口
- *
- * @author jason
- */
-public interface BpmSimpleModelService {
-
-    /**
-     * 保存仿钉钉流程设计模型
-     *
-     * @param reqVO 请求信息
-     */
-    Boolean saveSimpleModel(@Valid  BpmSimpleModelSaveReqVO reqVO);
-
-    /**
-     * 获取仿钉钉流程设计模型结构
-     *
-     * @param modelId 流程模型编号
-     * @return 仿钉钉流程设计模型结构
-     */
-    BpmSimpleModelNodeVO getSimpleModel(String modelId);
-
-}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmSimpleModelServiceImpl.java

@@ -1,170 +0,0 @@
-package cn.iocoder.yudao.module.bpm.service.definition;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.simple.BpmSimpleModelNodeVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.simple.BpmSimpleModelSaveReqVO;
-import cn.iocoder.yudao.module.bpm.enums.definition.BpmSimpleModelNodeType;
-import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants;
-import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils;
-import jakarta.annotation.Resource;
-import org.flowable.bpmn.model.*;
-import org.flowable.engine.repository.Model;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
-import java.util.List;
-import java.util.Map;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.CONVERT_TO_SIMPLE_MODEL_NOT_SUPPORT;
-import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.MODEL_NOT_EXISTS;
-import static cn.iocoder.yudao.module.bpm.enums.definition.BpmSimpleModelNodeType.START_EVENT_NODE;
-import static cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants.USER_TASK_CANDIDATE_PARAM;
-import static cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants.USER_TASK_CANDIDATE_STRATEGY;
-
-/**
- * 仿钉钉流程设计 Service 实现类
- *
- * @author jason
- */
-@Service
-@Validated
-public class BpmSimpleModelServiceImpl implements BpmSimpleModelService {
-
-    @Resource
-    private BpmModelService bpmModelService;
-
-    @Override
-    public Boolean saveSimpleModel(BpmSimpleModelSaveReqVO reqVO) {
-        Model model = bpmModelService.getModel(reqVO.getModelId());
-        if (model == null) {
-            throw exception(MODEL_NOT_EXISTS);
-        }
-//        byte[] bpmnBytes = bpmModelService.getModelBpmnXML(reqVO.getModelId());
-//        if (ArrayUtil.isEmpty(bpmnBytes)) {
-//            //  BPMN XML 不存在。新增
-//            BpmnModel bpmnModel = BpmnModelUtils.convertSimpleModelToBpmnModel(model.getKey(), model.getName(), reqVO.getSimpleModelBody());
-//            bpmModelService.saveModelBpmnXml(model.getId(), BpmnModelUtils.getBpmnXml(bpmnModel));
-//            return Boolean.TRUE;
-//        } else {
-//            // TODO BPMN XML 已经存在。如何修改 ?? TODO add by 芋艿：感觉一个流程，只能二选一，要么 bpmn、要么 simple
-//            return Boolean.FALSE;
-//        }
-        // 1. JSON 转换成 bpmnModel
-        BpmnModel bpmnModel = BpmnModelUtils.convertSimpleModelToBpmnModel(model.getKey(), model.getName(), reqVO.getSimpleModelBody());
-        // 2.1 保存 Bpmn XML
-        bpmModelService.saveModelBpmnXml(model.getId(), StrUtil.utf8Bytes(BpmnModelUtils.getBpmnXml(bpmnModel)));
-        // 2.2 保存 JSON 数据
-        bpmModelService.saveModelSimpleJson(model.getId(), JsonUtils.toJsonByte(reqVO.getSimpleModelBody()));
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public BpmSimpleModelNodeVO getSimpleModel(String modelId) {
-        Model model = bpmModelService.getModel(modelId);
-        if (model == null) {
-            throw exception(MODEL_NOT_EXISTS);
-        }
-        // 暂时不用 bpmn 转 json， 有点复杂,
-        // 通过 ACT_RE_MODEL 表 EDITOR_SOURCE_EXTRA_VALUE_ID_  获取 仿钉钉快搭模型的JSON 数据
-        byte[] jsonBytes = bpmModelService.getModelSimpleJson(model.getId());
-        return JsonUtils.parseObject(jsonBytes, BpmSimpleModelNodeVO.class);
-    }
-
-    // TODO @jason：一般要支持这个么？感觉 bpmn 转 json 支持会不会太复杂。可以优先级低一点，做下调研~
-
-    /**
-     * Bpmn Model 转换成 仿钉钉流程设计模型数据结构(json) 待完善
-     *
-     * @param bpmnModel Bpmn Model
-     * @return 仿钉钉流程设计模型数据结构
-     */
-    private BpmSimpleModelNodeVO convertBpmnModelToSimpleModel(BpmnModel bpmnModel) {
-        if (bpmnModel == null) {
-            return null;
-        }
-        StartEvent startEvent = BpmnModelUtils.getStartEvent(bpmnModel);
-        if (startEvent == null) {
-            return null;
-        }
-        BpmSimpleModelNodeVO rootNode = new BpmSimpleModelNodeVO();
-        rootNode.setType(START_EVENT_NODE.getType());
-        rootNode.setId(startEvent.getId());
-        rootNode.setName(startEvent.getName());
-        recursiveBuildSimpleModelNode(startEvent, rootNode);
-        return rootNode;
-    }
-
-    private void recursiveBuildSimpleModelNode(FlowNode currentFlowNode, BpmSimpleModelNodeVO currentSimpleModeNode) {
-        BpmSimpleModelNodeType nodeType = BpmSimpleModelNodeType.valueOf(currentSimpleModeNode.getType());
-        Assert.notNull(nodeType, "节点类型不支持");
-        // 校验节点是否支持转仿钉钉的流程模型
-        List<SequenceFlow> outgoingFlows = validateCanConvertSimpleNode(nodeType, currentFlowNode);
-        if (CollUtil.isEmpty(outgoingFlows) || outgoingFlows.get(0).getTargetFlowElement() == null) {
-            return;
-        }
-        FlowElement targetElement = outgoingFlows.get(0).getTargetFlowElement();
-        // 如果是 EndEvent 直接退出
-        if (targetElement instanceof EndEvent) {
-            return;
-        }
-        if (targetElement instanceof UserTask) {
-            BpmSimpleModelNodeVO childNode = convertUserTaskToSimpleModelNode((UserTask) targetElement);
-            currentSimpleModeNode.setChildNode(childNode);
-            recursiveBuildSimpleModelNode((FlowNode) targetElement, childNode);
-        }
-        // TODO 其它节点类型待实现
-    }
-
-    private BpmSimpleModelNodeVO convertUserTaskToSimpleModelNode(UserTask userTask) {
-        BpmSimpleModelNodeVO simpleModelNodeVO = new BpmSimpleModelNodeVO();
-        simpleModelNodeVO.setType(BpmSimpleModelNodeType.APPROVE_USER_NODE.getType());
-        simpleModelNodeVO.setName(userTask.getName());
-        simpleModelNodeVO.setId(userTask.getId());
-        Map<String, Object> attributes = MapUtil.newHashMap();
-        // TODO 暂时是普通审批，需要加会签
-        attributes.put("approveMethod", 1);
-        attributes.computeIfAbsent(USER_TASK_CANDIDATE_STRATEGY, (key) -> BpmnModelUtils.parseCandidateStrategy(userTask));
-        attributes.computeIfAbsent(USER_TASK_CANDIDATE_PARAM, (key) -> BpmnModelUtils.parseCandidateParam(userTask));
-        simpleModelNodeVO.setAttributes(attributes);
-        return simpleModelNodeVO;
-    }
-
-    private List<SequenceFlow> validateCanConvertSimpleNode(BpmSimpleModelNodeType nodeType, FlowNode currentFlowNode) {
-        switch (nodeType) {
-            case START_EVENT_NODE:
-            case APPROVE_USER_NODE: {
-                List<SequenceFlow> outgoingFlows = currentFlowNode.getOutgoingFlows();
-                if (CollUtil.isNotEmpty(outgoingFlows) && outgoingFlows.size() > 1) {
-                    throw exception(CONVERT_TO_SIMPLE_MODEL_NOT_SUPPORT);
-                }
-                validIsSupportFlowNode(outgoingFlows.get(0).getTargetFlowElement());
-                return outgoingFlows;
-            }
-            default: {
-                // TODO 其它节点类型待实现
-                throw exception(CONVERT_TO_SIMPLE_MODEL_NOT_SUPPORT);
-            }
-        }
-    }
-
-    private void validIsSupportFlowNode(FlowElement targetElement) {
-        if (targetElement == null) {
-            return;
-        }
-        boolean isSupport = false;
-        for (Class<? extends FlowNode> item : BpmnModelConstants.SUPPORT_CONVERT_SIMPLE_FlOW_NODES) {
-            if (item.isInstance(targetElement)) {
-                isSupport = true;
-                break;
-            }
-        }
-        if (!isSupport) {
-            throw exception(CONVERT_TO_SIMPLE_MODEL_NOT_SUPPORT);
-        }
-    }
-}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceCopyService.java

@@ -17,11 +17,9 @@ public interface BpmProcessInstanceCopyService {
      * 流程实例的抄送
      *
      * @param userIds 抄送的用户编号
-     * @param processInstanceId 流程编号
-     * @param taskId 任务编号
-     * @param taskName 任务名称
+     * @param taskId 流程任务编号
      */
-    void createProcessInstanceCopy(Collection<Long> userIds, String processInstanceId, String taskId, String taskName);
+    void createProcessInstanceCopy(Collection<Long> userIds, String taskId);
 
     /**
      * 获得抄送的流程的分页

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceCopyServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.bpm.service.task;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceCopyPageReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceCopyDO;
@@ -10,6 +11,7 @@ import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.repository.ProcessDefinition;
 import org.flowable.engine.runtime.ProcessInstance;
+import org.flowable.task.api.Task;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -45,14 +47,14 @@ public class BpmProcessInstanceCopyServiceImpl implements BpmProcessInstanceCopy
     private BpmProcessDefinitionService processDefinitionService;
 
     @Override
-    public void createProcessInstanceCopy(Collection<Long> userIds, String processInstanceId, String taskId, String taskName) {
-        // 1.1 校验任务存在 暂时去掉这个校验. 因为任务可能仿钉钉快搭的抄送节点(ScriptTask)
-//        Task task = taskService.getTask(taskId);
-//        if (ObjectUtil.isNull(task)) {
-//            throw exception(ErrorCodeConstants.TASK_NOT_EXISTS);
-//        }
+    public void createProcessInstanceCopy(Collection<Long> userIds, String taskId) {
+        // 1.1 校验任务存在
+        Task task = taskService.getTask(taskId);
+        if (ObjectUtil.isNull(task)) {
+            throw exception(ErrorCodeConstants.TASK_NOT_EXISTS);
+        }
         // 1.2 校验流程实例存在
-//      String processInstanceId = task.getProcessInstanceId();
+        String processInstanceId = task.getProcessInstanceId();
         ProcessInstance processInstance = processInstanceService.getProcessInstance(processInstanceId);
         if (processInstance == null) {
             throw exception(ErrorCodeConstants.PROCESS_INSTANCE_NOT_EXISTS);
@@ -68,7 +70,7 @@ public class BpmProcessInstanceCopyServiceImpl implements BpmProcessInstanceCopy
         List<BpmProcessInstanceCopyDO> copyList = convertList(userIds, userId -> new BpmProcessInstanceCopyDO()
                 .setUserId(userId).setStartUserId(Long.valueOf(processInstance.getStartUserId()))
                 .setProcessInstanceId(processInstanceId).setProcessInstanceName(processInstance.getName())
-                .setCategory(processDefinition.getCategory()).setTaskId(taskId).setTaskName(taskName));
+                .setCategory(processDefinition.getCategory()).setTaskId(taskId).setTaskName(task.getName()));
         processInstanceCopyMapper.insertBatch(copyList);
     }
 

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmSimpleNodeService.java

@@ -1,34 +0,0 @@
-package cn.iocoder.yudao.module.bpm.service.task;
-
-import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateInvoker;
-import jakarta.annotation.Resource;
-import org.flowable.bpmn.model.FlowElement;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.springframework.stereotype.Service;
-
-import java.util.Set;
-
-/**
- * 仿钉钉快搭各个节点 Service
- * @author jason
- */
-@Service
-public class BpmSimpleNodeService {
-
-    @Resource
-    private BpmTaskCandidateInvoker taskCandidateInvoker;
-    @Resource
-    private BpmProcessInstanceCopyService processInstanceCopyService;
-
-    /**
-     * 仿钉钉快搭抄送
-     * @param execution 执行的任务(ScriptTask)
-     */
-    public Boolean copy(DelegateExecution execution) {
-        Set<Long> userIds = taskCandidateInvoker.calculateUsers(execution);
-        FlowElement currentFlowElement = execution.getCurrentFlowElement();
-        processInstanceCopyService.createProcessInstanceCopy(userIds, execution.getProcessInstanceId(),
-                currentFlowElement.getId(), currentFlowElement.getName());
-        return Boolean.TRUE;
-    }
-}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java

@@ -186,8 +186,7 @@ public class BpmTaskServiceImpl implements BpmTaskService {
 
         // 2. 抄送用户
         if (CollUtil.isNotEmpty(reqVO.getCopyUserIds())) {
-            processInstanceCopyService.createProcessInstanceCopy(reqVO.getCopyUserIds(), instance.getProcessInstanceId(),
-                    reqVO.getId(), task.getName());
+            processInstanceCopyService.createProcessInstanceCopy(reqVO.getCopyUserIds(), reqVO.getId());
         }
 
         // 情况一：被委派的任务，不调用 complete 去完成任务

yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/CrmStatisticsCustomerController.http

@@ -53,13 +53,3 @@ tenant-id: {{adminTenentId}}
 GET {{baseUrl}}/crm/statistics-customer/get-customer-deal-cycle-by-user?deptId=100&times[0]=2023-01-01 00:00:00&times[1]=2024-12-12 23:59:59
 Authorization: Bearer {{token}}
 tenant-id: {{adminTenentId}}
-
-### 6.3 获取客户成交周期(按区域)
-GET {{baseUrl}}/crm/statistics-customer/get-customer-deal-cycle-by-area?deptId=100&times[0]=2023-01-01 00:00:00&times[1]=2024-12-12 23:59:59
-Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
-
-### 6.4 获取客户成交周期(按产品)
-GET {{baseUrl}}/crm/statistics-customer/get-customer-deal-cycle-by-product?deptId=100&times[0]=2023-01-01 00:00:00&times[1]=2024-12-12 23:59:59
-Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}

yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/CrmStatisticsCustomerController.java

@@ -96,18 +96,6 @@ public class CrmStatisticsCustomerController {
         return success(customerService.getCustomerDealCycleByUser(reqVO));
     }
 
-    @GetMapping("/get-customer-deal-cycle-by-area")
-    @Operation(summary = "获取客户成交周期(按用户)")
-    @PreAuthorize("@ss.hasPermission('crm:statistics-customer:query')")
-    public CommonResult<List<CrmStatisticsCustomerDealCycleByAreaRespVO>> getCustomerDealCycleByArea(@Valid CrmStatisticsCustomerReqVO reqVO) {
-        return success(customerService.getCustomerDealCycleByArea(reqVO));
-    }
-
-    @GetMapping("/get-customer-deal-cycle-by-product")
-    @Operation(summary = "获取客户成交周期(按用户)")
-    @PreAuthorize("@ss.hasPermission('crm:statistics-customer:query')")
-    public CommonResult<List<CrmStatisticsCustomerDealCycleByProductRespVO>> getCustomerDealCycleByProduct(@Valid CrmStatisticsCustomerReqVO reqVO) {
-        return success(customerService.getCustomerDealCycleByProduct(reqVO));
-    }
+    // TODO dhb52：【成交周期分析】里，有按照员工（已实现）、地区（未实现）、产品（未实现），需要在看看哈；可以把 CustomerDealCycle 拆成 3 个 tab，员工客户成交周期分析、地区客户成交周期分析、产品客户成交周期分析；
 
 }

yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/customer/CrmStatisticsCustomerDealCycleByAreaRespVO.java

@@ -1,24 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description = "管理后台 - CRM 客户成交周期分析(按区域) VO")
-@Data
-public class CrmStatisticsCustomerDealCycleByAreaRespVO {
-
-    @Schema(description = "省份编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @JsonIgnore
-    private Integer areaId;
-
-    @Schema(description = "省份名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "浙江省")
-    private String areaName;
-
-    @Schema(description = "成交周期", requiredMode = Schema.RequiredMode.REQUIRED, example = "1.0")
-    private Double customerDealCycle;
-
-    @Schema(description = "成交客户数", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Integer customerDealCount;
-
-}

yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/customer/CrmStatisticsCustomerDealCycleByProductRespVO.java

@@ -1,19 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description = "管理后台 - CRM 客户成交周期分析(按产品) VO")
-@Data
-public class CrmStatisticsCustomerDealCycleByProductRespVO {
-
-    @Schema(description = "产品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "演示产品")
-    private String productName;
-
-    @Schema(description = "成交周期", requiredMode = Schema.RequiredMode.REQUIRED, example = "1.0")
-    private Double customerDealCycle;
-
-    @Schema(description = "成交客户数", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Integer customerDealCount;
-
-}

yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/statistics/CrmStatisticsCustomerMapper.java

@@ -53,7 +53,6 @@ public interface CrmStatisticsCustomerMapper {
 
     /**
      * 合同总金额(按用户)
-     *
      * @return 统计数据@return 统计数据@param reqVO 请求参数
      * @return 统计数据
      */
@@ -192,20 +191,4 @@ public interface CrmStatisticsCustomerMapper {
      */
     List<CrmStatisticsCustomerDealCycleByUserRespVO> selectCustomerDealCycleGroupByUser(CrmStatisticsCustomerReqVO reqVO);
 
-    /**
-     * 客户成交周期(按区域)
-     *
-     * @param reqVO 请求参数
-     * @return 统计数据
-     */
-    List<CrmStatisticsCustomerDealCycleByAreaRespVO> selectCustomerDealCycleGroupByAreaId(CrmStatisticsCustomerReqVO reqVO);
-
-    /**
-     * 客户成交周期(按产品)
-     *
-     * @param reqVO 请求参数
-     * @return 统计数据
-     */
-    List<CrmStatisticsCustomerDealCycleByProductRespVO> selectCustomerDealCycleGroupByProductId(CrmStatisticsCustomerReqVO reqVO);
-
 }

yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsCustomerService.java

@@ -77,7 +77,7 @@ public interface CrmStatisticsCustomerService {
 
     /**
      * 客户成交周期(按日期)
-     * <p>
+     *
      * 成交周期的定义：客户 customer 在创建出来，到合同 contract 第一次成交的时间差
      *
      * @param reqVO 请求参数
@@ -93,20 +93,4 @@ public interface CrmStatisticsCustomerService {
      */
     List<CrmStatisticsCustomerDealCycleByUserRespVO> getCustomerDealCycleByUser(CrmStatisticsCustomerReqVO reqVO);
 
-    /**
-     * 客户成交周期(按区域)
-     *
-     * @param reqVO 请求参数
-     * @return 统计数据
-     */
-    List<CrmStatisticsCustomerDealCycleByAreaRespVO> getCustomerDealCycleByArea(CrmStatisticsCustomerReqVO reqVO);
-
-    /**
-     * 客户成交周期(按产品)
-     *
-     * @param reqVO 请求参数
-     * @return 统计数据
-     */
-    List<CrmStatisticsCustomerDealCycleByProductRespVO> getCustomerDealCycleByProduct(CrmStatisticsCustomerReqVO reqVO);
-
 }

yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsCustomerServiceImpl.java

@@ -4,9 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
 import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
-import cn.iocoder.yudao.framework.ip.core.Area;
-import cn.iocoder.yudao.framework.ip.core.enums.AreaTypeEnum;
-import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
 import cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.*;
 import cn.iocoder.yudao.module.crm.dal.mysql.statistics.CrmStatisticsCustomerMapper;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
@@ -22,7 +19,6 @@ import java.time.LocalDateTime;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
 import java.util.stream.Stream;
 
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
@@ -294,51 +290,6 @@ public class CrmStatisticsCustomerServiceImpl implements CrmStatisticsCustomerSe
         return summaryList;
     }
 
-    @Override
-    public List<CrmStatisticsCustomerDealCycleByAreaRespVO> getCustomerDealCycleByArea(CrmStatisticsCustomerReqVO reqVO) {
-        // 1. 获得用户编号数组
-        List<Long> userIds = getUserIds(reqVO);
-        if (CollUtil.isEmpty(userIds)) {
-            return Collections.emptyList();
-        }
-        reqVO.setUserIds(userIds);
-
-        // 2. 获取客户地区统计数据
-        List<CrmStatisticsCustomerDealCycleByAreaRespVO> dealCycleByAreaList = customerMapper.selectCustomerDealCycleGroupByAreaId(reqVO);
-        if (CollUtil.isEmpty(dealCycleByAreaList)) {
-            return Collections.emptyList();
-        }
-
-        // 3. 拼接数据
-        Map<Integer, Area> areaMap = convertMap(AreaUtils.getByType(AreaTypeEnum.PROVINCE, Function.identity()),
-                                                Area::getId);
-        return convertList(dealCycleByAreaList, vo -> {
-            if (vo.getAreaId() != null) {
-                Integer parentId = AreaUtils.getParentIdByType(vo.getAreaId(), AreaTypeEnum.PROVINCE);
-                findAndThen(areaMap, parentId, area -> vo.setAreaId(parentId).setAreaName(area.getName()));
-            }
-            return vo;
-        });
-    }
-
-    @Override
-    public List<CrmStatisticsCustomerDealCycleByProductRespVO> getCustomerDealCycleByProduct(CrmStatisticsCustomerReqVO reqVO) {
-        // 1. 获得用户编号数组
-        List<Long> userIds = getUserIds(reqVO);
-        if (CollUtil.isEmpty(userIds)) {
-            return Collections.emptyList();
-        }
-        reqVO.setUserIds(userIds);
-
-        // 2. 获取客户产品统计数据
-        List<CrmStatisticsCustomerDealCycleByProductRespVO> dealCycleByProductList = customerMapper.selectCustomerDealCycleGroupByProductId(reqVO);
-        if (CollUtil.isEmpty(dealCycleByProductList)) {
-            return Collections.emptyList();
-        }
-
-        return dealCycleByProductList;
-    }
-
     /**
      * 拼接用户信息（昵称）
      *

yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/statistics/CrmStatisticsCustomerMapper.xml

@@ -19,18 +19,17 @@
     <!-- TODO 芋艿：应该不用过滤时间 -->
     <select id="selectCustomerDealCountGroupByDate"
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerSummaryByDateRespVO">
-        SELECT DATE_FORMAT(customer.create_time, '%Y-%m-%d')    AS time,
-               COUNT(DISTINCT customer.id)                      AS customer_deal_count
+        SELECT DATE_FORMAT(customer.create_time, '%Y-%m-%d') AS time,
+               COUNT(DISTINCT customer.id) AS customer_deal_count
           FROM crm_customer AS customer
                 LEFT JOIN crm_contract AS contract ON contract.customer_id = customer.id
-         WHERE customer.deleted = 0
-           AND contract.deleted = 0
+         WHERE customer.deleted = 0 AND contract.deleted = 0
            AND contract.audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
            AND customer.owner_user_id IN
                 <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
                     #{userId}
                 </foreach>
-           AND customer.create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
+           AND contract.create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
          GROUP BY time
     </select>
 
@@ -54,14 +53,13 @@
                COUNT(DISTINCT customer.id) AS customer_deal_count
           FROM crm_customer AS customer
                 LEFT JOIN crm_contract AS contract ON contract.customer_id = customer.id
-         WHERE customer.deleted = 0
-           AND contract.deleted = 0
+         WHERE customer.deleted = 0 AND contract.deleted = 0
            AND contract.audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
            AND customer.owner_user_id IN
                 <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
                     #{userId}
                 </foreach>
-           AND customer.create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
+           AND contract.create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
          GROUP BY customer.owner_user_id
     </select>
 
@@ -223,42 +221,4 @@
          GROUP BY customer.owner_user_id
     </select>
 
-    <select id="selectCustomerDealCycleGroupByAreaId"
-            resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerDealCycleByAreaRespVO">
-        SELECT customer.area_id AS area_id,
-               IFNULL(TRUNCATE(AVG(TIMESTAMPDIFF(DAY, customer.create_time, contract.order_date)), 1), 0) AS customer_deal_cycle,
-               COUNT(DISTINCT customer.id) AS customer_deal_count
-        FROM crm_customer AS customer
-                LEFT JOIN crm_contract AS contract ON customer.id = contract.customer_id
-        WHERE customer.deleted = 0
-          AND contract.deleted = 0
-          AND contract.audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
-          AND customer.owner_user_id IN
-                <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
-                    #{userId}
-                </foreach>
-          AND customer.create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
-        GROUP BY
-            customer.area_id
-    </select>
-
-    <select id="selectCustomerDealCycleGroupByProductId"
-            resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerDealCycleByProductRespVO">
-        SELECT (SELECT name FROM crm_product WHERE id = product.id)                                         AS product_name,
-               IFNULL(TRUNCATE(AVG(TIMESTAMPDIFF(DAY, customer.create_time, contract.order_date)), 1), 0)   AS customer_deal_cycle,
-               COUNT(DISTINCT customer.id)                                                                  AS customer_deal_count
-          FROM crm_customer AS customer
-                LEFT JOIN crm_contract AS contract ON customer.id = contract.customer_id
-                LEFT JOIN crm_contract_product AS product ON product.contract_id = contract.id
-         WHERE customer.deleted = 0
-           AND contract.deleted = 0
-           AND contract.audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
-           AND customer.owner_user_id IN
-                 <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
-                     #{userId}
-                 </foreach>
-           AND customer.create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
-        GROUP BY product.id
-    </select>
-
 </mapper>