From e990e67920907f103ab7ec3a5a2f86d33f8e6bd2 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 22 五月 2025 10:28:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java | 178 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 133 insertions(+), 45 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java
index 1f075cc..494fba5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.service.impl;
import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,18 +10,19 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.flowable.engine.TaskService;
+import org.flowable.task.api.Task;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.constant.AssetStatusEnum;
-import org.jeecg.modules.eam.constant.EquipmentLeanOutStatusEnum;
+import org.jeecg.modules.eam.constant.*;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
import org.jeecg.modules.eam.mapper.EamEquipmentLeanOutMapper;
import org.jeecg.modules.eam.request.EamEquipmentLeanOutQuery;
+import org.jeecg.modules.eam.request.EamEquipmentLeanOutRequest;
import org.jeecg.modules.eam.service.IEamEquipmentLeanOutService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
@@ -229,6 +231,10 @@
variables.put("NextAssignee", usernames);
Result result = flowDefinitionService.startProcessInstanceByKey("equipment_lean_out", variables);
if (result != null) {
+ entity.setLeanStartTime(new Date());
+ entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_APPROVAL.name());
+ //淇濆瓨宸ュ崟
+ equipmentLeanOutMapper.updateById(entity);
return result.isSuccess();
}
return true;
@@ -236,41 +242,112 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public EamEquipmentLeanOut approval(EamEquipmentLeanOut eamEquipmentLeanOut) {
- try {
- // 妫�鏌ヨ姹傚弬鏁�
- if (!isValidRequest(eamEquipmentLeanOut)) {
- throw new JeecgBootException("闈炴硶鍙傛暟");
- }
- if (EquipmentLeanOutStatusEnum.WAIT_APPROVAL.name().equals(eamEquipmentLeanOut.getLeanStatus())) {
- eamEquipmentLeanOut.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_RETURN.name());
- // 寰呭綊杩�
- } else if (EquipmentLeanOutStatusEnum.WAIT_RETURN.name().equals(eamEquipmentLeanOut.getLeanStatus())) {
- // 寰呯‘璁�
- eamEquipmentLeanOut.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_CONFIRM.name());
- } else if (EquipmentLeanOutStatusEnum.WAIT_CONFIRM.name().equals(eamEquipmentLeanOut.getLeanStatus())) {
- // 宸插畬鎴�
- eamEquipmentLeanOut.setLeanStatus(EquipmentLeanOutStatusEnum.COMPLETE.name());
- }
- // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
- LoginUser sysUser = getCurrentUser();
- if (sysUser == null || StrUtil.isBlank(sysUser.getId())) {
- throw new JeecgBootException("璐﹀彿涓嶅瓨鍦�");
- }
- // 瀹℃壒浜�
- eamEquipmentLeanOut.setApprovalUser(sysUser.getUsername());
- //妫�鏌ヨ澶�
- EamEquipment equipment = eamEquipmentService.getById(eamEquipmentLeanOut.getEquipmentId());
- if (equipment == null) {
- throw new JeecgBootException("璁惧涓嶅瓨鍦紒");
- }
- eamEquipmentLeanOut.setLeanPerson(sysUser.getUsername());
- this.updateById(eamEquipmentLeanOut);
- // 鑾峰彇娴佺▼涓氬姟璁板綍
- return eamEquipmentLeanOut;
- } catch (Exception e) {
- throw new JeecgBootException("鎿嶄綔澶辫触锛�" + e.getMessage());
+ public EamEquipmentLeanOut approval(EamEquipmentLeanOutRequest request) {
+ EamEquipmentLeanOut entity = equipmentLeanOutMapper.selectById(request.getId());
+ if (entity == null) {
+ throw new JeecgBootException("瀹℃壒鐨勬暟鎹凡鍒犻櫎锛岃鍒锋柊閲嶈瘯锛�");
}
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (user == null || StrUtil.isBlank(user.getId())) {
+ throw new JeecgBootException("鏈幏鍙栧埌鐧诲綍鐢ㄦ埛锛岃閲嶆柊鐧诲綍鍚庡啀璇曪紒");
+ }
+ request.setApprovalUser(user.getUsername());
+ // 鑾峰彇娴佺▼涓氬姟璁板綍
+ FlowMyBusiness flowMyBusiness = flowMyBusinessService.getFlowMyBusiness(request.getInstanceId());
+ if (flowMyBusiness == null) {
+ throw new JeecgBootException("娴佺▼瀹炰緥涓嶅瓨鍦紝璇峰埛鏂板悗閲嶈瘯锛�");
+ }
+
+ boolean userAuthorized = isUserAuthorized(flowMyBusiness, user);
+ if (!userAuthorized) {
+ throw new JeecgBootException("鐢ㄦ埛鏃犳潈鎿嶄綔姝や换鍔★紝璇峰埛鏂板悗閲嶈瘯锛�");
+ }
+ // 璁ら浠诲姟
+ if (!claimTask(flowMyBusiness.getTaskId(), user)) {
+ throw new JeecgBootException("浠诲姟涓嶅瓨鍦ㄣ�佸凡瀹屾垚鎴栧凡琚粬浜鸿棰嗭紒");
+ }
+
+ EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紝璇锋鏌ワ紒");
+ }
+
+ EquipmentLeanOutStatusEnum status = EquipmentLeanOutStatusEnum.getInstance(entity.getLeanStatus());
+ if (status == null) {
+ return null;
+ }
+ //娴佺▼鍙橀噺
+ Map<String, Object> values = new HashMap<>();
+ switch (status) {
+ // 瀹℃壒
+ case WAIT_APPROVAL:
+ //鎵ц瀹屾垚
+ values.put("dataId", entity.getId());
+ values.put("organization", request.getApprovalComment());
+ values.put("comment", request.getApprovalComment());
+ values.put("approvalDealType", request.getApprovalDealType());
+ request.setComment(request.getApprovalComment());
+ entity.setApprovalUser(user.getUsername());// 瀹℃牳浜�
+ entity.setApprovalComment(request.getApprovalComment());// 瀹℃牳鎰忚
+ entity.setApprovalTime(new Date());// 瀹℃牳鏃堕棿
+ entity.setApprovalDealType(request.getApprovalDealType()); // 瀹℃壒绫诲瀷
+ // 楠岃瘉閫氳繃杩樻槸椹冲洖
+ if (request.getApprovalDealType().equals("1")) {
+ //璁剧疆entity
+ entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_RETURN.name());
+ List<String> userApprovalList = new ArrayList<>(Collections.singletonList(entity.getLeanPerson()));
+ values.put("NextAssignee", userApprovalList);
+ } else {
+ //璁剧疆entity
+ entity.setLeanStatus(EquipmentLeanOutStatusEnum.COMPLETE.name());
+ }
+ break;
+ // 褰掕繕
+ case WAIT_RETURN:
+ if (StringUtils.isBlank(equipment.getEquipmentManager())) {
+ throw new JeecgBootException("璁惧鏈垎閰嶈澶囩鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+ }
+ List<String> userApprovalList = new ArrayList<>(Collections.singletonList(entity.getLeanPerson()));
+ userApprovalList.add(equipment.getEquipmentManager());
+ values.put("dataId", entity.getId());
+ values.put("organization", request.getReturnComment());
+ values.put("comment", request.getReturnComment());
+ values.put("NextAssignee", userApprovalList);
+ request.setComment(request.getReturnComment());
+ entity.setLeanEndTime(new Date()); //褰掕繕鏃堕棿
+ //璁剧疆entity
+ entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_CONFIRM.name());
+ entity.setApprovalUser(user.getUsername());// 瀹℃牳浜�
+ entity.setLeanEndTime(new Date());// 褰掕繕鏃堕棿
+ entity.setReturnComment(request.getReturnComment());// 褰掕繕澶囨敞
+ break;
+ // 褰掕繕纭
+ case WAIT_CONFIRM:
+ values.put("dataId", entity.getId());
+ values.put("organization", request.getConfirmComment());
+ values.put("comment", request.getConfirmComment());
+ request.setComment(request.getConfirmComment());
+ //璁剧疆entity
+ entity.setLeanStatus(EquipmentLeanOutStatusEnum.COMPLETE.name());
+ entity.setConfirmUser(user.getUsername());
+ entity.setConfirmComment(request.getConfirmComment());
+ entity.setConfirmTime(new Date());
+ // 淇敼璁惧鐘舵��
+ equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
+ eamEquipmentService.updateById(equipment);
+ break;
+ }
+ request.setValues(values);
+
+ // 瀹屾垚娴佺▼浠诲姟
+ Result result = flowTaskService.complete(request);
+ if (!result.isSuccess()) {
+ throw new JeecgBootException("瀹℃壒澶辫触锛岃鍒锋柊鏌ョ湅锛�");
+ }
+ //淇濆瓨宸ュ崟
+ equipmentLeanOutMapper.updateById(entity);
+ return entity;
}
@@ -281,17 +358,28 @@
business.getActStatus();
}
-
- private boolean isValidRequest(EamEquipmentLeanOut request) {
- return StrUtil.isNotBlank(request.getCode()) && StrUtil.isNotBlank(request.getEquipmentId());
+ private boolean claimTask(String taskId, LoginUser user) {
+ Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+ if (task == null) {
+ return false;
+ }
+ if (task.getAssignee() != null && !task.getAssignee().equals(user.getUsername())) {
+ return false;
+ }
+ taskService.claim(taskId, user.getUsername());
+ return true;
}
- private LoginUser getCurrentUser() {
- try {
- return (LoginUser) SecurityUtils.getSubject().getPrincipal();
- } catch (Exception e) {
- return null;
- }
+ /**
+ * 鍒ゆ柇鐢ㄦ埛鏄惁鎷ユ湁姝ゆ潈闄�
+ *
+ * @param flowMyBusiness
+ * @param user
+ * @return
+ */
+ private boolean isUserAuthorized(FlowMyBusiness flowMyBusiness, LoginUser user) {
+ List<String> todoUsers = JSON.parseArray(flowMyBusiness.getTodoUsers(), String.class);
+ return todoUsers != null && todoUsers.contains(user.getUsername());
}
@Override
--
Gitblit v1.9.3