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 | 243 +++++++++++++++++++++++++++++++-----------------
1 files changed, 155 insertions(+), 88 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 660134a..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
@@ -1,23 +1,23 @@
package cn.iocoder.yudao.module.hrm.service.approval;
-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.framework.security.core.util.SecurityFrameworkUtils;
-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.approval.vo.HrmRegularizeApplicationPageReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmRegularizeApplicationRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmRegularizeApplicationSaveReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.approval.HrmRegularizeApplicationDO;
+import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
import cn.iocoder.yudao.module.hrm.dal.mysql.approval.HrmRegularizeApplicationMapper;
+import cn.iocoder.yudao.module.hrm.dal.mysql.employee.HrmEmployeeMapper;
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;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
@@ -26,23 +26,20 @@
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.util.ArrayList;
+import java.time.LocalDate;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-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.enums.ErrorCodeConstants.*;
/**
@@ -55,6 +52,28 @@
@Slf4j
public class HrmRegularizeApplicationServiceImpl implements HrmRegularizeApplicationService {
+ /**
+ * 杞鐢宠瀹℃壒鐨勪笟鍔＄被鍨嬬紪鐮�
+ *
+ * 涓� system_approval_config.biz_type 瀵瑰簲锛屽鎵逛汉鍦ㄣ�岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶄腑缁存姢銆�
+ */
+ 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;
+
+ /**
+ * 鐢ㄥ伐鎬ц川锛氭寮�
+ */
+ private static final Integer EMPLOYMENT_TYPE_FORMAL = 1;
+
@Resource
private HrmRegularizeApplicationMapper regularizeApplicationMapper;
@Resource
@@ -66,11 +85,11 @@
@Resource
private AdminUserApi adminUserApi;
@Resource
+ private ApprovalConfigApi approvalConfigApi;
+ @Resource
private BpmProcessInstanceApi bpmProcessInstanceApi;
@Resource
- private BpmCategoryService bpmCategoryService;
- @Resource
- private BpmProcessDefinitionService bpmProcessDefinitionService;
+ private HrmEmployeeMapper employeeMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -79,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);
@@ -104,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) {
@@ -115,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);
@@ -125,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);
@@ -220,88 +251,124 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void submitRegularizeApplication(Long id, String processDefinitionKey, Long userId) {
+ public void submitRegularizeApplication(Long id) {
+ // 1. 鏍￠獙瀛樺湪 + 鍙彁浜ょ姸鎬侊紙鑽夌 / 瀹℃牳涓嶉�氳繃锛�
HrmRegularizeApplicationDO application = validateRegularizeApplicationExists(id);
- if (ObjUtil.notEqual(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
- throw exception(REGULARIZE_APPLICATION_SUBMIT_FAIL_NOT_DRAFT);
+ if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())
+ && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
+ throw exception(REGULARIZE_APPLICATION_SUBMIT_FAIL_NOT_EDITABLE);
}
- validateApproveCategoryAndProcessDefinition();
- ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
- if (processDefinition == null) {
- throw exception(REGULARIZE_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
- }
- String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(processDefinitionKey).setBusinessKey(String.valueOf(id)));
- regularizeApplicationMapper.updateById(HrmRegularizeApplicationDO.builder()
- .id(id)
- .processInstanceId(processInstanceId)
- .status(HrmAuditStatusEnum.PROCESS.getStatus())
- .build());
- }
+ validateApplicant(application.getUserId());
- private void validateApproveCategoryAndProcessDefinition() {
- List<String> codes = Collections.singletonList(APPROVE_CATEGORY_CODE);
- Map<String, ?> categoryMap = bpmCategoryService.getCategoryMap(codes);
- if (!categoryMap.containsKey(APPROVE_CATEGORY_CODE)) {
- throw exception(REGULARIZE_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ // 2. 鏍￠獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鎵逛汉锛堟湭閰嶇疆鏃舵姏鍑哄甫鏄庣‘鎻愮ず鐨勪笟鍔″紓甯革級
+ approvalConfigApi.validateApprovalEnabledAndGetApprovers(REGULARIZE_APPROVE_BIZ_TYPE);
+
+ // 3. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
+ if (regularizeApplicationMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(REGULARIZE_APPLICATION_SUBMIT_FAIL_NOT_EDITABLE);
}
- List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
- .getProcessDefinitionInfoListByCategory(APPROVE_CATEGORY_CODE);
- if (CollUtil.isEmpty(definitionInfoList)) {
- throw exception(REGULARIZE_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
- }
- 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(REGULARIZE_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
- }
+
+ // 4. 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
+ bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(REGULARIZE_APPROVE_PROCESS_KEY)
+ .setBusinessKey(String.valueOf(id)));
}
@Override
- public List<Map<String, Object>> getApproveProcessDefinitionList() {
- validateApproveCategoryAndProcessDefinition();
- List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
- .getProcessDefinitionInfoListByCategory(APPROVE_CATEGORY_CODE);
- Set<String> processDefinitionIds = convertSet(definitionInfoList, BpmProcessDefinitionInfoDO::getProcessDefinitionId);
- List<ProcessDefinition> processDefinitions = bpmProcessDefinitionService.getProcessDefinitionList(processDefinitionIds);
- 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);
- }
- }
- 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;
+ public Set<Long> getRegularizeApplicationApproverUserIds() {
+ return approvalConfigApi.getApproverUserIds(REGULARIZE_APPROVE_BIZ_TYPE);
}
@Override
- public void updateRegularizeApplicationAuditStatus(Long id, Integer status) {
+ @Transactional(rollbackFor = Exception.class)
+ public void auditRegularizeApplication(Long id, Boolean pass, String reviewRemark) {
+ // 1. 鏍￠獙瀛樺湪
HrmRegularizeApplicationDO application = validateRegularizeApplicationExists(id);
+ // 2. 鏍￠獙澶勪簬瀹℃壒涓姸鎬�
if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.PROCESS.getStatus())) {
- log.error("[updateRegularizeApplicationAuditStatus][application({}) 涓嶅浜庡鎵逛腑锛屾棤娉曟洿鏂板鎵圭粨鏋�({})]", id, status);
- throw exception(REGULARIZE_APPLICATION_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS);
+ throw exception(REGULARIZE_APPLICATION_AUDIT_FAIL_NOT_PROCESS);
}
- regularizeApplicationMapper.updateById(HrmRegularizeApplicationDO.builder()
- .id(id)
- .status(status)
- .approveTime(java.time.LocalDateTime.now())
+ // 3. 鏍￠獙褰撳墠鐧诲綍鐢ㄦ埛鏄涓氬姟绫诲瀷鐨勫鎵逛汉锛堟垨绛撅細浠讳竴浜哄潎鍙鏍革級
+ Long userId = getLoginUserId();
+ approvalConfigApi.validateApprover(REGULARIZE_APPROVE_BIZ_TYPE, userId);
+ // 4. 瀹℃牳涓嶉�氳繃锛氬繀椤诲～鍐欏師鍥狅紝鐘舵�佺疆涓哄鏍镐笉閫氳繃锛岄��鍥炴彁浜や汉淇敼鍚庡彲閲嶆柊鎻愪氦
+ if (!Boolean.TRUE.equals(pass)) {
+ if (StrUtil.isBlank(reviewRemark)) {
+ throw exception(REGULARIZE_APPLICATION_AUDIT_REJECT_REASON_REQUIRED);
+ }
+ if (regularizeApplicationMapper.auditRegularizeApplication(id, HrmAuditStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(REGULARIZE_APPLICATION_AUDIT_FAIL_NOT_PROCESS);
+ }
+ return;
+ }
+ // 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
+ if (regularizeApplicationMapper.auditRegularizeApplication(id, HrmAuditStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(REGULARIZE_APPLICATION_AUDIT_FAIL_NOT_PROCESS);
+ }
+
+ // 6. 瀹℃牳閫氳繃鍚庣疆涓氬姟閫昏緫锛氬洖鍐欏憳宸ヤ富妗ｏ紙鐘舵��=鍦ㄨ亴锛岀敤宸ユ�ц川=姝ｅ紡锛岃浆姝ｆ棩鏈� = 鎷熻浆姝ｆ棩鏈熸垨褰撳ぉ锛�
+ writeBackEmployee(application);
+ }
+
+ /**
+ * 瀹℃牳閫氳繃鍚庡洖鍐欏憳宸ヤ富妗�
+ *
+ * @param application 杞鐢宠
+ */
+ private void writeBackEmployee(HrmRegularizeApplicationDO application) {
+ HrmEmployeeDO employee = employeeMapper.selectByUserId(application.getUserId());
+ if (employee == null) {
+ throw exception(REGULARIZE_EMPLOYEE_LINK_REQUIRED);
+ }
+ LocalDate regularDate = application.getExpectedDate() != null ? application.getExpectedDate() : LocalDate.now();
+ employeeMapper.updateById(HrmEmployeeDO.builder()
+ .id(employee.getId())
+ .employeeStatus(EMPLOYEE_STATUS_ACTIVE)
+ .employmentType(EMPLOYMENT_TYPE_FORMAL)
+ .regularDate(regularDate)
.build());
}
@Override
- public HrmRegularizeApplicationDO getRegularizeApplicationByProcessInstanceId(String processInstanceId) {
- return regularizeApplicationMapper.selectByProcessInstanceId(processInstanceId);
+ @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);
+ }
}
-}
\ No newline at end of file
+ /**
+ * 鑾峰彇鐢ㄦ埛鏄电О
+ *
+ * @param userId 鐢ㄦ埛缂栧彿
+ * @return 鏄电О锛岀敤鎴蜂笉瀛樺湪鏃惰繑鍥� null
+ */
+ private String getUserNickname(Long userId) {
+ if (userId == null) {
+ return null;
+ }
+ AdminUserRespDTO user = adminUserApi.getUser(userId);
+ return user == null ? null : user.getNickname();
+ }
+
+}
--
Gitblit v1.9.3