refactor(crm): 为 CrmCustomerSaveReqVO 类中的 repeatConfirmationFlag 字段添加默认值0

feat(crm): 添加线索跟进任务并优化客户导入功能
- 新增线索跟进任务定时 job，自动更新三天未跟进的线索状态- 优化客户导入功能，增加重复客户检测和提示 - 添加合同编号字段到发票响应 VO- 修改合同列表获取逻辑，支持下属和自己的合同查询 -优化发票列表查询，支持关系筛选 - 新增商机状态更新接口
2025-03-13 15:23:41 +08:00 · 2025-03-13 15:20:39 +08:00 · 2025-03-11 10:15:17 +08:00 · 2025-03-10 21:11:01 +08:00 · 2025-03-10 21:10:37 +08:00 · 2025-03-10 21:10:19 +08:00
45 changed files with 601 additions and 165 deletions
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessCcController.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessCcController.java
@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.bpm.controller.admin.definition;

+import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@ -85,27 +86,31 @@ public class BpmProcessCcController {
        PageResult<BpmProcessCcDO> pageResult = processCcService.getProcessCcPage(pageReqVO);
        PageResult<BpmProcessCcRespVO> respVOPageResult = BeanUtils.toBean(pageResult, BpmProcessCcRespVO.class);

-        // 获取公司部门Map
-        Map<Long, DeptRespDTO> deptMap = convertMap(deptApi.getCompanyDept().getCheckedData(), DeptRespDTO::getId);
-        // 获取列表中所有用户组详情
-        List<BpmUserGroupDO> groupDOS = groupService.getUserGroupList(
-                respVOPageResult.getList().stream()
-                        .flatMap(item -> item.getUserGroupId().stream())
-                        .collect(Collectors.toSet()));
-        // 转换Map
-        Map<Long, String> groupNameMap = convertMap(groupDOS, BpmUserGroupDO::getId, BpmUserGroupDO::getName);
+        if (CollUtil.isNotEmpty(respVOPageResult.getList())) {

-        respVOPageResult.getList().forEach(data -> {
+            // 获取公司部门Map
+            Map<Long, DeptRespDTO> deptMap = convertMap(deptApi.getCompanyDept().getCheckedData(), DeptRespDTO::getId);
+            // 获取列表中所有用户组详情
+            List<BpmUserGroupDO> groupDOS = groupService.getUserGroupList(
+                    respVOPageResult.getList().stream()
+                            .flatMap(item -> item.getUserGroupId().stream())
+                            .collect(Collectors.toSet()));
+            // 转换Map
+            Map<Long, String> groupNameMap = convertMap(groupDOS, BpmUserGroupDO::getId, BpmUserGroupDO::getName);
+
+            respVOPageResult.getList().forEach(data -> {
+
+                // 设置用户组名称
+                data.setGroupName(data.getUserGroupId().stream()
+                        .map(groupNameMap::get)
+                        .collect(Collectors.joining("、")));
+                // 设置公司名称
+                data.setCompanyName(data.getCompanyDeptId().stream()
+                        .map(item -> deptMap.get(item) != null ? deptMap.get(item).getName() : "")
+                        .collect(Collectors.joining("、")));
+            });
+        }

-            // 设置用户组名称
-            data.setGroupName(data.getUserGroupId().stream()
-                    .map(groupNameMap::get)
-                    .collect(Collectors.joining("、")));
-            // 设置公司名称
-            data.setCompanyName(data.getCompanyDeptId().stream()
-                    .map(item -> deptMap.get(item) != null ? deptMap.get(item).getName() : "")
-                    .collect(Collectors.joining("、")));
-        });
        return success(respVOPageResult);
    }
 }
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAContractController.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAContractController.java
@ -37,7 +37,6 @@ import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUti
 * OA 合同审批 Controller
 *
 * @author 符溶馨
-
 */
@Tag(name = "管理后台 - OA 合同审批")
@RestController
@ -68,7 +67,6 @@ public class BpmOAContractController {
    @Operation(summary = "获得合同审批")
    @Parameter(name = "id", description = "编号", required = true, example = "1024")
    public CommonResult<BpmOAContractRespVO> getContract(@RequestParam("id") Long id) {
-
        BpmOAContractDO contract = contractService.getContract(id);
        BpmOAContractRespVO respVO = BpmOAContractConvert.INSTANCE.convert(contract);
        if (respVO != null) {
@ -137,15 +135,12 @@ public class BpmOAContractController {
        return success(contractService.getContractPage(pageReqVO));
    }

-    @GetMapping("/getListByDeptId")
-    @Operation(summary = "获得同部门的销售合同")
-    public CommonResult<List<BpmOAContractRespVO>> getListByDeptId() {
-
-        // 获取同部门所有用户id
-        List<Long> userIds = userApi.getUserIdsByUserIdGroupByDept(getLoginUserId()).getCheckedData();
-
-        List<BpmOAContractDO> contracts = contractService.getListByDeptId(userIds);
-
+    @GetMapping("/getList")
+    @Operation(summary = "获取下属和自己的合同列表")
+    public CommonResult<List<BpmOAContractRespVO>> getList(@RequestParam(required = false) String relation,
+                                                           @RequestParam(required = false) Integer contractType,
+                                                           @RequestParam(required = false) String contractName) {
+        List<BpmOAContractDO> contracts = contractService.getList(relation, contractType, contractName);
        return success(BeanUtils.toBean(contracts, BpmOAContractRespVO.class));
    }

--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAImprestController.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAImprestController.java
@ -58,12 +58,14 @@ public class BpmOAImprestController {
        BpmOAImprestDO imprest = imprestService.getImprest(id);
        BpmOAImprestRespVO respVO = BpmOAImprestConvert.INSTANCE.convert(imprest);
        if (respVO != null) {
-            // 获取收款账号信息
-            BankRespDTO bankRespDTO = bankApi.getBank(respVO.getBankId()).getCheckedData();
-            if (bankRespDTO != null) {
-                respVO.setBankName(bankRespDTO.getBankName());
-                respVO.setNickname(bankRespDTO.getNickname());
-                respVO.setBankNo(bankRespDTO.getBankNo());
+            if (respVO.getBankId() != null) {
+                // 获取收款账号信息
+                BankRespDTO bankRespDTO = bankApi.getBank(respVO.getBankId()).getCheckedData();
+                if (bankRespDTO != null) {
+                    respVO.setBankName(bankRespDTO.getBankName());
+                    respVO.setNickname(bankRespDTO.getNickname());
+                    respVO.setBankNo(bankRespDTO.getBankNo());
+                }
            }

            // 获取公司信息
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/invoice/BpmOAInvoiceRespVO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/invoice/BpmOAInvoiceRespVO.java
@ -26,6 +26,9 @@ public class BpmOAInvoiceRespVO extends BpmOABaseRespVO {
    @Schema(description = "合同名称", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    private String contractName;

+    @Schema(description = "合同编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    private String contractNo;
+
    @Schema(description = "关联合同流程实例编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    private String contractInstanceId;

--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOAInvoiceMapper.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOAInvoiceMapper.java
@ -16,32 +16,17 @@ import java.util.Objects;
 public interface BpmOAInvoiceMapper extends BaseMapperX<BpmOAInvoiceDO> {

    default PageResult<BpmOAInvoiceRespVO> selectPage(BpmOAInvoicePageReqVO pageReqVO,
-                                                      Long userId) {
+                                                      List<Long> userIds) {

        MPJLambdaWrapperX<BpmOAInvoiceDO> query = new MPJLambdaWrapperX<>();
        query.selectAll(BpmOAInvoiceDO.class);
        query.selectAs(BpmOAContractDO::getContractName, BpmOAInvoiceRespVO::getContractName);
        query.selectAs(BpmOAContractDO::getCustomerName, BpmOAInvoiceRespVO::getCustomerName);
+        query.selectAs(BpmOAContractDO::getContractNo, BpmOAInvoiceRespVO::getContractNo);
        query.leftJoin(BpmOAContractDO.class, "c", BpmOAContractDO::getId, BpmOAInvoiceDO::getContractId);
        query.apply(Objects.nonNull(pageReqVO.getContractName()), "c.contract_name LIKE CONCAT('%', {0}, '%')", pageReqVO.getContractName());
        query.apply(Objects.nonNull(pageReqVO.getCustomerName()), "c.customer_name LIKE CONCAT('%', {0}, '%')", pageReqVO.getCustomerName());
-        if ("my".equals(pageReqVO.getRelation())) {
-            query.eq(BpmOAContractDO::getUserId, userId);
-        }else if ("sub".equals(pageReqVO.getRelation())){
-            query.innerJoin("(" +
-                    "\tSELECT DISTINCT\n" +
-                    "\t\tu.id \n" +
-                    "\tFROM\n" +
-                    "\t\tsystem_users u\n" +
-                    "\t\tINNER JOIN system_dept d ON d.leader_user_id = "+ userId +"\n" +
-                    "\t\tINNER JOIN system_dept d1 ON d1.flag LIKE CONCAT( '%', d.id, '-' ) \n" +
-                    "\t\tOR d1.flag LIKE CONCAT( '%-', d.id, '-%' ) \n" +
-                    "\t\tOR d1.flag LIKE CONCAT( '-', d.id, '%' ) \n" +
-                    "\tWHERE\n" +
-                    "\t\tu.dept_id = d1.id \n" +
-                    "\t\tAND u.STATUS = 0 \n" +
-                    "\t) subordinate ON subordinate.id = t.user_id");
-        }
+        query.in(BpmOAInvoiceDO::getUserId, userIds);
        query.orderByDesc(BpmOAInvoiceDO::getCreateTime);

        return selectJoinPage(pageReqVO, BpmOAInvoiceRespVO.class, query);
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAContractService.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAContractService.java
@ -127,4 +127,11 @@ public interface BpmOAContractService {
     * @param contractIds
     */
    void updateSettlementFlagByIds(List<Long> contractIds);
+
+    /**
+     * 获取下属和自己的合同列表
+     *
+     * @return
+     */
+    List<BpmOAContractDO> getList(String relation, Integer contractType, String contractName);
 }
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAContractServiceImpl.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAContractServiceImpl.java
@ -2,9 +2,7 @@ package cn.iocoder.yudao.module.bpm.service.oa;

 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.NumberUtil;
 import cn.iocoder.yudao.framework.common.enums.ShopCommonEnum;
-import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.UploadUserFile;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@ -18,6 +16,7 @@ import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOAContractMapper;
 import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
 import cn.iocoder.yudao.module.bpm.service.task.BpmHistoryProcessInstanceService;
 import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
+import cn.iocoder.yudao.module.hrm.api.crmbusiness.BusinessApi;
 import cn.iocoder.yudao.module.hrm.api.crmcontract.ContractApi;
 import cn.iocoder.yudao.module.hrm.api.crmcontract.dto.CrmContractProductDTO;
 import cn.iocoder.yudao.module.hrm.api.crmcustomer.CrmCustomerApi;
@ -25,8 +24,6 @@ import cn.iocoder.yudao.module.hrm.api.crmcustomer.dto.CrmCustomerDTO;
 import cn.iocoder.yudao.module.hrm.api.userlivetree.UserLiveTreeApi;
 import cn.iocoder.yudao.module.product.api.storeproduct.StoreProductApi;
 import cn.iocoder.yudao.module.product.api.storeproductattrvalue.StoreProductAttrValueApi;
-import cn.iocoder.yudao.module.product.api.storeproductattrvalue.dto.StoreProductAttrValueApiDTO;
-import cn.iocoder.yudao.module.product.api.storeproductattrvalue.vo.StoreProductAttrValueApiVO;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
@ -107,7 +104,8 @@ public class BpmOAContractServiceImpl extends BpmOABaseService implements BpmOAC

    @Resource
    private CrmCustomerApi customerApi;
-
+    @Resource
+    private BusinessApi businessApi;
    @Resource
    private UserLiveTreeApi userLiveTreeApi;

@ -206,13 +204,15 @@ public class BpmOAContractServiceImpl extends BpmOABaseService implements BpmOAC
            ProcessInstance instance = processInstanceService.getProcessInstance(processInstanceId);

            if (instance.isEnded()) {
-
                // 审批通过后，更新客户成交信息
                customerApi.updateCustomerPurchaseTotal(new CrmCustomerDTO()
                        .setId(contract.getCustomerId())
                        .setDealStatus(ShopCommonEnum.IS_STATUS_1.getValue())
                        .setDealTime(LocalDateTime.now())
                        .setPurchaseTotal(contract.getContractMoney()));
+
+                // 审批通过后，更新商机状态
+                businessApi.updateIsEnd(contract.getBusinessId(), ShopCommonEnum.IS_STATUS_1.getValue());
            }
        }

@ -354,6 +354,27 @@ public class BpmOAContractServiceImpl extends BpmOABaseService implements BpmOAC
                .in(BpmOAContractDO::getId, contractIds));
    }

+    @Override
+    public List<BpmOAContractDO> getList(String relation, Integer contractType, String contractName) {
+        List<Long> userIds = new ArrayList<>();
+        Long id = getLoginUserId();
+        if ("my".equals(relation)) {
+            userIds.add(id);
+        } else if ("sub".equals(relation)) {
+            // 查询当前用户 所有下级用户编号
+            userIds.addAll(userLiveTreeApi.getItemIdsByUserId(id).getCheckedData());
+        }
+        userIds.add(id);
+        if (CollUtil.isNotEmpty(userIds)) {
+            return contractMapper.selectList(new LambdaQueryWrapperX<BpmOAContractDO>()
+                    .in(BpmOAContractDO::getUserId, userIds)
+                    .eqIfPresent(BpmOAContractDO::getContractType, contractType)
+                    .likeIfPresent(BpmOAContractDO::getContractName, contractName)
+                    .eq(BpmOAContractDO::getResult, BpmProcessInstanceResultEnum.APPROVE.getResult()));
+        }
+        return Collections.emptyList();
+    }
+
    public static BigDecimal calculatePercentageChange(Object today, Object yesterday) {

        // 转换为 BigDecimal 进行高精度计算
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAInvoiceServiceImpl.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAInvoiceServiceImpl.java
@ -14,6 +14,7 @@ import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAInvoiceDO;
 import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOAInvoiceMapper;
 import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
 import cn.iocoder.yudao.module.bpm.service.task.BpmHistoryProcessInstanceService;
+import cn.iocoder.yudao.module.hrm.api.userlivetree.UserLiveTreeApi;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.stereotype.Service;
@ -22,6 +23,7 @@ import org.springframework.validation.annotation.Validated;

 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@ -36,11 +38,10 @@ import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*;
 * OA 开票申请 Service 实现类
 *
 * @author 符溶馨
-
 */
@Service
@Validated
-public class BpmOAInvoiceServiceImpl extends BpmOABaseService implements BpmOAInvoiceService{
+public class BpmOAInvoiceServiceImpl extends BpmOABaseService implements BpmOAInvoiceService {

    /**
     * OA 开票申请对应的流程定义 KEY
@ -61,6 +62,8 @@ public class BpmOAInvoiceServiceImpl extends BpmOABaseService implements BpmOAIn

    @Resource
    private RedissonClient redissonClient;
+    @Resource
+    private UserLiveTreeApi userLiveTreeApi;

    @Override
    @Transactional(rollbackFor = Exception.class)
@ -74,7 +77,7 @@ public class BpmOAInvoiceServiceImpl extends BpmOABaseService implements BpmOAIn
                .setUserId(userId)
                .setStatus(0)
                .setResult(BpmProcessInstanceResultEnum.PROCESS.getResult());
-        invoiceMapper.insert(invoice) ;
+        invoiceMapper.insert(invoice);

        // 发起 BPM 流程
        Map<String, Object> processInstanceVariables = new HashMap<>();
@ -90,10 +93,10 @@ public class BpmOAInvoiceServiceImpl extends BpmOABaseService implements BpmOAIn
            historyProcessInstanceService.createHistoryProcessInstance(processInstanceId, createReqVO.getProcessInstanceId());
        }

-        List<UploadUserFile> fileItems = createReqVO.getFileItems() ;
+        List<UploadUserFile> fileItems = createReqVO.getFileItems();
        //这里的逻辑，如果fileItems不为空，且有数据，那么说明是上传了附件的，则需要更工作流文件表对应的实例Id
        if (fileItems != null && !fileItems.isEmpty()) {
-            uploadBpmFileProcessInstanceId(processInstanceId,fileItems) ;
+            uploadBpmFileProcessInstanceId(processInstanceId, fileItems);
        }

        return invoice.getId();
@ -184,8 +187,14 @@ public class BpmOAInvoiceServiceImpl extends BpmOABaseService implements BpmOAIn

    @Override
    public PageResult<BpmOAInvoiceRespVO> getInvoicePage(BpmOAInvoicePageReqVO pageReqVO) {
-
-        return invoiceMapper.selectPage(pageReqVO, getLoginUserId());
+        Long loginUserId = getLoginUserId();
+        List<Long> userIds = new ArrayList<>();
+        if ("my".equals(pageReqVO.getRelation())) {
+            userIds.add(loginUserId);
+        } else {
+            userIds = userLiveTreeApi.getItemIdsByUserId(loginUserId).getCheckedData();
+        }
+        return invoiceMapper.selectPage(pageReqVO, userIds);
    }

    @Override
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOAExpensesMapper.xml
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOAExpensesMapper.xml
@ -35,6 +35,7 @@
        WHERE
            a.deleted = 0
            AND b.deleted = 0
+            AND b.result = 2
            <if test="pageReqVO.userId != null">
                AND b.user_id = #{pageReqVO.userId}
            </if>
--- a/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/crmbusiness/BusinessApi.java
+++ b/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/crmbusiness/BusinessApi.java
@ -28,4 +28,9 @@ public interface BusinessApi {
    @Operation(summary = "获得商机所绑定产品信息")
    @Parameter(name = "businessId", description = "商机编号", required = true)
    CommonResult<List<CrmBusinessProductDTO>> getBusinessProduct(@RequestParam("businessId") Long businessId);
+
+    @GetMapping(PREFIX + "/updateIsEnd")
+    @Operation(summary = "更新商机状态")
+    @Parameter(name = "id", description = "ID", required = true)
+    CommonResult<Boolean> updateIsEnd(@RequestParam("id") Long id, @RequestParam("isEnd") Integer isEnd);
 }
--- a/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java
+++ b/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java
@ -16,5 +16,6 @@ public interface ErrorCodeConstants {
    ErrorCode ACHIEVEMENT_NOT_EXISTS = new ErrorCode(200009, "业绩目标不存在");
    ErrorCode NOT_EDITABLE_UNTIL_SALES_TARGET_HAS_BEEN_APPLIED = new ErrorCode(200010, "未申请销售目标前不可编辑");
    ErrorCode THIS_CUSTOMER_ALREADY_EXISTS_IN_THE_SYSTEM_AND_CANNOT_BE_ENTERED_REPEATEDLY = new ErrorCode(200011, "系统已存在该客户,不可重复录入");
+    ErrorCode THIS_CUSTOMER_ALREADY_EXISTS_IN_THE_SYSTEM_DO_YOU_WANT_TO_CONTINUE_ADDING = new ErrorCode(200012, "系统已存在该客户,是否继续添加");

 }
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/api/crmbusiness/BusinessApiImpl.java
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/api/crmbusiness/BusinessApiImpl.java
@ -12,7 +12,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;

 import javax.annotation.Resource;
-
 import java.util.List;

 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@ -38,4 +37,10 @@ public class BusinessApiImpl implements BusinessApi {
        List<CrmBusinessProductDO> businessProductList = businessService.getBusinessProductListByBusinessId(businessId);
        return success(BeanUtils.toBean(businessProductList, CrmBusinessProductDTO.class));
    }
+
+    @Override
+    public CommonResult<Boolean> updateIsEnd(Long id, Integer isEnd) {
+        businessService.updateIsEnd(id, isEnd);
+        return success(true);
+    }
 }
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/crmcustomer/CrmCustomerController.java
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/crmcustomer/CrmCustomerController.java
@ -12,15 +12,13 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.tags.Tag;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
@ -105,12 +103,12 @@ public class CrmCustomerController {
    @Operation(summary = "导出客户 Excel")
    // @PreAuthorize("@ss.hasPermission('crm:customer:export')")
    public void exportCustomerExcel(@Valid CrmCustomerPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
+                                    HttpServletResponse response) throws IOException {
        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
        List<CrmCustomerDO> list = customerService.getCustomerPage(pageReqVO).getList();
        // 导出 Excel
        ExcelUtils.write(response, "客户.xls", "数据", CrmCustomerRespVO.class,
-                        BeanUtils.toBean(list, CrmCustomerRespVO.class));
+                BeanUtils.toBean(list, CrmCustomerRespVO.class));
    }

    @GetMapping("/get-import-template")
@ -136,11 +134,11 @@ public class CrmCustomerController {
            @Parameter(name = "averageType", description = "分配方式")
    })
    public CommonResult<CustomerImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
-                                                          @RequestParam("deptId") String deptId,
                                                          @RequestParam("adminIds") String adminIds,
-                                                          @RequestParam("averageType") Integer averageType) throws Exception {
+                                                          @RequestParam("averageType") Integer averageType,
+                                                          @RequestParam(value = "repeatConfirmationFlag", defaultValue = "0") Integer repeatConfirmationFlag) throws Exception {
        List<CrmCustomerImportVO> list = ExcelUtils.read(file, CrmCustomerImportVO.class);
-        return success(customerService.importList(list, deptId,adminIds,averageType));
+        return success(customerService.importList(list, adminIds, averageType, repeatConfirmationFlag));
    }

    @PostMapping("/recover")
@ -172,6 +170,4 @@ public class CrmCustomerController {
    }


-
-
 }
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/crmcustomer/vo/CrmCustomerPageReqVO.java
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/crmcustomer/vo/CrmCustomerPageReqVO.java
@ -16,6 +16,8 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
 public class CrmCustomerPageReqVO extends PageParam {
+    @Schema(description = "是否去重 0否 1是 默认否", example = "0")
+    private Integer distinctFlag = 0;

    @Schema(description = "客户名称", example = "李四")
    private String name;
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/crmcustomer/vo/CrmCustomerRespVO.java
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/crmcustomer/vo/CrmCustomerRespVO.java
@ -133,4 +133,6 @@ public class CrmCustomerRespVO {
    @Schema(description = "负责人")
    private String createName;

+    @Schema(description = "相同客户自增排序")
+    private Integer sortNum;
 }
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/crmcustomer/vo/CrmCustomerSaveReqVO.java
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/crmcustomer/vo/CrmCustomerSaveReqVO.java
@ -1,9 +1,9 @@
 package cn.iocoder.yudao.module.crm.controller.admin.crmcustomer.vo;

 import io.swagger.v3.oas.annotations.media.Schema;
-import javax.validation.constraints.NotEmpty;
 import lombok.Data;

+import javax.validation.constraints.NotEmpty;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;

@ -108,6 +108,7 @@ public class CrmCustomerSaveReqVO {
    @Schema(description = "跟进状态", example = "1")
    private Integer followStatus;

-
+    @Schema(description = "重复客户依旧添加 0否 1是 默认否", example = "1")
+    private Integer repeatConfirmationFlag = 0;

 }
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/crmclues/CrmCluesDO.java
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/crmclues/CrmCluesDO.java
@ -61,7 +61,7 @@ public class CrmCluesDO extends BaseDO {
     */
    private Integer industry;
    /**
-     *  客户标签
+     * 客户标签
     */
    private String tags;
    /**
@ -107,11 +107,11 @@ public class CrmCluesDO extends BaseDO {
    private LocalDateTime collectTime;
    /**
     * 跟进状态1|新客
-2|待再次沟通
-3|有意向
-4|已加微信
-5|转商机
-0|无效
+     * 2|待再次沟通
+     * 3|有意向
+     * 4|已加微信
+     * 5|转商机
+     * 0|无效
     */
    private Integer followStatus;

--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/crmcustomer/CrmCustomerDO.java
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/crmcustomer/CrmCustomerDO.java
@ -78,7 +78,10 @@ public class CrmCustomerDO extends BaseDO {
     * 负责人ID
     */
    private Long ownerUserId;
-
+    /**
+     * 相同客户自增排序
+     */
+    private Integer sortNum;
    /**
     * 省份id
     */
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/crmcustomer/CrmCustomerMapper.java
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/crmcustomer/CrmCustomerMapper.java
@ -27,7 +27,7 @@ public interface CrmCustomerMapper extends BaseMapperX<CrmCustomerDO> {

        return selectPage(reqVO, new LambdaQueryWrapperX<CrmCustomerDO>()
                //.eq(CustomerTypesEnum.OPEN.getValue().equals(reqVO.getType()),)
-                .inIfPresent(CrmCustomerDO::getOwnerUserId,ids)
+                .inIfPresent(CrmCustomerDO::getOwnerUserId, ids)
                .likeIfPresent(CrmCustomerDO::getName, reqVO.getName())
                .eqIfPresent(CrmCustomerDO::getMobile, reqVO.getMobile())
                .eqIfPresent(CrmCustomerDO::getTelephone, reqVO.getTelephone())
@ -41,7 +41,17 @@ public interface CrmCustomerMapper extends BaseMapperX<CrmCustomerDO> {
                .orderByDesc(CrmCustomerDO::getId));
    }

-    IPage<CrmCustomerRespVO> selectPageList(@Param("page") IPage page, @Param("dto") CrmCustomerPageReqVO pageReqVO, @Param("ids") List<Long> ids);
+    IPage<CrmCustomerRespVO> selectPageList2(@Param("page") IPage page, @Param("dto") CrmCustomerPageReqVO pageReqVO, @Param("ids") List<Long> ids);

    List<CustomerStatisticRespVO> selectStatistic(@Param("userIds") List<Long> userIds, @Param("createTime") LocalDateTime[] createTime);
+
+    IPage<CrmCustomerDO> selectPageList(@Param("page") IPage page, @Param("dto") CrmCustomerPageReqVO pageReqVO, @Param("ids") List<Long> ids);
+
+    /**
+     * 获取重复客户的所有负责人名称
+     *
+     * @param name
+     * @return
+     */
+    List<String> getRepeatOwnerUserName(@Param("name") String name);
 }
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/crminvoice/CrmInvoiceMapper.java
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/crminvoice/CrmInvoiceMapper.java
@ -10,8 +10,11 @@ import cn.iocoder.yudao.module.crm.dal.dataobject.crmcontract.CrmContractDO;
 import cn.iocoder.yudao.module.crm.dal.dataobject.crmcontractreceivables.CrmContractReceivablesDO;
 import cn.iocoder.yudao.module.crm.dal.dataobject.crmcustomer.CrmCustomerDO;
 import cn.iocoder.yudao.module.crm.dal.dataobject.crminvoice.CrmInvoiceDO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;

 import java.util.List;

@ -26,6 +29,7 @@ public interface CrmInvoiceMapper extends BaseMapperX<CrmInvoiceDO> {

    default PageResult<CrmInvoiceRespVO> selectPage2(CrmInvoicePageReqVO reqVO, List<Long> ids) {
        Long loginAdminId = SecurityFrameworkUtils.getLoginUserId();
+
        return selectJoinPage(reqVO, CrmInvoiceRespVO.class, new MPJLambdaWrapper<CrmInvoiceDO>()
                .selectAll(CrmInvoiceDO.class)
                .selectAs(CrmCustomerDO::getName,CrmInvoiceRespVO::getCustomerName)
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/rpc/config/RpcConfiguration.java
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/rpc/config/RpcConfiguration.java
@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.crm.framework.rpc.config;
 import cn.iocoder.yudao.module.bpm.api.oa.BpmOAContractApi;
 import cn.iocoder.yudao.module.bpm.api.oa.BpmOAReceiptApi;
 import cn.iocoder.yudao.module.bpm.api.oa.BpmOASalesPerformanceApi;
+import cn.iocoder.yudao.module.hrm.api.crmbusiness.BusinessApi;
 import cn.iocoder.yudao.module.product.api.storeproduct.StoreProductApi;
 import cn.iocoder.yudao.module.product.api.storeproductattrvalue.StoreProductAttrValueApi;
 import cn.iocoder.yudao.module.system.api.auth.AdminOauthUserOtherInfoApi;
@ -19,6 +20,6 @@ import org.springframework.context.annotation.Configuration;

@Configuration(proxyBeanMethods = false)
@EnableFeignClients(clients = {DeptApi.class, DictDataApi.class, AdminUserApi.class, StoreProductApi.class, StoreProductAttrValueApi.class, SmsSendApi.class, MailSendApi.class, NoticeApi.class,
-        BpmOAContractApi.class, BpmOAReceiptApi.class, BpmOASalesPerformanceApi.class, AdminOauthUserOtherInfoApi.class, SubscribeMessageSendApi.class, RoleApi.class})
+        BpmOAContractApi.class, BpmOAReceiptApi.class, BpmOASalesPerformanceApi.class, AdminOauthUserOtherInfoApi.class, SubscribeMessageSendApi.class, RoleApi.class, BusinessApi.class})
 public class RpcConfiguration {
 }
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/job/salesperformance/FollowUpCluesJob.java
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/job/salesperformance/FollowUpCluesJob.java
@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.crm.job.salesperformance;
+
+import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
+import cn.iocoder.yudao.module.crm.service.crmclues.CrmCluesService;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+@Component
+@Slf4j
+public class FollowUpCluesJob {
+
+    // TODO: 2024/11/04  - 每天晚上2点 执行一次 判断三天内是否有跟进
+    @Resource
+    private CrmCluesService cluesService;
+
+    @XxlJob("followUpClues")
+    @TenantJob // --- ⚠️ 这个注解 会将租户列表拉出来 完了后逐个租户执行 定时任务需要注意
+    public ReturnT<String> execute() {
+        log.info("开始 线索跟进任务");
+        cluesService.autoConfirmJob();
+        log.info("结束 线索跟进任务");
+        return ReturnT.SUCCESS;
+    }
+}
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmanalysis/CustomerServiceImpl.java
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmanalysis/CustomerServiceImpl.java
@ -137,7 +137,7 @@ public class CustomerServiceImpl implements CustomerService {

            pageResult1.getList().forEach(v -> {

-                String per = "0";
+                String per = "0.00";
                if (customerMap.get(v.getId()) == null) {
                    v.setCustomerCount(0L);
                    v.setSuccessCount(0L);
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmbusiness/CrmBusinessService.java
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmbusiness/CrmBusinessService.java
@ -72,4 +72,12 @@ public interface CrmBusinessService {
     * @param transferVO
     */
    void transfer(@Valid CrmBusinessTransferVO transferVO);
+
+    /**
+     * 更新商机状态
+     *
+     * @param id
+     * @param isEnd
+     */
+    void updateIsEnd(Long id, Integer isEnd);
 }
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmbusiness/CrmBusinessServiceImpl.java
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmbusiness/CrmBusinessServiceImpl.java
@ -205,6 +205,14 @@ public class CrmBusinessServiceImpl implements CrmBusinessService {
        }
    }

+    @Override
+    public void updateIsEnd(Long id, Integer isEnd) {
+        CrmBusinessDO businessDO = new CrmBusinessDO();
+        businessDO.setId(id);
+        businessDO.setIsEnd(isEnd);
+        businessMapper.updateById(businessDO);
+    }
+
    private void createBusinessProductList(Long businessId, List<CrmBusinessProductDO> list) {
        list.forEach(o -> o.setBusinessId(businessId));
        businessProductMapper.insertBatch(list);
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmclues/CrmCluesService.java
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmclues/CrmCluesService.java
@ -57,27 +57,31 @@ public interface CrmCluesService {

    /**
     * 放入线索池
+     *
     * @param id
     */
    void openClues(Long id);

    /**
     * 领取线索
+     *
     * @param id
     */
    void receiveClues(Long id);

    /**
     * 线索转换成客户
+     *
     * @param createReqVO
     */
    void createCustomer(CrmCustomerSaveReqVO createReqVO);

    /**
     * 线索导入
+     *
     * @param importUsers 导入文件
-     * @param deptId 部门ID
-     * @param adminIds 用户ID
+     * @param deptId      部门ID
+     * @param adminIds    用户ID
     * @param averageType 导入类型
     * @return
     */
@ -85,14 +89,21 @@ public interface CrmCluesService {

    /**
     * 转移线索
+     *
     * @param transferVO
     */
    void transfer(CrmCluesTransferVO transferVO);

    /**
     * 获取指定用户的线索统计信息
+     *
     * @param ownerUserIds 用户ID
     * @return 线索统计信息列表
     */
    List<CrmCluesStatisticsRespVO> getCluesStatisticsByUserIds(List<Long> ownerUserIds, LocalDateTime[] createTime);
+
+    /**
+     * 线索跟进任务
+     */
+    void autoConfirmJob();
 }
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmclues/CrmCluesServiceImpl.java
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmclues/CrmCluesServiceImpl.java
@ -33,15 +33,11 @@ import org.springframework.validation.annotation.Validated;

 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
 import java.util.stream.Collectors;

 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.hrm.enums.ErrorCodeConstants.CLUES_NOT_EXISTS;
-import static cn.iocoder.yudao.module.hrm.enums.ErrorCodeConstants.THIS_CUSTOMER_ALREADY_EXISTS_IN_THE_SYSTEM_AND_CANNOT_BE_ENTERED_REPEATEDLY;

 /**
 * 线索 Service 实现类
@ -120,7 +116,7 @@ public class CrmCluesServiceImpl implements CrmCluesService {
        } else if (RelationEnum.SUB.getValue().equals(pageReqVO.getRelation())) {
            ids = userLiveTreeService.getItemIdsByUserId(adminId);
        }
-        if (CollUtil.isEmpty(ids)){
+        if (CollUtil.isEmpty(ids)) {
            return PageResult.empty();
        }
        IPage mpPage = MyBatisUtils.buildPage(pageReqVO);
@ -158,15 +154,14 @@ public class CrmCluesServiceImpl implements CrmCluesService {
        if (crmCluesDO == null) {
            throw exception(CLUES_NOT_EXISTS);
        }
-        if(CluesStatusEnum.STATUS_1.getValue().equals(crmCluesDO.getStatus())){
-            throw exception(new ErrorCode(202411160,"已经转化成客户！"));
+        if (CluesStatusEnum.STATUS_1.getValue().equals(crmCluesDO.getStatus())) {
+            throw exception(new ErrorCode(202411160, "已经转化成客户！"));
        }
        // 判断客户名称是否唯一
-        Long count = customerMapper.selectCount(new LambdaQueryWrapper<CrmCustomerDO>()
-                .eq(CrmCustomerDO::getName, createReqVO.getName()));
-        if (count > 0) {
-            throw exception(THIS_CUSTOMER_ALREADY_EXISTS_IN_THE_SYSTEM_AND_CANNOT_BE_ENTERED_REPEATEDLY);
-        }
+        List<String> repeatOwnerUserNameList = customerMapper.getRepeatOwnerUserName(createReqVO.getName());
+        if (CollUtil.isNotEmpty(repeatOwnerUserNameList) && createReqVO.getRepeatConfirmationFlag() == 0) {
+            List<String> items = repeatOwnerUserNameList.stream().distinct().collect(Collectors.toList());
+            throw exception(new ErrorCode(200012, "该客户已被:" + String.join(",", items) + "添加过,是否继续添加?"));        }
        createReqVO.setId(null);
        CrmCustomerDO customerDO = BeanUtils.toBean(createReqVO, CrmCustomerDO.class);
        customerDO.setOwnerUserId(SecurityFrameworkUtils.getLoginUserId());
@ -286,4 +281,19 @@ public class CrmCluesServiceImpl implements CrmCluesService {
        return cluesMapper.selectStatisticsByUserIds(ownerUserIds, createTime);
    }

+    @Override
+    public void autoConfirmJob() {
+        // 获取负责人不为0 并且跟进记录为3天以外的数据
+        List<CrmCluesDO> crmCluesDOS = cluesMapper.selectList(new LambdaQueryWrapper<CrmCluesDO>()
+                .ne(CrmCluesDO::getOwnerUserId, 0)
+                .in(CrmCluesDO::getStatus, Arrays.asList(CluesStatusEnum.STATUS_0.getValue(), CluesStatusEnum.STATUS_NEG_1.getValue()))
+                .le(CrmCluesDO::getFollowTime, LocalDateTime.now().minusDays(3)));
+        for (CrmCluesDO crmCluesDO : crmCluesDOS) {
+            crmCluesDO.setOwnerUserId(0L);
+        }
+        if (CollUtil.isNotEmpty(crmCluesDOS)) {
+            cluesMapper.updateBatch(crmCluesDOS);
+        }
+    }
+
 }
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmcustomer/CrmCustomerService.java
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmcustomer/CrmCustomerService.java
@ -82,12 +82,11 @@ public interface CrmCustomerService {
    /**
     * 客户导入
     * @param importUsers 导入文件
-     * @param deptId 部门ID
     * @param adminIds 用户ID
     * @param averageType 导入类型
     * @return
     */
-    CustomerImportRespVO importList(List<CrmCustomerImportVO> importUsers, String deptId, String adminIds, Integer averageType);
+    CustomerImportRespVO importList(List<CrmCustomerImportVO> importUsers, String adminIds, Integer averageType,Integer repeatConfirmationFlag);


    /**
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmcustomer/CrmCustomerServiceImpl.java
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmcustomer/CrmCustomerServiceImpl.java
@ -32,8 +32,6 @@ import cn.iocoder.yudao.module.system.api.mail.dto.MailSendSingleReqDTO;
 import cn.iocoder.yudao.module.system.api.sms.SmsSendApi;
 import cn.iocoder.yudao.module.system.api.sms.dto.send.SmsSendSingleReqDTO;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserApiDTO;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserApiVO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.stereotype.Service;
@ -42,15 +40,11 @@ import org.springframework.validation.annotation.Validated;

 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
 import java.util.stream.Collectors;

 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.hrm.enums.ErrorCodeConstants.CUSTOMER_NOT_EXISTS;
-import static cn.iocoder.yudao.module.hrm.enums.ErrorCodeConstants.THIS_CUSTOMER_ALREADY_EXISTS_IN_THE_SYSTEM_AND_CANNOT_BE_ENTERED_REPEATEDLY;

 /**
 * 客户 Service 实现类
@ -88,17 +82,18 @@ public class CrmCustomerServiceImpl implements CrmCustomerService {
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Long createCustomer(CrmCustomerSaveReqVO createReqVO) {
-
        // 插入
        // 判断客户名称是否唯一
-        Long count = customerMapper.selectCount(new LambdaQueryWrapper<CrmCustomerDO>()
-                .eq(CrmCustomerDO::getName, createReqVO.getName()));
-        if (count > 0) {
-            throw exception(THIS_CUSTOMER_ALREADY_EXISTS_IN_THE_SYSTEM_AND_CANNOT_BE_ENTERED_REPEATEDLY);
+        List<String> repeatOwnerUserNameList = customerMapper.getRepeatOwnerUserName(createReqVO.getName());
+        if (CollUtil.isNotEmpty(repeatOwnerUserNameList) && createReqVO.getRepeatConfirmationFlag() == 0) {
+            List<String> items = repeatOwnerUserNameList.stream().distinct().collect(Collectors.toList());
+            throw exception(new ErrorCode(200012, "该客户已被:" + String.join(",", items) + "添加过,是否继续添加?"));
        }
        CrmCustomerDO customer = BeanUtils.toBean(createReqVO, CrmCustomerDO.class);
        customer.setCollectTime(LocalDateTime.now());
        customer.setFollowTime(LocalDateTime.now());
+        // 由于这里是 size 而排序是从0开始的 所以这里递增一个直接用size即可
+        customer.setSortNum(repeatOwnerUserNameList.size());
        customer.setOwnerUserId(SecurityFrameworkUtils.getLoginUserId());
        customerMapper.insert(customer);

@ -126,8 +121,17 @@ public class CrmCustomerServiceImpl implements CrmCustomerService {
    public void updateCustomer(CrmCustomerSaveReqVO updateReqVO) {
        // 校验存在
        CrmCustomerDO customerDO = validateCustomerExists(updateReqVO.getId());
+        List<String> repeatOwnerUserNameList = customerMapper.getRepeatOwnerUserName(updateReqVO.getName());
+        if (!customerDO.getName().equals(updateReqVO.getName())
+                && CollUtil.isNotEmpty(repeatOwnerUserNameList)
+                && updateReqVO.getRepeatConfirmationFlag() == 0) {
+            List<String> items = repeatOwnerUserNameList.stream().distinct().collect(Collectors.toList());
+            throw exception(new ErrorCode(200012, "该客户已被:" + String.join(",", items) + "添加过,是否继续添加?"));        }
+
        // 更新
        CrmCustomerDO updateObj = BeanUtils.toBean(updateReqVO, CrmCustomerDO.class);
+        // 由于这里是 size 而排序是从0开始的 所以这里递增一个直接用size即可
+        updateObj.setSortNum(repeatOwnerUserNameList.size());
        customerMapper.updateById(updateObj);

        //插入日志
@ -255,7 +259,14 @@ public class CrmCustomerServiceImpl implements CrmCustomerService {
        if (CollUtil.isEmpty(ids)) {
            return PageResult.empty();
        }
-        return customerMapper.selectPage(pageReqVO, ids);
+        IPage<CrmCustomerDO> pageResult;
+        if (pageReqVO.getDistinctFlag() == 0) {
+            return customerMapper.selectPage(pageReqVO, ids);
+        } else {
+            IPage mpPage = MyBatisUtils.buildPage(pageReqVO);
+            pageResult = customerMapper.selectPageList(mpPage, pageReqVO, ids);
+        }
+        return new PageResult<>(pageResult.getRecords(), pageResult.getTotal());
    }


@ -276,42 +287,46 @@ public class CrmCustomerServiceImpl implements CrmCustomerService {
            return PageResult.empty();
        }
        IPage mpPage = MyBatisUtils.buildPage(pageReqVO);
-        IPage<CrmCustomerRespVO> pageResult = customerMapper.selectPageList(mpPage, pageReqVO, ids);
+        IPage<CrmCustomerRespVO> pageResult = customerMapper.selectPageList2(mpPage, pageReqVO, ids);
        return new PageResult<>(pageResult.getRecords(), pageResult.getTotal());
    }

    @Override
-    public CustomerImportRespVO importList(List<CrmCustomerImportVO> importUsers, String deptId, String adminIds,
-                                           Integer averageType) {
+    public CustomerImportRespVO importList(List<CrmCustomerImportVO> importUsers, String adminIds,
+                                           Integer averageType, Integer repeatConfirmationFlag) {
        CustomerImportRespVO respVO = CustomerImportRespVO.builder().createNames(new ArrayList<>())
                .failureNames(new LinkedHashMap<>()).build();
        //处理客户归属方案
        //如果只选择了机构没有选择用户直接获取当前部门下的用户
        List<Long> userList = new ArrayList<>();
-        if (StrUtil.isNotEmpty(deptId) && StrUtil.isEmpty(adminIds)) {
-            List<AdminUserApiVO> adminUserDOS = adminUserApi.getUserList(new AdminUserApiDTO().setDeptId(Long.valueOf(deptId)).setNextDept(1)).getCheckedData();
-            userList = adminUserDOS.stream().map(AdminUserApiVO::getId).collect(Collectors.toList());
-            if (userList.isEmpty()) {
-                throw exception(new ErrorCode(202409080, "当前部门下没有用户，清重新选择"));
-            }
-        } else {
+        if (StrUtil.isNotEmpty(adminIds)) {
            userList = StrUtil.split(adminIds, ",").stream().map(Long::parseLong).collect(Collectors.toList());
        }
-
-
        int i = 1;
        int j = 0;
        int adminCount = userList.size();
+        List<CrmCustomerDO> customerList = new ArrayList<>();
+        // -- 查询重复
+        Map<String, Integer> map = new HashMap<>();
+        if (repeatConfirmationFlag == 0) {
+            List<String> nameList = importUsers.stream().map(CrmCustomerImportVO::getName).filter(StrUtil::isNotEmpty).distinct().collect(Collectors.toList());
+            if (CollUtil.isNotEmpty(nameList)) {
+                List<CrmCustomerDO> crmCustomerDOS = customerMapper.selectList(new LambdaQueryWrapper<CrmCustomerDO>()
+                        .in(CrmCustomerDO::getName, nameList));
+                map = crmCustomerDOS.stream().collect(Collectors.groupingBy(CrmCustomerDO::getName, Collectors.summingInt(e -> 1)));
+            }
+        }
        for (CrmCustomerImportVO importVO : importUsers) {
            if (StrUtil.isEmpty(importVO.getName())) {
                respVO.getFailureNames().put("第" + i + "行:", "客户名称为空，已经被过滤掉");
                continue;
            }
-            Long count = customerMapper.selectCount(new LambdaQueryWrapper<CrmCustomerDO>()
-                    .eq(CrmCustomerDO::getName, importVO.getName()));
-            if (count > 0) {
-                respVO.getFailureNames().put("第" + i + "行:", "客户名称已经存在，已经被过滤掉");
-                continue;
+            if (repeatConfirmationFlag == 0) {
+                Integer num = map.get(importVO.getName());
+                if (num != null && num > 1) {
+                    respVO.getFailureNames().put("第" + i + "行:", "客户名称重复，已经被过滤掉");
+                    continue;
+                }
            }
            CrmCustomerDO customer = BeanUtils.toBean(importVO, CrmCustomerDO.class);
            Long adminId = 0L;
@ -329,11 +344,22 @@ public class CrmCustomerServiceImpl implements CrmCustomerService {
                int num = random.nextInt(adminCount);
                adminId = userList.get(num);
            }
+            Integer num = map.get(importVO.getName());
+            if (num != null && num > 1) {
+                map.put(importVO.getName(), num + 1);
+            } else if (num == null) {
+                num = 0;
+                map.put(importVO.getName(), num);
+            }
+            customer.setSortNum(num);
            customer.setOwnerUserId(adminId);
-            customerMapper.insert(customer);
+            customerList.add(customer);
            respVO.getCreateNames().add("第" + i + "行:导入成功用户名->" + importVO.getName());
            i++;
        }
+        if (!customerList.isEmpty()) {
+            customerMapper.insertBatch(customerList);
+        }
        return respVO;
    }

--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmcustomercontacts/CrmCustomerContactsServiceImpl.java
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmcustomercontacts/CrmCustomerContactsServiceImpl.java
@ -92,9 +92,6 @@ public class CrmCustomerContactsServiceImpl implements CrmCustomerContactsServic
        } else if (RelationEnum.SUB.getValue().equals(pageReqVO.getRelation())) {
            ids = userLiveTreeService.getItemIdsByUserId(adminId);
        }
-        if (CollUtil.isEmpty(ids)){
-            return PageResult.empty();
-        }
        IPage mpPage = MyBatisUtils.buildPage(pageReqVO);
        IPage<CrmCustomerContactsRespVO> pageResult = customerContactsMapper.selectPageList(mpPage, pageReqVO, ids);
        return new PageResult<>(pageResult.getRecords(), pageResult.getTotal());
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crminvoice/CrmInvoiceServiceImpl.java
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crminvoice/CrmInvoiceServiceImpl.java
@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.common.enums.ShopCommonEnum;
 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.crm.controller.admin.crmcontract.vo.CheckInfoVO;
 import cn.iocoder.yudao.module.crm.controller.admin.crminvoice.vo.CrmInvoicePageReqVO;
@ -28,6 +29,7 @@ import cn.iocoder.yudao.module.hrm.enums.*;
 import cn.iocoder.yudao.module.system.api.mail.MailSendApi;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/crmclues/CrmCluesMapper.xml
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/crmclues/CrmCluesMapper.xml
@ -18,6 +18,7 @@
        left join system_users b ON b.id = a.owner_user_id
        <where>
            a.deleted = 0
+            and a.status != 1
            <if test="dto.name != null and dto.name != ''">
                and a.name like concat('%', #{dto.name}, '%')
            </if>
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/crmcustomer/CrmCustomerMapper.xml
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/crmcustomer/CrmCustomerMapper.xml
@ -9,7 +9,7 @@
        文档可见：https://www.yixiang.co/MyBatis/x-plugins/
     -->

-    <select id="selectPageList"
+    <select id="selectPageList2"
            resultType="cn.iocoder.yudao.module.crm.controller.admin.crmcustomer.vo.CrmCustomerRespVO">
        select
        a.*,
@ -74,4 +74,65 @@
            </if>
        GROUP BY owner_user_id
    </select>
+    <select id="selectPageList"
+            resultType="cn.iocoder.yudao.module.crm.dal.dataobject.crmcustomer.CrmCustomerDO">
+        SELECT * from (
+        select
+        a.*,
+        ROW_NUMBER() OVER (PARTITION BY name ORDER BY sort_num DESC, id DESC) AS rn
+        from crm_customer as a
+        <where>
+            a.deleted = 0
+            <if test="ids != null and ids.size() > 0">
+                and a.owner_user_id in
+                <foreach item="ownerUserId" collection="ids" separator="," open="(" close=")" index="">
+                    #{ownerUserId}
+                </foreach>
+            </if>
+            <if test="dto.name != null and dto.name != ''">
+                and a.name like concat('%', #{dto.name}, '%')
+            </if>
+            <if test="dto.mobile != null and dto.mobile != ''">
+                and a.mobile = #{dto.mobile}
+            </if>
+            <if test="dto.telephone != null and dto.telephone != ''">
+                and a.telephone = #{dto.telephone}
+            </if>
+            <if test="dto.dealStatus != null">
+                and a.deal_status = #{dto.dealStatus}
+            </if>
+            <if test="dto.level != null">
+                and a.level = #{dto.level}
+            </if>
+            <if test="dto.industry != null">
+                and a.industry = #{dto.industry}
+            </if>
+            <if test="dto.source != null">
+                and a.source = #{dto.source}
+            </if>
+            <if test="dto.weixin != null and dto.weixin != ''">
+                and a.weixin = #{dto.weixin}
+            </if>
+            <if test="dto.qq != null and dto.qq != ''">
+                and a.qq = #{dto.qq}
+            </if>
+            <if test="dto.qq != null and dto.qq != ''">
+                and a.qq = #{dto.qq}
+            </if>
+            <if test="dto.followStatus != null">
+                and a.follow_status = #{dto.followStatus}
+            </if>
+        </where>
+        order by a.id desc
+        ) AS ranked
+        where rn = 1;
+    </select>
+    <select id="getRepeatOwnerUserName" resultType="java.lang.String">
+        select t1.nickname
+        from crm_customer as a
+                 left join system_users as t1 on a.owner_user_id = t1.id
+        where a.deleted = 0
+          and t1.deleted = 0
+          and a.name = #{name}
+    </select>
 </mapper>
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/crminvoice/CrminvoiceMapper.xml
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/crminvoice/CrminvoiceMapper.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.crm.dal.mysql.crminvoice.CrmInvoiceMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.yixiang.co/MyBatis/x-plugins/
+     -->
+
+</mapper>
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/storeproduct/StoreProductServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/storeproduct/StoreProductServiceImpl.java
@ -667,9 +667,9 @@ public class StoreProductServiceImpl extends ServiceImpl<StoreProductMapper, Sto
                .reduce(Integer::sum)
                .orElse(0);

-        if (stock <= 0) {
-            throw exception(STORE_PRODUCT_STOCK_ERROR);
-        }
+//        if (stock <= 0) {
+//            throw exception(STORE_PRODUCT_STOCK_ERROR);
+//        }

        return ProductResultDto.builder()
                .minPrice(minPrice)
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java
@ -2,10 +2,8 @@ package cn.iocoder.yudao.module.system.controller.admin.worklog;

 import cn.hutool.core.collection.CollectionUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptRespVO;
 import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserRespVO;
@ -21,10 +19,20 @@ import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import cn.iocoder.yudao.module.system.service.worklog.LogInstanceService;
 import cn.iocoder.yudao.module.system.service.worklog.LogReadService;
 import cn.iocoder.yudao.module.system.service.worklog.LogUseService;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.converters.longconverter.LongStringConverter;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import com.alibaba.excel.write.builder.ExcelWriterBuilder;
+import com.alibaba.excel.write.merge.OnceAbsoluteMergeStrategy;
+import com.alibaba.excel.write.metadata.style.WriteCellStyle;
+import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@ -33,10 +41,9 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
 import java.util.stream.Collectors;

 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@ -306,12 +313,69 @@ public class LogInstanceController {
    @Operation(summary = "导出日志实例 Excel")
    @PreAuthorize("@ss.hasPermission('system:log-instance:export')")
    @OperateLog(type = EXPORT)
-    public void exportLogInstanceExcel(@Valid LogInstancePageReqVO pageReqVO,
+    public void exportLogInstanceExcel(@Valid LogExportVO reqVO,
                                       HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<LogInstanceRespVO> list = logInstanceService.getLogInstancePage(pageReqVO, null).getRecords();
-        // 导出 Excel
-        ExcelUtils.write(response, "日志实例的拓展.xls", "数据", LogInstanceRespVO.class,
-                BeanUtils.toBean(list, LogInstanceRespVO.class));
+
+        List<LogExportExcelVO> list = logInstanceService.getLogInstanceExport(reqVO);
+
+
+        // 输出excel
+        ExcelWriterBuilder writer = EasyExcel.write(response.getOutputStream(), LogExportExcelVO.class);
+
+        List<OnceAbsoluteMergeStrategy> strategies = getMergeStrategy(list);
+        strategies.forEach(writer::registerWriteHandler);
+
+        writer.autoCloseStream(false); // 不要自动关闭，交给 Servlet 自己处理
+        writer.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()); // 基于 column 长度，自动适配。最大 255 宽度
+        writer.registerWriteHandler(new HorizontalCellStyleStrategy(getHeadStyle(), getContentStyle()));
+        writer.registerConverter(new LongStringConverter()); // 避免 Long 类型丢失精度
+        writer.excelType(ExcelTypeEnum.XLS);
+        writer.sheet("数据").doWrite(list);
+
+        // 设置 header 和 contentType。写在最后的原因是，避免报错时，响应 contentType 已经被修改了
+        response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("日志实例的拓展.xls", StandardCharsets.UTF_8.name()));
+        response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+
+
+//        // 导出 Excel
+//        ExcelUtils.write(response, "日志实例的拓展.xls", "数据", LogExportExcelVO.class,
+//                list);
+    }
+
+    public static List<OnceAbsoluteMergeStrategy> getMergeStrategy(List<LogExportExcelVO> dataList) {
+        List<OnceAbsoluteMergeStrategy> strategies = new ArrayList<>();
+        List<Integer> mergeCols = Arrays.asList(0, 1); // 需要合并的列索引
+
+        // 遍历数据，生成合并区间
+        for (int i = 0; i < dataList.size(); i++) {
+            if (i > 0 && dataList.get(i).getNickname().equals(dataList.get(i - 1).getNickname()) && dataList.get(i).getTime().equals(dataList.get(i - 1).getTime())) {
+                continue;
+            }
+            int startRow = i + 1;
+            while (i < dataList.size() - 1 && dataList.get(i).getNickname().equals(dataList.get(i + 1).getNickname()) && dataList.get(i).getTime().equals(dataList.get(i + 1).getTime())) {
+                i++;
+            }
+            for (int col : mergeCols) {
+                strategies.add(new OnceAbsoluteMergeStrategy(startRow, i + 1, col, col));
+            }
+        }
+        return strategies;
+    }
+
+    // 表头样式（居中）
+    public static WriteCellStyle getHeadStyle() {
+        WriteCellStyle headStyle = new WriteCellStyle();
+        headStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
+        headStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+        return headStyle;
+    }
+
+    // 内容样式（居中）
+    public static WriteCellStyle getContentStyle() {
+        WriteCellStyle contentStyle = new WriteCellStyle();
+        contentStyle.setWrapped(true);  // 启用自动换行
+        contentStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
+        contentStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+        return contentStyle;
    }
 }
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogExportExcelVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogExportExcelVO.java
@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ *  日志Excel 导出 VO
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = false) // 设置 chain = false，避免用户导入有问题
+public class LogExportExcelVO {
+
+    @ExcelProperty("用户名称")
+    private String nickname;
+
+    @ExcelProperty("日期")
+    private String time;
+
+    @ExcelProperty("标题")
+    private String title;
+
+    @ExcelProperty("内容")
+    private String content;
+}
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogExportVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/loginstance/LogExportVO.java
@ -0,0 +1,18 @@
+package cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 日志实例导出 Response VO")
+@Data
+public class LogExportVO {
+
+    @Schema(description = "部门编号")
+    private Long companyDeptId;
+
+    @Schema(description = "日志模版编号")
+    private Long formId;
+
+    @Schema(description = "时间范围")
+    private String[] time;
+}
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
@ -41,6 +41,7 @@ import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import cn.iocoder.yudao.module.system.service.dept.PostService;
 import cn.iocoder.yudao.module.system.service.permission.PermissionService;
 import cn.iocoder.yudao.module.system.service.tenant.TenantService;
+import cn.iocoder.yudao.module.system.service.worklog.LogUseService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.annotations.VisibleForTesting;
@ -100,6 +101,9 @@ public class AdminUserServiceImpl implements AdminUserService {
    @Resource
    private FileApi fileApi;

+    @Resource
+    private LogUseService logUseService;
+
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateUserOpenId(Long id, String openId) {
@ -155,9 +159,14 @@ public class AdminUserServiceImpl implements AdminUserService {
        userMapper.updateById(updateObj);
        // 更新岗位
        updateUserPost(updateReqVO, updateObj);
+
+        // 更新日志使用人信息
+        logUseService.updateUseDeptId(updateObj.getId(), updateObj.getDeptId());
+
    }

    private void updateUserPost(UserSaveReqVO reqVO, AdminUserDO updateObj) {
+
        Long userId = reqVO.getId();
        Set<Long> dbPostIds = convertSet(userPostMapper.selectListByUserId(userId), UserPostDO::getPostId);
        // 计算新增和删除的岗位编号
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceService.java
@ -92,4 +92,11 @@ public interface LogInstanceService {
     * @return
     */
    LogInstanceNextOrUpVO getNextOrUp(LogInstancePageReqVO dto, Long id, Integer pagingType);
+
+    /**
+     * 获取日志导出列表
+     * @param reqVO 请求参数
+     * @return 日志列表
+     */
+    List<LogExportExcelVO> getLogInstanceExport(LogExportVO reqVO);
 }
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java
@ -1,11 +1,13 @@
 package cn.iocoder.yudao.module.system.service.worklog;

+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONObject;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.date.DateUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptRespVO;
 import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.*;
 import cn.iocoder.yudao.module.system.convert.worklog.LogInstanceConvert;
@ -140,7 +142,8 @@ public class LogInstanceServiceImpl implements LogInstanceService {
                List<LogReadUserRespDTO> respDTOS = logInstanceMapper.selectRaedUser(userId, adminUserDO.getDeptId());

                //特殊情况， 日志发起人为研发部时 手动添加查看者
-                if (adminUserDO.getDeptId() == 128L && adminUserDO.getId() != 126L) {
+                List<Long> deptIds = convertList(deptService.getChildDept(128L), DeptDO::getId);
+                if (deptIds.contains(adminUserDO.getDeptId()) && adminUserDO.getId() != 126L) {

                    LogReadUserRespDTO dto = new LogReadUserRespDTO();
                    dto.setUserId(126L);
@ -286,7 +289,7 @@ public class LogInstanceServiceImpl implements LogInstanceService {
                    item.setAvatar(userDO.getAvatar());
                }

-                //设置日志内部分
+                //设置日志内部分an
                LogFormDO logFormDO = formMap.get(item.getFormId());
                List<String> fields = logFormDO.getFields();
                StringBuilder workLogContent = new StringBuilder();
@ -445,6 +448,73 @@ public class LogInstanceServiceImpl implements LogInstanceService {
        return vo;
    }

+    @Override
+    public List<LogExportExcelVO> getLogInstanceExport(LogExportVO reqVO) {
+        // 获取所有部门及下级部门信息
+        List<DeptDO> deptDOS = deptService.getChildDept(reqVO.getCompanyDeptId());
+
+        List<LogInstanceDO> list = logInstanceMapper.selectList(new LambdaQueryWrapperX<LogInstanceDO>()
+                .inIfPresent(LogInstanceDO::getDeptId, convertList(deptDOS, DeptDO::getId))
+                .eqIfPresent(LogInstanceDO::getFormId, reqVO.getFormId())
+                .betweenIfPresent(LogInstanceDO::getTime, reqVO.getTime()));
+
+        List<LogExportExcelVO> result = new ArrayList<>();
+        if (CollUtil.isNotEmpty(list)) {
+
+            //模版ids过滤
+            Set<Long> workFormIds = list.stream().map(LogInstanceDO::getFormId).collect(Collectors.toSet());
+
+            //  查询模版列表
+            List<LogFormDO> formList = logFormService.getFormList(workFormIds);
+            Map<Long, LogFormDO> formMap = formList.stream().collect(Collectors.toMap(LogFormDO::getId, item -> item));
+
+            //查询用户信息列表
+            Set<Long> userIds = list.stream().map(LogInstanceDO::getStartUserId).collect(Collectors.toSet());
+            Map<Long, AdminUserDO> userMap = adminUserService.getUserMap(userIds);
+
+            //遍历
+            for (LogInstanceDO item : list) {
+
+                //设置日志内部分an
+                LogFormDO logFormDO = formMap.get(item.getFormId());
+                List<String> fields = logFormDO.getFields();
+                if (!item.getFormVariables().isEmpty()) {
+                    JSONObject workLogContentJson = new JSONObject(item.getFormVariables());
+                    for (String fieldItem : fields) {
+                        JSONObject fieldJson = new JSONObject(fieldItem);
+                        if ("upload".equals(fieldJson.getStr("type"))) {
+                            continue;
+                        }
+                        String fieldStr = fieldJson.getStr("field");
+                        String title = fieldJson.getStr("title");
+                        if (fieldStr == null || title == null) {
+                            continue;
+                        }
+                        String field = workLogContentJson.getStr(fieldStr);
+
+                        LogExportExcelVO logExportExcelVO = new LogExportExcelVO();
+
+                        // 设置时间
+                        logExportExcelVO.setTime(item.getTime());
+
+                        //设置发起人用户名称和头像
+                        AdminUserDO userDO = userMap.get(item.getStartUserId());
+                        if (userDO != null) {
+                            logExportExcelVO.setNickname(userDO.getNickname());
+                        }
+
+                        logExportExcelVO.setTitle(title);
+                        logExportExcelVO.setContent(field);
+
+                        result.add(logExportExcelVO);
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
+
    @Override
    public List<LogInstanceDO> getNeedWriteLogInstanceByTimeRange(Long fromId, List<String> time, Long userId) {
        return logInstanceMapper.selectList(new LambdaQueryWrapper<LogInstanceDO>()
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogRuleServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogRuleServiceImpl.java
@ -10,6 +10,7 @@ import cn.iocoder.yudao.module.system.dal.mysql.worklog.LogFormMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.worklog.LogRuleMapper;
 import cn.iocoder.yudao.module.system.service.worklog.dto.LogUseSaveReqDTO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;

@ -132,5 +133,4 @@ public class LogRuleServiceImpl implements LogRuleService {
        return logRuleMapper.selectOne(new LambdaQueryWrapper<LogRuleDO>()
                .eq(LogRuleDO::getFormId, formId));
    }
-
 }
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogUseService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogUseService.java
@ -74,4 +74,11 @@ public interface LogUseService {
     * @return 模版列表
     */
    List<Long> getFormIdList(List<Long> deptIds);
+
+    /**
+     * 更新日志规则使用部门id
+     * @param userId 用户编号
+     * @param deptId 部门编号
+     */
+    void updateUseDeptId(Long userId, Long deptId);
 }
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogUseServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogUseServiceImpl.java
@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogUseDO;
 import cn.iocoder.yudao.module.system.dal.mysql.worklog.LogUseMapper;
 import cn.iocoder.yudao.module.system.service.worklog.dto.LogUseSaveReqDTO;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;

@ -106,4 +107,12 @@ public class LogUseServiceImpl implements LogUseService {
        List<LogUseDO> logUseDOS = logUseMapper.selectList(LogUseDO::getUseUserDept, deptIds);
        return logUseDOS.stream().map(LogUseDO::getFormId).distinct().collect(Collectors.toList());
    }
+
+    @Override
+    public void updateUseDeptId(Long userId, Long deptId) {
+
+        logUseMapper.update(null, new LambdaUpdateWrapper<LogUseDO>()
+                .set(LogUseDO::getUseUserDept, deptId)
+                .eq(LogUseDO::getUseUserId, userId));
+    }
 }
--- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staff/StaffServiceImpl.java
+++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staff/StaffServiceImpl.java
@ -116,8 +116,8 @@ public class StaffServiceImpl implements StaffService {
        });

        vo.setTotal(dos.size());
-        vo.setMaleTotal((int) dos.stream().filter(a -> a.getSex() == 0).count());
-        vo.setFemaleTotal((int) dos.stream().filter(a -> a.getSex() == 1).count());
+        vo.setMaleTotal((int) dos.stream().filter(a -> a.getSex() != null && a.getSex() == 0).count());
+        vo.setFemaleTotal((int) dos.stream().filter(a -> a.getSex() != null && a.getSex() == 1).count());
        vo.setStaffInfos(dos);
        return vo;
    }
Author	SHA1	Message	Date
aikai	521a162233	refactor(crm): 为 CrmCustomerSaveReqVO 类中的 repeatConfirmationFlag 字段添加默认值0	2025-03-13 15:23:41 +08:00
aikai	92850e2d12	feat(crm): 添加线索跟进任务并优化客户导入功能 - 新增线索跟进任务定时 job，自动更新三天未跟进的线索状态- 优化客户导入功能，增加重复客户检测和提示 - 添加合同编号字段到发票响应 VO- 修改合同列表获取逻辑，支持下属和自己的合同查询 -优化发票列表查询，支持关系筛选 - 新增商机状态更新接口	2025-03-13 15:20:39 +08:00
aikai	32309d2842	Merge branch 'dev' of http://git.znkjfw.com/ak/zn-cloud into crm-业绩目标	2025-03-11 10:15:17 +08:00
furongxin	e401eef546	perf(bpm): 优化流程 CC 列表接口性能 - 在处理流程 CC 列表时，增加了对结果列表的非空判断 - 只有在列表非空的情况下，才进行部门和用户组信息的查询和设置 - 这样可以减少不必要的 API调用，提高接口性能	2025-03-10 21:11:01 +08:00
furongxin	2ffd3ffadb	fix(smartfactory): 修复员工统计性别空指针异常 - 在计算男性和女性员工总数时，增加了对性别字段的非空检查 - 避免在性别字段为 null 时发生空指针异常，提高代码健壮性	2025-03-10 21:10:37 +08:00
furongxin	57838d91dd	refactor(system): 更新用户部门时同步更新日志使用人部门- 在 AdminUserServiceImpl 中添加更新日志使用人部门的逻辑- 在 LogUseService 接口中新增 updateUseDeptId 方法 - 在 LogUseServiceImpl 中实现 updateUseDeptId 方法 - 优化 LogInstanceServiceImpl 中的日志实例导出查询，支持查询所有下级部门	2025-03-10 21:10:19 +08:00
furongxin	cdb4d79822	refactor(system): 优化日志实例导出功能 - 使用 EasyExcel 替代 ExcelUtils 写入 Excel 文件 - 添加单元格合并功能 - 优化表格样式，包括列宽自适应、居中对齐等 -增加部门编号筛选条件 - 调整日志数据查询逻辑，提高效率	2025-03-09 10:27:37 +08:00
furongxin	d83dca6b87	feat(system): 添加日志实例导出功能 - 新增 LogExportExcelVO 和 LogExportVO 类用于日志导出 - 在 LogInstanceController 中添加 exportLogInstanceExcel 方法处理导出请求 - 在 LogInstanceService 接口中添加 getLogInstanceExport 方法 - 在 LogInstanceServiceImpl 中实现 getLogInstanceExport 方法，用于获取日志导出列表 - 优化 BpmOAImprestController 中的代码结构	2025-03-06 12:52:23 +08:00
furongxin	efb2fdfee0	feat(bpm): 优化报销单查询功能 - 在查询条件中增加报销审核通过的状态过滤 - 通过添加 result = 2 的条件，仅显示审核通过的报销单	2025-03-05 11:31:52 +08:00