From b852254d90e7d1955db31db154193ec8ee84d8b3 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 09 九月 2026 10:57:59 +0800
Subject: [PATCH] feat(hrm): 新增员工用工性质、班组归属字段及考勤异常处理优化
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java | 101 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 96 insertions(+), 5 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java
index 37f56fb..f5a6f07 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java
@@ -18,13 +18,22 @@
import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
+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.enums.task.BpmTaskStatusEnum;
+import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
-import java.util.List;
+import java.util.*;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
@@ -35,6 +44,7 @@
*/
@Service
@Validated
+@Slf4j
public class MesWmReturnVendorServiceImpl implements MesWmReturnVendorService {
@Resource
@@ -48,6 +58,10 @@
private SrmSupplierApi srmSupplierApi;
@Resource
private MesWmTransactionService wmTransactionService;
+ @Resource
+ private BpmProcessInstanceApi processInstanceApi;
+ @Resource
+ private BpmProcessDefinitionService bpmProcessDefinitionService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -99,7 +113,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void submitReturnVendor(Long id) {
+ public void submitReturnVendorApproval(Long id, String processDefinitionKey) {
// 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
validateReturnVendorExistsAndPrepare(id);
// 鏍￠獙鑷冲皯鏈変竴鏉¤
@@ -107,10 +121,87 @@
if (CollUtil.isEmpty(lines)) {
throw exception(WM_RETURN_VENDOR_NO_LINE);
}
-
- // 鎻愪氦锛堣崏绋� -> 寰呮嫞璐э級
+ // 鍒涘缓 BPM 娴佺▼瀹炰緥
+ String processInstanceId = processInstanceApi.createProcessInstance(getCurrentUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(processDefinitionKey)
+ .setBusinessKey(String.valueOf(id)));
+ // 鎻愪氦瀹℃壒锛堣崏绋� 鈫� 瀹℃壒涓級
returnVendorMapper.updateById(new MesWmReturnVendorDO()
- .setId(id).setStatus(MesWmReturnVendorStatusEnum.APPROVING.getStatus()));
+ .setId(id)
+ .setStatus(MesWmReturnVendorStatusEnum.APPROVING.getStatus())
+ .setProcessInstanceId(processInstanceId));
+ }
+
+ @Override
+ public List<Map<String, Object>> getReturnVendorApprovalProcessDefinitionList() {
+ return getProcessDefinitionListByCategory(APPROVE_CATEGORY_CODE);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateReturnVendorAuditStatus(Long id, Integer bpmResult) {
+ // 1. 鏍￠獙瀛樺湪
+ MesWmReturnVendorDO returnVendor = validateReturnVendorExists(id);
+ if (!MesWmReturnVendorStatusEnum.APPROVING.getStatus().equals(returnVendor.getStatus())) {
+ log.warn("[updateReturnVendorAuditStatus] 渚涘簲鍟嗛��璐у崟({}) 涓嶅浜庡鎵逛腑鐘舵��", id);
+ return;
+ }
+ // 2. 鏍规嵁瀹℃壒缁撴灉鏇存柊鐘舵��
+ Integer newStatus = convertBpmResultToStatus(bpmResult);
+ if (newStatus != null) {
+ returnVendorMapper.updateById(new MesWmReturnVendorDO().setId(id).setStatus(newStatus));
+ }
+ }
+
+ private Integer convertBpmResultToStatus(Integer bpmResult) {
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
+ return MesWmReturnVendorStatusEnum.APPROVED.getStatus();
+ }
+ if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmResult)) {
+ return MesWmReturnVendorStatusEnum.PREPARE.getStatus();
+ }
+ if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmResult)) {
+ return MesWmReturnVendorStatusEnum.CANCELED.getStatus();
+ }
+ return null;
+ }
+
+ private List<Map<String, Object>> getProcessDefinitionListByCategory(String categoryCode) {
+ List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(categoryCode);
+ if (CollUtil.isEmpty(definitionInfoList)) {
+ return Collections.emptyList();
+ }
+ // 杩囨护婵�娲荤姸鎬侊紝淇濈暀鏈�鏂扮増鏈�
+ Map<String, ProcessDefinition> latestVersionMap = new HashMap<>();
+ for (BpmProcessDefinitionInfoDO info : definitionInfoList) {
+ ProcessDefinition pd = bpmProcessDefinitionService.getProcessDefinition(info.getProcessDefinitionId());
+ if (pd == null || 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());
+ result.add(item);
+ }
+ return result;
+ }
+
+ private Long getCurrentUserId() {
+ Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+ if (authentication != null && authentication.getPrincipal() instanceof Long) {
+ return (Long) authentication.getPrincipal();
+ }
+ return 1L; // 榛樿鐢ㄦ埛
}
@Override
--
Gitblit v1.9.3