fix: 修复销售订单审批及开票回款搜索

liu

5 天以前 6d1bf32bc0b51dc12048fe6bb70badfbd31d67ac

 yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java

@@ -12,9 +12,11 @@
import cn.iocoder.yudao.module.crm.enums.common.CrmSceneTypeEnum;
import cn.iocoder.yudao.module.crm.util.CrmPermissionUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -34,10 +36,75 @@
        return selectOne(CrmInvoiceDO::getNo, no);
    }

    /**
     * 提交审批：置为审批中，并清空上一轮审核结果
     *
     * 之所以用 UpdateWrapper 而非 updateById：MyBatis-Plus 默认的字段更新策略会忽略 null，
     * 直接 updateById 无法把审核不通过后残留的审核人、审核时间、审核意见真正清空。
     *
     * @param id     开票编号
     * @param status 目标状态（审批中）
     * @return 影响行数
     */
    default int submitAndResetAuditInfo(Long id, Integer status) {
        return update(null, new LambdaUpdateWrapper<CrmInvoiceDO>()
                .eq(CrmInvoiceDO::getId, id)
                .in(CrmInvoiceDO::getAuditStatus, CrmAuditStatusEnum.DRAFT.getStatus(),
                        CrmAuditStatusEnum.REJECT.getStatus())
                .set(CrmInvoiceDO::getAuditStatus, status)
                .set(CrmInvoiceDO::getReviewerId, null)
                .set(CrmInvoiceDO::getReviewerName, null)
                .set(CrmInvoiceDO::getReviewTime, null)
                .set(CrmInvoiceDO::getReviewRemark, null));
    }

    /**
     * 审核：写入审核结果、审核人与审核意见
     *
     * reviewRemark 允许为 null（审核通过时意见可选），故同样使用 UpdateWrapper 直写。
     *
     * @param id           开票编号
     * @param status       目标状态（审核通过 / 审核不通过）
     * @param reviewerId   审核人编号
     * @param reviewerName 审核人姓名
     * @param reviewRemark 审核意见
     * @return 影响行数
     */
    default int auditInvoice(Long id, Integer status, Long reviewerId,
                             String reviewerName, String reviewRemark) {
        return update(null, new LambdaUpdateWrapper<CrmInvoiceDO>()
                .eq(CrmInvoiceDO::getId, id)
                .eq(CrmInvoiceDO::getAuditStatus, CrmAuditStatusEnum.PROCESS.getStatus())
                .set(CrmInvoiceDO::getAuditStatus, status)
                .set(CrmInvoiceDO::getReviewerId, reviewerId)
                .set(CrmInvoiceDO::getReviewerName, reviewerName)
                .set(CrmInvoiceDO::getReviewTime, LocalDateTime.now())
                .set(CrmInvoiceDO::getReviewRemark, reviewRemark));
    }

    /**
     * BPM 审批结束后回写开票状态
     *
     * 仅当开票仍处于「审批中」时更新，避免与旧审批路径重复覆盖。
     *
     * @param id           开票编号
     * @param status       目标状态（审核通过 / 审核不通过 / 已取消）
     * @param reviewRemark 审核意见
     * @return 影响行数
     */
    default int updateAuditStatusByBpm(Long id, Integer status, String reviewRemark) {
        return update(null, new LambdaUpdateWrapper<CrmInvoiceDO>()
                .eq(CrmInvoiceDO::getId, id)
                .eq(CrmInvoiceDO::getAuditStatus, CrmAuditStatusEnum.PROCESS.getStatus())
                .set(CrmInvoiceDO::getAuditStatus, status)
                .set(CrmInvoiceDO::getReviewTime, LocalDateTime.now())
                .set(CrmInvoiceDO::getReviewRemark, reviewRemark));
    }

    default PageResult<CrmInvoiceDO> selectPageByCustomerId(CrmInvoicePageReqVO reqVO) {
        return selectPage(reqVO, new LambdaQueryWrapperX<CrmInvoiceDO>()
                .eq(CrmInvoiceDO::getCustomerId, reqVO.getCustomerId()) // 必须传递
                .eqIfPresent(CrmInvoiceDO::getNo, reqVO.getNo())
                .likeIfPresent(CrmInvoiceDO::getNo, reqVO.getNo())
                .eqIfPresent(CrmInvoiceDO::getContractId, reqVO.getContractId())
                .orderByDesc(CrmInvoiceDO::getId));
    }
@@ -49,7 +116,8 @@
                CrmInvoiceDO::getId, userId, pageReqVO.getSceneType());
        // 拼接自身的查询条件
        query.selectAll(CrmInvoiceDO.class)
                .eqIfPresent(CrmInvoiceDO::getNo, pageReqVO.getNo())
                .likeIfPresent(CrmInvoiceDO::getNo, pageReqVO.getNo())
                .eqIfPresent(CrmInvoiceDO::getCustomerId, pageReqVO.getCustomerId())
                .eqIfPresent(CrmInvoiceDO::getContractId, pageReqVO.getContractId())
                .eqIfPresent(CrmInvoiceDO::getAuditStatus, pageReqVO.getAuditStatus())
                .orderByDesc(CrmInvoiceDO::getId);
@@ -76,10 +144,11 @@
        if (CollUtil.isEmpty(contractIds)) {
            return Collections.emptyMap();
        }
        // SQL sum 查询
        // SQL sum 查询（审批通过 + 审批中，与开票防超校验口径一致）
        List<Map<String, Object>> result = selectMaps(new QueryWrapper<CrmInvoiceDO>()
                .select("contract_id, SUM(price) AS total_price")
                .eq("audit_status", CrmAuditStatusEnum.APPROVE.getStatus())
                .in("audit_status", CrmAuditStatusEnum.APPROVE.getStatus(),
                        CrmAuditStatusEnum.PROCESS.getStatus())
                .groupBy("contract_id")
                .in("contract_id", contractIds));
        // 获得金额