From 7d2ee3cef2e0d68ba6400bc5957640d2771bbf4c Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 16 九月 2026 18:05:40 +0800
Subject: [PATCH] refactor: 单据审核改为审批配置状态机（新增:audit接口/审核人字段/DB变更脚本）
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/performanceappraise/HrmPerformanceAppraiseServiceImpl.java | 192 +++++++++++++----------------------------------
1 files changed, 55 insertions(+), 137 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 69451fc..d5a5a5d 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
@@ -7,11 +7,6 @@
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;
-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.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
-import cn.iocoder.yudao.module.bpm.service.definition.BpmCategoryService;
-import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
import cn.iocoder.yudao.module.hrm.controller.admin.performanceappraise.vo.*;
import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.performanceappraise.*;
@@ -19,16 +14,17 @@
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.system.api.approval.ApprovalConfigApi;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
-import org.flowable.engine.repository.ProcessDefinition;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -36,7 +32,6 @@
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.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-import static cn.iocoder.yudao.module.hrm.util.HrmAuditStatusUtils.convertBpmResultToAuditStatus;
/**
* HRM 缁╂晥鑰冩牳鏂规 Service 瀹炵幇绫�
@@ -82,9 +77,11 @@
private static final Integer EMPLOYEE_STATUS_ACTIVE = 1;
/**
- * BPM 缁╂晥鑰冩牳瀹℃壒鍒嗙被缂栫爜
+ * 缁╂晥鑰冩牳鏂规瀹℃壒鐨勪笟鍔＄被鍨嬬紪鐮�
+ *
+ * 涓� system_approval_config.biz_type 瀵瑰簲锛屽鎵逛汉鍦ㄣ�岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶄腑缁存姢銆�
*/
- private static final String APPRAISE_APPROVE_CATEGORY_CODE = "performance_appraise_approve";
+ private static final String APPRAISE_APPROVE_BIZ_TYPE = "performance_appraise_approve";
@Resource
private HrmPerformanceAppraiseMapper appraiseMapper;
@@ -97,11 +94,9 @@
@Resource
private HrmEmployeeMapper employeeMapper;
@Resource
- private BpmProcessInstanceApi bpmProcessInstanceApi;
+ private ApprovalConfigApi approvalConfigApi;
@Resource
- private BpmCategoryService bpmCategoryService;
- @Resource
- private BpmProcessDefinitionService bpmProcessDefinitionService;
+ private AdminUserApi adminUserApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -121,8 +116,7 @@
HrmPerformanceAppraiseDO oldAppraise = validateAppraiseCanModify(updateReqVO.getId());
HrmPerformanceAppraiseDO updateObj = BeanUtils.toBean(updateReqVO, HrmPerformanceAppraiseDO.class, req -> req
.setStatus(oldAppraise.getStatus())
- .setAuditStatus(oldAppraise.getAuditStatus())
- .setProcessInstanceId(oldAppraise.getProcessInstanceId()));
+ .setAuditStatus(oldAppraise.getAuditStatus()));
updateObj.setScopeTeamIds(CollUtil.isEmpty(updateReqVO.getScopeTeamIds())
? null : JSONUtil.toJsonStr(updateReqVO.getScopeTeamIds()));
appraiseMapper.updateById(updateObj);
@@ -185,122 +179,72 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void submitAppraise(Long id, String processDefinitionKey, Long userId) {
- // 1. 鏍￠獙鏂规鏄惁鍦ㄨ崏绋跨姸鎬�
+ public void submitAppraise(Long id) {
+ // 1. 鏍￠獙鏂规瀛樺湪 + 鍙彁浜ょ姸鎬侊紙鑽夌 / 瀹℃牳涓嶉�氳繃锛�
HrmPerformanceAppraiseDO appraise = appraiseMapper.selectById(id);
if (appraise == null) {
throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_NOT_EXISTS);
}
- if (ObjUtil.notEqual(appraise.getAuditStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
- throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_SUBMIT_FAIL_NOT_DRAFT);
+ if (ObjUtil.notEqual(appraise.getAuditStatus(), HrmAuditStatusEnum.DRAFT.getStatus())
+ && ObjUtil.notEqual(appraise.getAuditStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
+ throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_SUBMIT_FAIL_NOT_EDITABLE);
}
if (CollUtil.isEmpty(itemMapper.selectListByAppraiseId(id))) {
throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_ITEM_EMPTY);
}
- // 2. 鏍￠獙瀹℃壒鍒嗙被鍜屾祦绋嬪畾涔夋槸鍚﹀瓨鍦紝涓斾紶鍏ョ殑娴佺▼瀹氫箟澶勪簬婵�娲荤姸鎬�
- validateAppraiseApproveCategoryAndProcessDefinition();
- ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
- if (processDefinition == null) {
- throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_BPM_PROCESS_DEFINITION_NOT_EXISTS);
- }
+ // 2. 鏍￠獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鎵逛汉锛堟湭閰嶇疆鏃舵姏鍑哄甫鏄庣‘鎻愮ず鐨勪笟鍔″紓甯革級
+ approvalConfigApi.validateApprovalEnabledAndGetApprovers(APPRAISE_APPROVE_BIZ_TYPE);
- // 3. 鍒涘缓瀹℃壒娴佺▼瀹炰緥
- String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId,
- new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(processDefinitionKey)
- .setBusinessKey(String.valueOf(id)));
+ // 3. 瀹℃壒鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
+ appraiseMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus());
+ }
- // 4. 鏇存柊鏂规娴佺▼缂栧彿涓庡鎵圭姸鎬�
- appraiseMapper.updateById(new HrmPerformanceAppraiseDO().setId(id).setProcessInstanceId(processInstanceId)
- .setAuditStatus(HrmAuditStatusEnum.PROCESS.getStatus()));
+ @Override
+ public Set<Long> getAppraiseApproverUserIds() {
+ return approvalConfigApi.getApproverUserIds(APPRAISE_APPROVE_BIZ_TYPE);
}
@Override
@Transactional(rollbackFor = Exception.class)
- public void auditAppraise(HrmPerformanceAppraiseAuditReqVO auditReqVO) {
- HrmPerformanceAppraiseDO appraise = validateAppraiseExists(auditReqVO.getId());
+ public void auditAppraise(Long id, Boolean pass, String reviewRemark) {
+ // 1. 鏍￠獙瀛樺湪
+ HrmPerformanceAppraiseDO appraise = validateAppraiseExists(id);
+ // 2. 鏍￠獙澶勪簬瀹℃壒涓姸鎬�
if (ObjUtil.notEqual(appraise.getAuditStatus(), HrmAuditStatusEnum.PROCESS.getStatus())) {
- throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS);
+ throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_AUDIT_FAIL_NOT_PROCESS);
}
- Integer auditStatus = auditReqVO.getAuditStatus();
- if (!Objects.equals(auditStatus, HrmAuditStatusEnum.APPROVE.getStatus())
- && !Objects.equals(auditStatus, HrmAuditStatusEnum.REJECT.getStatus())) {
- throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS);
+ // 3. 鏍￠獙褰撳墠鐧诲綍鐢ㄦ埛鏄涓氬姟绫诲瀷鐨勫鎵逛汉锛堟垨绛撅細浠讳竴浜哄潎鍙鏍革級
+ Long userId = getLoginUserId();
+ approvalConfigApi.validateApprover(APPRAISE_APPROVE_BIZ_TYPE, userId);
+ // 4. 瀹℃牳涓嶉�氳繃锛氬繀椤诲～鍐欏師鍥狅紝瀹℃壒鐘舵�佺疆涓哄鏍镐笉閫氳繃锛岄��鍥炴彁浜や汉淇敼鍚庡彲閲嶆柊鎻愪氦
+ if (!Boolean.TRUE.equals(pass)) {
+ if (StrUtil.isBlank(reviewRemark)) {
+ throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_AUDIT_REJECT_REASON_REQUIRED);
+ }
+ // 鏂规鐘舵�佷繚鎸佷笉鍙�
+ appraiseMapper.auditAppraise(id, HrmAuditStatusEnum.REJECT.getStatus(), appraise.getStatus(),
+ userId, getUserNickname(userId), reviewRemark);
+ return;
}
- HrmPerformanceAppraiseDO update = new HrmPerformanceAppraiseDO()
- .setId(appraise.getId())
- .setAuditStatus(auditStatus)
- .setAuditUserId(getLoginUserId())
- .setAuditTime(LocalDateTime.now());
- if (auditReqVO.getRemark() != null) {
- update.setAuditRemark(auditReqVO.getRemark());
- }
- // 瀹℃壒閫氳繃 -> 鏂规鍙戝竷
- if (Objects.equals(auditStatus, HrmAuditStatusEnum.APPROVE.getStatus())) {
- update.setStatus(STATUS_PUBLISHED);
- }
- appraiseMapper.updateById(update);
+ // 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝瀹℃壒鐘舵�佺疆涓哄鏍搁�氳繃
+ // 6. 瀹℃牳閫氳繃鍚庣疆涓氬姟閫昏緫锛氭柟妗堢姸鎬佹祦杞负銆屽凡鍙戝竷銆�
+ appraiseMapper.auditAppraise(id, HrmAuditStatusEnum.APPROVE.getStatus(), STATUS_PUBLISHED,
+ userId, getUserNickname(userId), reviewRemark);
}
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void updateAppraiseAuditStatus(Long id, Integer bpmResult) {
- // 1.1 鏍￠獙鏂规鏄惁瀛樺湪
- HrmPerformanceAppraiseDO appraise = appraiseMapper.selectById(id);
- if (appraise == null) {
- throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_NOT_EXISTS);
+ /**
+ * 鑾峰彇鐢ㄦ埛鏄电О
+ *
+ * @param userId 鐢ㄦ埛缂栧彿
+ * @return 鏄电О锛岀敤鎴蜂笉瀛樺湪鏃惰繑鍥� null
+ */
+ private String getUserNickname(Long userId) {
+ if (userId == null) {
+ return null;
}
- // 1.2 鍙湁瀹℃壒涓紝鍙互鏇存柊瀹℃壒缁撴灉
- if (ObjUtil.notEqual(appraise.getAuditStatus(), HrmAuditStatusEnum.PROCESS.getStatus())) {
- log.error("[updateAppraiseAuditStatus][appraise({}) 涓嶅浜庡鎵逛腑锛屾棤娉曟洿鏂板鎵圭粨鏋�({})]", appraise.getId(), bpmResult);
- throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS);
- }
-
- // 2. 鏇存柊鏂规瀹℃壒缁撴灉
- Integer auditStatus = convertBpmResultToAuditStatus(bpmResult);
- HrmPerformanceAppraiseDO update = new HrmPerformanceAppraiseDO().setId(id).setAuditStatus(auditStatus);
- if (Objects.equals(auditStatus, HrmAuditStatusEnum.APPROVE.getStatus())) {
- update.setStatus(STATUS_PUBLISHED);
- }
- appraiseMapper.updateById(update);
- }
-
- @Override
- public List<Map<String, Object>> getAppraiseApproveProcessDefinitionList() {
- // 1. 鏍￠獙瀹℃壒鍒嗙被鍜屾祦绋嬪畾涔夋槸鍚﹀瓨鍦�
- validateAppraiseApproveCategoryAndProcessDefinition();
-
- // 2. 鑾峰彇鍒嗙被涓嬬殑娴佺▼瀹氫箟淇℃伅
- List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
- .getProcessDefinitionInfoListByCategory(APPRAISE_APPROVE_CATEGORY_CODE);
-
- // 3. 鑾峰彇娴佺▼瀹氫箟璇︽儏
- Set<String> processDefinitionIds = convertSet(definitionInfoList, BpmProcessDefinitionInfoDO::getProcessDefinitionId);
- List<ProcessDefinition> processDefinitions = bpmProcessDefinitionService.getProcessDefinitionList(processDefinitionIds);
-
- // 4. 杩囨护锛氬彧淇濈暀婵�娲荤姸鎬侊紝涓旂浉鍚� key 鍙繚鐣欐渶鏂扮増鏈�
- Map<String, ProcessDefinition> latestVersionMap = new HashMap<>();
- for (ProcessDefinition pd : processDefinitions) {
- if (pd.isSuspended()) {
- continue;
- }
- ProcessDefinition existing = latestVersionMap.get(pd.getKey());
- if (existing == null || pd.getVersion() > existing.getVersion()) {
- latestVersionMap.put(pd.getKey(), pd);
- }
- }
-
- // 5. 杩斿洖娴佺▼瀹氫箟鍒楄〃
- List<Map<String, Object>> result = new ArrayList<>();
- for (ProcessDefinition pd : latestVersionMap.values()) {
- Map<String, Object> item = new HashMap<>();
- item.put("id", pd.getId());
- item.put("key", pd.getKey());
- item.put("name", pd.getName());
- item.put("version", pd.getVersion());
- result.add(item);
- }
- return result;
+ AdminUserRespDTO user = adminUserApi.getUser(userId);
+ return user == null ? null : user.getNickname();
}
@Override
@@ -482,32 +426,6 @@
throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_UPDATE_FAIL_NOT_DRAFT);
}
return appraise;
- }
-
- /**
- * 鏍￠獙 BPM 缁╂晥鑰冩牳瀹℃壒鍒嗙被鍜屾祦绋嬪畾涔夋槸鍚﹀瓨鍦�
- */
- private void validateAppraiseApproveCategoryAndProcessDefinition() {
- // 1. 鏍￠獙鍒嗙被鏄惁瀛樺湪
- Map<String, ?> categoryMap = bpmCategoryService.getCategoryMap(Collections.singletonList(APPRAISE_APPROVE_CATEGORY_CODE));
- if (!categoryMap.containsKey(APPRAISE_APPROVE_CATEGORY_CODE)) {
- throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_BPM_PROCESS_DEFINITION_NOT_EXISTS);
- }
-
- // 2. 鏍￠獙鍒嗙被涓嬫槸鍚︽湁鍙敤鐨勬祦绋嬪畾涔�
- List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
- .getProcessDefinitionInfoListByCategory(APPRAISE_APPROVE_CATEGORY_CODE);
- if (CollUtil.isEmpty(definitionInfoList)) {
- throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_BPM_PROCESS_DEFINITION_NOT_EXISTS);
- }
-
- // 3. 鏍￠獙鏄惁鏈夋縺娲荤姸鎬佺殑娴佺▼瀹氫箟
- Set<String> processDefinitionIds = convertSet(definitionInfoList, BpmProcessDefinitionInfoDO::getProcessDefinitionId);
- List<ProcessDefinition> processDefinitions = bpmProcessDefinitionService.getProcessDefinitionList(processDefinitionIds);
- boolean hasActiveDefinition = processDefinitions.stream().anyMatch(pd -> !pd.isSuspended());
- if (!hasActiveDefinition) {
- throw exception(ErrorCodeConstants.PERFORMANCE_APPRAISE_BPM_PROCESS_DEFINITION_NOT_EXISTS);
- }
}
}
--
Gitblit v1.9.3