From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/performanceappraise/HrmPerformanceAppraiseServiceImpl.java | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 113 insertions(+), 6 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/performanceappraise/HrmPerformanceAppraiseServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/performanceappraise/HrmPerformanceAppraiseServiceImpl.java
index d5a5a5d..7134e9f 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/performanceappraise/HrmPerformanceAppraiseServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/performanceappraise/HrmPerformanceAppraiseServiceImpl.java
@@ -4,6 +4,7 @@
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -14,6 +15,9 @@
import cn.iocoder.yudao.module.hrm.dal.mysql.performanceappraise.*;
import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import cn.iocoder.yudao.module.hrm.enums.ErrorCodeConstants;
+import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
import cn.iocoder.yudao.module.system.api.approval.ApprovalConfigApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
@@ -31,6 +35,7 @@
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
/**
@@ -83,6 +88,11 @@
*/
private static final String APPRAISE_APPROVE_BIZ_TYPE = "performance_appraise_approve";
+ /**
+ * 缁╂晥鑰冩牳鏂规瀹℃壒鐨� BPM 娴佺▼瀹氫箟 Key
+ */
+ private static final String APPRAISE_APPROVE_PROCESS_KEY = "performance_appraise_approve";
+
@Resource
private HrmPerformanceAppraiseMapper appraiseMapper;
@Resource
@@ -95,6 +105,8 @@
private HrmEmployeeMapper employeeMapper;
@Resource
private ApprovalConfigApi approvalConfigApi;
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
@Resource
private AdminUserApi adminUserApi;
@@ -197,7 +209,15 @@
approvalConfigApi.validateApprovalEnabledAndGetApprovers(APPRAISE_APPROVE_BIZ_TYPE);
// 3. 瀹℃壒鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
- appraiseMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus());
+ if (appraiseMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_SUBMIT_FAIL_NOT_EDITABLE);
+ }
+
+ // 4. 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
+ bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(APPRAISE_APPROVE_PROCESS_KEY)
+ .setBusinessKey(String.valueOf(id)));
}
@Override
@@ -223,14 +243,42 @@
throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_AUDIT_REJECT_REASON_REQUIRED);
}
// 鏂规鐘舵�佷繚鎸佷笉鍙�
- appraiseMapper.auditAppraise(id, HrmAuditStatusEnum.REJECT.getStatus(), appraise.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (appraiseMapper.auditAppraise(id, HrmAuditStatusEnum.REJECT.getStatus(), appraise.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝瀹℃壒鐘舵�佺疆涓哄鏍搁�氳繃
// 6. 瀹℃牳閫氳繃鍚庣疆涓氬姟閫昏緫锛氭柟妗堢姸鎬佹祦杞负銆屽凡鍙戝竷銆�
- appraiseMapper.auditAppraise(id, HrmAuditStatusEnum.APPROVE.getStatus(), STATUS_PUBLISHED,
- userId, getUserNickname(userId), reviewRemark);
+ if (appraiseMapper.auditAppraise(id, HrmAuditStatusEnum.APPROVE.getStatus(), STATUS_PUBLISHED,
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_AUDIT_FAIL_NOT_PROCESS);
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateAppraiseAuditStatus(Long id, Integer bpmStatus, String reason) {
+ // BPM 瀹℃壒缁撴灉鏄犲皠涓烘柟妗堝鎵圭姸鎬侊細閫氳繃=20 / 涓嶉�氳繃=30 / 鍙栨秷=40
+ Integer auditStatus;
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
+ auditStatus = HrmAuditStatusEnum.APPROVE.getStatus();
+ } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
+ auditStatus = HrmAuditStatusEnum.REJECT.getStatus();
+ } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmStatus)) {
+ auditStatus = HrmAuditStatusEnum.CANCEL.getStatus();
+ } else {
+ return;
+ }
+ // 瀹℃牳閫氳繃鍚庢柟妗堢姸鎬佹祦杞负銆屽凡鍙戝竷銆嶏紝鍏朵綑鎯呭喌淇濇寔鍘熸柟妗堢姸鎬�
+ HrmPerformanceAppraiseDO appraise = appraiseMapper.selectById(id);
+ Integer status = HrmAuditStatusEnum.APPROVE.getStatus().equals(auditStatus)
+ ? STATUS_PUBLISHED
+ : (appraise != null ? appraise.getStatus() : null);
+ if (appraiseMapper.updateAuditStatusByBpm(id, auditStatus, status, reason) != 1) {
+ log.warn("[updateAppraiseAuditStatus] 缁╂晥鑰冩牳鏂规({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝蹇界暐 BPM 缁撴灉({})", id, bpmStatus);
+ }
}
/**
@@ -321,6 +369,10 @@
.setWeight(weight)
.setSelfScore(selfScore)
.setSuperiorScore(superiorScore));
+ }
+ // 鏉冮噸鍚堣涓� 0 鏃舵棤娉曡绠楀姞鏉冨緱鍒嗭紝閬垮厤闄ら浂
+ if (sumWeight.compareTo(BigDecimal.ZERO) <= 0) {
+ throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_ITEM_WEIGHT_INVALID);
}
BigDecimal selfTotal = weightedSelf.divide(sumWeight, 1, RoundingMode.HALF_UP);
BigDecimal superiorTotal = weightedSuperior.divide(sumWeight, 1, RoundingMode.HALF_UP);
@@ -422,10 +474,65 @@
private HrmPerformanceAppraiseDO validateAppraiseCanModify(Long id) {
HrmPerformanceAppraiseDO appraise = validateAppraiseExists(id);
- if (ObjUtil.notEqual(appraise.getStatus(), STATUS_DRAFT)) {
+ // 浠ュ鎵圭姸鎬佷负鍑嗭細浠呰崏绋� / 瀹℃牳涓嶉�氳繃鍏佽淇敼锛屽鎵逛腑绂佹淇敼
+ if (ObjUtil.notEqual(appraise.getAuditStatus(), HrmAuditStatusEnum.DRAFT.getStatus())
+ && ObjUtil.notEqual(appraise.getAuditStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_UPDATE_FAIL_NOT_DRAFT);
}
return appraise;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public HrmPerformanceAppraiseImportRespVO importAppraiseList(
+ List<HrmPerformanceAppraiseImportExcelVO> importList, HrmPerformanceAppraiseImportReqVO importReqVO) {
+ // 1. 鏍￠獙闈炵┖
+ importList = filterList(importList, item -> StrUtil.isNotBlank(item.getName()));
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_IMPORT_LIST_IS_EMPTY);
+ }
+ // 2. 閫愭潯澶勭悊
+ HrmPerformanceAppraiseImportRespVO respVO = HrmPerformanceAppraiseImportRespVO.builder()
+ .createNames(new ArrayList<>())
+ .updateNames(new ArrayList<>())
+ .failureNames(new LinkedHashMap<>())
+ .build();
+ importList.forEach(importAppraise -> {
+ try {
+ // 2.1 鍒ゆ柇鏄惁瀛樺湪锛堟寜鍚嶇О鍞竴锛�
+ HrmPerformanceAppraiseDO existAppraise = appraiseMapper.selectByName(importAppraise.getName());
+ if (existAppraise == null) {
+ // 2.1.1 鏂板锛堝鍏ュ潎涓鸿崏绋匡級
+ HrmPerformanceAppraiseDO appraise = BeanUtils.toBean(importAppraise, HrmPerformanceAppraiseDO.class)
+ .setStatus(STATUS_DRAFT)
+ .setAuditStatus(HrmAuditStatusEnum.DRAFT.getStatus());
+ if (appraise.getScopeType() == null) {
+ appraise.setScopeType(SCOPE_ALL);
+ }
+ appraiseMapper.insert(appraise);
+ respVO.getCreateNames().add(importAppraise.getName());
+ return;
+ }
+ // 2.1.2 宸插瓨鍦紝鍒ゆ柇鏄惁鍏佽鏇存柊
+ if (!importReqVO.getUpdateSupport()) {
+ respVO.getFailureNames().put(importAppraise.getName(),
+ StrUtil.format(ErrorCodeConstants.PERFORMANCE_APPRAISE_EXISTS.getMsg(), importAppraise.getName()));
+ return;
+ }
+ HrmPerformanceAppraiseDO updateAppraise = BeanUtils.toBean(importAppraise, HrmPerformanceAppraiseDO.class)
+ .setId(existAppraise.getId())
+ .setStatus(existAppraise.getStatus())
+ .setAuditStatus(existAppraise.getAuditStatus());
+ if (updateAppraise.getScopeType() == null) {
+ updateAppraise.setScopeType(existAppraise.getScopeType());
+ }
+ appraiseMapper.updateById(updateAppraise);
+ respVO.getUpdateNames().add(importAppraise.getName());
+ } catch (ServiceException ex) {
+ respVO.getFailureNames().put(importAppraise.getName(), ex.getMessage());
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3