From 1fd52d7784a8b0b963cf38d63175cdf9082e8f43 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期二, 03 十一月 2026 19:40:39 +0800
Subject: [PATCH] fix(hrm): 薪酬核算按出勤天数联动扣款、个税配置可保存、离职提交报错
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java | 68 ++++++++++++++++++++++++++++++++--
1 files changed, 64 insertions(+), 4 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java
index 3548495..776d807 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
@@ -12,13 +13,16 @@
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmResignationApplicationPageReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmResignationApplicationRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmResignationApplicationSaveReqVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmResignationHandoverReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.approval.HrmResignationApplicationDO;
import cn.iocoder.yudao.module.hrm.dal.mysql.approval.HrmResignationApplicationMapper;
import cn.iocoder.yudao.module.hrm.dal.redis.HrmNoRedisDAO;
import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import cn.iocoder.yudao.module.hrm.enums.HrmResignationTypeEnum;
+import cn.iocoder.yudao.module.hrm.service.handover.HrmUserHandoverService;
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.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import jakarta.annotation.Resource;
@@ -30,6 +34,7 @@
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -45,7 +50,7 @@
/**
* 绂昏亴鐢宠 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -69,7 +74,11 @@
@Resource
private BpmCategoryService bpmCategoryService;
@Resource
+ private StorageAttachmentApi storageAttachmentApi;
+ @Resource
private BpmProcessDefinitionService bpmProcessDefinitionService;
+ @Resource
+ private HrmUserHandoverService handoverService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -86,15 +95,22 @@
String no = generateUniqueNo();
AdminUserRespDTO user = adminUserApi.getUser(userId);
if (user == null) {
+ // 浼犲叆鐨勫彲鑳戒笉鏄郴缁熺敤鎴稩D锛堜緥濡傚憳宸D锛夛紝鍥為��鍒板綋鍓嶇櫥褰曠敤鎴峰苟閲嶆柊鏌ヨ锛岄伩鍏嶅悗缁� NPE
userId = getCurrentUserId();
+ user = adminUserApi.getUser(userId);
}
HrmResignationApplicationDO application = BeanUtils.toBean(createReqVO, HrmResignationApplicationDO.class);
application.setNo(no);
application.setUserId(userId);
- application.setDeptId(createReqVO.getDeptId() != null ? createReqVO.getDeptId() : user.getDeptId());
+ // 閮ㄩ棬锛氫紭鍏堝彇璇锋眰鍙傛暟锛屽叾娆″彇璐﹀彿鎵�灞為儴闂紝鏈�鍚庡厹搴� 0锛堣鍒� NOT NULL锛�
+ Long deptId = createReqVO.getDeptId() != null ? createReqVO.getDeptId()
+ : (user != null ? user.getDeptId() : null);
+ application.setDeptId(deptId != null ? deptId : 0L);
application.setStatus(HrmAuditStatusEnum.DRAFT.getStatus());
application.setHandoverStatus(HANDOVER_STATUS_NOT_STARTED);
resignationApplicationMapper.insert(application);
+ storageAttachmentApi.bindAttachments("file", "hrm_resignation_application",
+ application.getId(), createReqVO.getBlobIds());
return application.getId();
}
@@ -118,6 +134,7 @@
}
HrmResignationApplicationDO updateObj = BeanUtils.toBean(updateReqVO, HrmResignationApplicationDO.class);
resignationApplicationMapper.updateById(updateObj);
+ storageAttachmentApi.updateAttachments("file", "hrm_resignation_application", updateReqVO.getId(), updateReqVO.getBlobIds());
}
@Override
@@ -126,6 +143,7 @@
if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
throw exception(RESIGNATION_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
}
+ storageAttachmentApi.deleteAttachmentsByRecord("hrm_resignation_application", id);
resignationApplicationMapper.deleteById(id);
}
@@ -159,6 +177,7 @@
respVO.setResignationTypeName(HrmResignationTypeEnum.getNameByStatus(application.getResignationType()));
respVO.setHandoverStatusName(getHandoverStatusName(application.getHandoverStatus()));
respVO.setStatusName(HrmAuditStatusEnum.getNameByStatus(application.getStatus()));
+ respVO.setAttachmentList(storageAttachmentApi.listAttachments("hrm_resignation_application", id));
return respVO;
}
@@ -233,17 +252,40 @@
throw exception(RESIGNATION_APPLICATION_SUBMIT_FAIL_NOT_DRAFT);
}
validateApproveCategoryAndProcessDefinition();
- ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
+ // 鏈寚瀹氭祦绋嬪畾涔� Key 鏃讹紝鑷姩鍙栥�岀鑱屽鎵广�嶅垎绫讳笅鏈�鏂扮殑娲昏穬娴佺▼锛岄伩鍏嶅墠绔湭浼� key 鐩存帴鎶ョ郴缁熷紓甯�
+ String key = resolveProcessDefinitionKey(processDefinitionKey);
+ ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(key);
if (processDefinition == null) {
throw exception(RESIGNATION_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
}
String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(processDefinitionKey).setBusinessKey(String.valueOf(id)));
+ .setProcessDefinitionKey(key).setBusinessKey(String.valueOf(id)));
resignationApplicationMapper.updateById(HrmResignationApplicationDO.builder()
.id(id)
.processInstanceId(processInstanceId)
.status(HrmAuditStatusEnum.PROCESS.getStatus())
.build());
+ }
+
+ /**
+ * 瑙ｆ瀽娴佺▼瀹氫箟 Key锛氫紭鍏堜娇鐢ㄨ皟鐢ㄦ柟浼犲叆鍊硷紝涓虹┖鏃跺彇銆岀鑱屽鎵广�嶅垎绫讳笅鏈�鏂扮殑娲昏穬娴佺▼
+ */
+ private String resolveProcessDefinitionKey(String processDefinitionKey) {
+ if (StrUtil.isNotBlank(processDefinitionKey)) {
+ return processDefinitionKey.trim();
+ }
+ List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(APPROVE_CATEGORY_CODE);
+ if (CollUtil.isEmpty(definitionInfoList)) {
+ throw exception(RESIGNATION_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+ Set<String> processDefinitionIds = convertSet(definitionInfoList, BpmProcessDefinitionInfoDO::getProcessDefinitionId);
+ List<ProcessDefinition> processDefinitions = bpmProcessDefinitionService.getProcessDefinitionList(processDefinitionIds);
+ return processDefinitions.stream()
+ .filter(pd -> !pd.isSuspended())
+ .max(Comparator.comparingInt(ProcessDefinition::getVersion))
+ .map(ProcessDefinition::getKey)
+ .orElseThrow(() -> exception(RESIGNATION_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS));
}
private void validateApproveCategoryAndProcessDefinition() {
@@ -311,4 +353,22 @@
return resignationApplicationMapper.selectByProcessInstanceId(processInstanceId);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateHandoverStatus(HrmResignationHandoverReqVO reqVO) {
+ HrmResignationApplicationDO application = validateResignationApplicationExists(reqVO.getId());
+ resignationApplicationMapper.updateById(HrmResignationApplicationDO.builder()
+ .id(reqVO.getId())
+ .handoverStatus(reqVO.getHandoverStatus())
+ .build());
+ // 浜ゆ帴瀹屾垚鏃讹紝鍒涘缓鐢ㄦ埛鏁版嵁浜ゆ帴鏄犲皠
+ if (Objects.equals(reqVO.getHandoverStatus(), HANDOVER_STATUS_COMPLETED)
+ && application.getHandoverUserId() != null) {
+ handoverService.createHandover(
+ application.getUserId(),
+ application.getHandoverUserId(),
+ application.getId());
+ }
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3