From daf9f8dbb7ba36eb283221d2c6022039aefaf97d Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 00:40:38 +0800
Subject: [PATCH] feat(aftersales): 售后退货单同步MES批次信息并优化工单处理流程
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmRegularizeApplicationServiceImpl.java | 89 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 74 insertions(+), 15 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmRegularizeApplicationServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmRegularizeApplicationServiceImpl.java
index 2a90f0e..ef59c7a 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmRegularizeApplicationServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmRegularizeApplicationServiceImpl.java
@@ -14,6 +14,9 @@
import cn.iocoder.yudao.module.hrm.dal.redis.HrmNoRedisDAO;
import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import cn.iocoder.yudao.module.hrm.enums.HrmEmploymentTypeEnum;
+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.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.PostApi;
@@ -57,6 +60,11 @@
private static final String REGULARIZE_APPROVE_BIZ_TYPE = "hrm_regularize_approve";
/**
+ * 杞鐢宠瀹℃壒鐨� BPM 娴佺▼瀹氫箟 Key
+ */
+ private static final String REGULARIZE_APPROVE_PROCESS_KEY = "hrm_regularize_approve";
+
+ /**
* 鍛樺伐鐘舵�侊細鍦ㄨ亴
*/
private static final Integer EMPLOYEE_STATUS_ACTIVE = 1;
@@ -79,6 +87,8 @@
@Resource
private ApprovalConfigApi approvalConfigApi;
@Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
+ @Resource
private HrmEmployeeMapper employeeMapper;
@Override
@@ -88,17 +98,13 @@
if (userId == null) {
userId = getCurrentUserId();
}
+ AdminUserRespDTO user = validateApplicant(userId);
HrmRegularizeApplicationDO existing = regularizeApplicationMapper.selectByUserIdAndStatusNot(userId,
HrmAuditStatusEnum.CANCEL.getStatus());
if (existing != null) {
throw exception(REGULARIZE_APPLICATION_EXISTS);
}
String no = generateUniqueNo();
- AdminUserRespDTO user = adminUserApi.getUser(userId);
- if (user == null) {
- userId = getCurrentUserId();
- user = adminUserApi.getUser(userId);
- }
HrmRegularizeApplicationDO application = BeanUtils.toBean(createReqVO, HrmRegularizeApplicationDO.class);
application.setNo(no);
application.setUserId(userId);
@@ -113,6 +119,17 @@
return SecurityFrameworkUtils.getLoginUserId();
}
+ private AdminUserRespDTO validateApplicant(Long userId) {
+ AdminUserRespDTO user = userId == null ? null : adminUserApi.getUser(userId);
+ if (user == null) {
+ throw exception(REGULARIZE_APPLICANT_NOT_EXISTS);
+ }
+ if (employeeMapper.selectByUserId(userId) == null) {
+ throw exception(REGULARIZE_EMPLOYEE_LINK_REQUIRED);
+ }
+ return user;
+ }
+
private String generateUniqueNo() {
String no = noRedisDAO.generateRegularizeApplicationNo();
if (regularizeApplicationMapper.selectByNo(no) != null) {
@@ -124,8 +141,12 @@
@Override
public void updateRegularizeApplication(HrmRegularizeApplicationSaveReqVO updateReqVO) {
HrmRegularizeApplicationDO application = validateRegularizeApplicationExists(updateReqVO.getId());
- if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
+ if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())
+ && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
throw exception(REGULARIZE_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
+ }
+ if (updateReqVO.getUserId() != null) {
+ validateApplicant(updateReqVO.getUserId());
}
HrmRegularizeApplicationDO updateObj = BeanUtils.toBean(updateReqVO, HrmRegularizeApplicationDO.class);
regularizeApplicationMapper.updateById(updateObj);
@@ -134,7 +155,8 @@
@Override
public void deleteRegularizeApplication(Long id) {
HrmRegularizeApplicationDO application = validateRegularizeApplicationExists(id);
- if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
+ if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())
+ && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
throw exception(REGULARIZE_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
}
regularizeApplicationMapper.deleteById(id);
@@ -236,12 +258,21 @@
&& !Objects.equals(application.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
throw exception(REGULARIZE_APPLICATION_SUBMIT_FAIL_NOT_EDITABLE);
}
+ validateApplicant(application.getUserId());
// 2. 鏍￠獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鎵逛汉锛堟湭閰嶇疆鏃舵姏鍑哄甫鏄庣‘鎻愮ず鐨勪笟鍔″紓甯革級
approvalConfigApi.validateApprovalEnabledAndGetApprovers(REGULARIZE_APPROVE_BIZ_TYPE);
// 3. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
- regularizeApplicationMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus());
+ if (regularizeApplicationMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(REGULARIZE_APPLICATION_SUBMIT_FAIL_NOT_EDITABLE);
+ }
+
+ // 4. 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
+ bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(REGULARIZE_APPROVE_PROCESS_KEY)
+ .setBusinessKey(String.valueOf(id)));
}
@Override
@@ -266,13 +297,17 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(REGULARIZE_APPLICATION_AUDIT_REJECT_REASON_REQUIRED);
}
- regularizeApplicationMapper.auditRegularizeApplication(id, HrmAuditStatusEnum.REJECT.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (regularizeApplicationMapper.auditRegularizeApplication(id, HrmAuditStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(REGULARIZE_APPLICATION_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
- regularizeApplicationMapper.auditRegularizeApplication(id, HrmAuditStatusEnum.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (regularizeApplicationMapper.auditRegularizeApplication(id, HrmAuditStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(REGULARIZE_APPLICATION_AUDIT_FAIL_NOT_PROCESS);
+ }
// 6. 瀹℃牳閫氳繃鍚庣疆涓氬姟閫昏緫锛氬洖鍐欏憳宸ヤ富妗ｏ紙鐘舵��=鍦ㄨ亴锛岀敤宸ユ�ц川=姝ｅ紡锛岃浆姝ｆ棩鏈� = 鎷熻浆姝ｆ棩鏈熸垨褰撳ぉ锛�
writeBackEmployee(application);
@@ -286,8 +321,7 @@
private void writeBackEmployee(HrmRegularizeApplicationDO application) {
HrmEmployeeDO employee = employeeMapper.selectByUserId(application.getUserId());
if (employee == null) {
- log.warn("[writeBackEmployee] 杞鐢宠({}) 鐢ㄦ埛({}) 鏈壘鍒板憳宸ユ。妗堬紝璺宠繃鍥炲啓", application.getId(), application.getUserId());
- return;
+ throw exception(REGULARIZE_EMPLOYEE_LINK_REQUIRED);
}
LocalDate regularDate = application.getExpectedDate() != null ? application.getExpectedDate() : LocalDate.now();
employeeMapper.updateById(HrmEmployeeDO.builder()
@@ -296,6 +330,31 @@
.employmentType(EMPLOYMENT_TYPE_FORMAL)
.regularDate(regularDate)
.build());
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateRegularizeApplicationAuditStatus(Long id, Integer bpmStatus, String reason) {
+ // BPM 瀹℃壒缁撴灉鏄犲皠涓鸿浆姝ｅ鎵圭姸鎬侊細閫氳繃=20 / 涓嶉�氳繃=30 / 鍙栨秷=40
+ Integer status;
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
+ status = HrmAuditStatusEnum.APPROVE.getStatus();
+ } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
+ status = HrmAuditStatusEnum.REJECT.getStatus();
+ } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmStatus)) {
+ status = HrmAuditStatusEnum.CANCEL.getStatus();
+ } else {
+ return;
+ }
+ HrmRegularizeApplicationDO application = regularizeApplicationMapper.selectById(id);
+ if (regularizeApplicationMapper.updateAuditStatusByBpm(id, status, reason) != 1) {
+ log.warn("[updateRegularizeApplicationAuditStatus] 杞鐢宠({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝蹇界暐 BPM 缁撴灉({})", id, bpmStatus);
+ return;
+ }
+ // 瀹℃壒閫氳繃鍚庣疆涓氬姟閫昏緫锛氬洖鍐欏憳宸ヤ富妗�
+ if (status.equals(HrmAuditStatusEnum.APPROVE.getStatus()) && application != null) {
+ writeBackEmployee(application);
+ }
}
/**
@@ -312,4 +371,4 @@
return user == null ? null : user.getNickname();
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3