feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑

云

2026-10-25 d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea

 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/performanceappraise/HrmPerformanceAppraiseMapper.java

@@ -5,6 +5,7 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.hrm.controller.admin.performanceappraise.vo.HrmPerformanceAppraisePageReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.performanceappraise.HrmPerformanceAppraiseDO;
import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;

@@ -37,6 +38,8 @@
    default int submitAndResetAuditInfo(Long id, Integer auditStatus) {
        return update(null, new LambdaUpdateWrapper<HrmPerformanceAppraiseDO>()
                .eq(HrmPerformanceAppraiseDO::getId, id)
                .in(HrmPerformanceAppraiseDO::getAuditStatus,
                        HrmAuditStatusEnum.DRAFT.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())
                .set(HrmPerformanceAppraiseDO::getAuditStatus, auditStatus)
                .set(HrmPerformanceAppraiseDO::getReviewerId, null)
                .set(HrmPerformanceAppraiseDO::getReviewerName, null)
@@ -61,10 +64,32 @@
                              String reviewerName, String reviewRemark) {
        return update(null, new LambdaUpdateWrapper<HrmPerformanceAppraiseDO>()
                .eq(HrmPerformanceAppraiseDO::getId, id)
                .eq(HrmPerformanceAppraiseDO::getAuditStatus, HrmAuditStatusEnum.PROCESS.getStatus())
                .set(HrmPerformanceAppraiseDO::getAuditStatus, auditStatus)
                .set(HrmPerformanceAppraiseDO::getStatus, status)
                .set(HrmPerformanceAppraiseDO::getReviewerId, reviewerId)
                .set(HrmPerformanceAppraiseDO::getReviewerName, reviewerName)
                .set(HrmPerformanceAppraiseDO::getReviewTime, LocalDateTime.now())
                .set(HrmPerformanceAppraiseDO::getReviewRemark, reviewRemark));
    }

    /**
     * BPM 审批结束后回写绩效考核方案审批状态
     *
     * 仅当方案仍处于「审批中」时更新，避免与旧审批路径重复覆盖。
     *
     * @param id          方案编号
     * @param auditStatus 目标审批状态
     * @param status      方案状态（审核通过时置为已发布，否则保持原值）
     * @param reviewRemark 审核意见
     * @return 影响行数
     */
    default int updateAuditStatusByBpm(Long id, Integer auditStatus, Integer status, String reviewRemark) {
        return update(null, new LambdaUpdateWrapper<HrmPerformanceAppraiseDO>()
                .eq(HrmPerformanceAppraiseDO::getId, id)
                .eq(HrmPerformanceAppraiseDO::getAuditStatus, HrmAuditStatusEnum.PROCESS.getStatus())
                .set(HrmPerformanceAppraiseDO::getAuditStatus, auditStatus)
                .set(HrmPerformanceAppraiseDO::getStatus, status)
                .set(HrmPerformanceAppraiseDO::getReviewTime, LocalDateTime.now())
                .set(HrmPerformanceAppraiseDO::getReviewRemark, reviewRemark));
    }
@@ -78,4 +103,8 @@
                .last("LIMIT 1"));
    }

    default HrmPerformanceAppraiseDO selectByName(String name) {
        return selectOne(HrmPerformanceAppraiseDO::getName, name);
    }

}