From 63c9ec27a1f717cff8b36ad7db23d56e41dfae8f Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 22 七月 2025 20:01:56 +0800
Subject: [PATCH] art: 技术状态鉴定申请-Bug修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceChangeServiceImpl.java | 329 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 329 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceChangeServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceChangeServiceImpl.java
index 11c5a5e..f70581a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceChangeServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceChangeServiceImpl.java
@@ -1,10 +1,56 @@
package org.jeecg.modules.eam.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.TranslateDictTextUtils;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.constant.*;
+import org.jeecg.modules.eam.entity.EamBaseHFCode;
+import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceChange;
+import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder;
import org.jeecg.modules.eam.mapper.EamThirdMaintenanceChangeMapper;
+import org.jeecg.modules.eam.request.EamThirdMaintenanceChangeQuery;
+import org.jeecg.modules.eam.request.EamThirdMaintenanceChangeRequest;
+import org.jeecg.modules.eam.service.IEamBaseHFCodeService;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamThirdMaintenanceChangeService;
+import org.jeecg.modules.eam.service.IEamThirdMaintenanceOrderService;
+import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
+import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
+import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
+import org.jeecg.modules.flowable.service.IFlowDefinitionService;
+import org.jeecg.modules.flowable.service.IFlowTaskService;
+import org.jeecg.modules.system.entity.BaseFactory;
+import org.jeecg.modules.system.entity.BaseFactoryUser;
+import org.jeecg.modules.system.service.IBaseFactoryService;
+import org.jeecg.modules.system.service.IBaseFactoryUserService;
+import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.vo.UserSelector;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* @Description: 涓変繚鍙樻洿
@@ -15,4 +61,287 @@
@Service
public class EamThirdMaintenanceChangeServiceImpl extends ServiceImpl<EamThirdMaintenanceChangeMapper, EamThirdMaintenanceChange> implements IEamThirdMaintenanceChangeService {
+ @Resource
+ private EamThirdMaintenanceChangeMapper eamThirdMaintenanceChangeMapper;
+ @Resource
+ private IBaseFactoryUserService baseFactoryUserService;
+ @Resource
+ private IBaseFactoryService baseFactoryService;
+ @Resource
+ private IEamThirdMaintenanceOrderService thirdMaintenanceOrderService;
+ @Resource
+ private IEamEquipmentService equipmentService;
+ @Resource
+ private ISysBusinessCodeRuleService businessCodeRuleService;
+ @Resource
+ private IEamBaseHFCodeService hfCodeService;
+ @Resource
+ private ISysUserService sysUserService;
+ @Resource
+ private FlowCommonService flowCommonService;
+ @Resource
+ private TranslateDictTextUtils translateDictTextUtils;
+ @Resource
+ private IFlowDefinitionService flowDefinitionService;
+ @Resource
+ private IFlowMyBusinessService flowMyBusinessService;
+ @Resource
+ private TaskService taskService;
+ @Resource
+ private IEamEquipmentService eamEquipmentService;
+ @Resource
+ private IFlowTaskService flowTaskService;
+
+ @Override
+ public IPage<EamThirdMaintenanceChange> queryPageList(Page<EamThirdMaintenanceChange> page, EamThirdMaintenanceChangeQuery query) {
+ QueryWrapper<EamThirdMaintenanceChange> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("tmc.del_flag", CommonConstant.DEL_FLAG_0);
+ //鐢ㄦ埛鏁版嵁鏉冮檺
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ return page;
+ }
+ if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
+ //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
+ List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
+ queryWrapper.in("e.equipment_code", equipArr);
+ } else {
+ //娌℃湁閫夋嫨璁惧锛屾牴鎹腑蹇冭繃婊よ澶�
+ List<BaseFactoryUser> baseFactoryUserList = baseFactoryUserService.
+ list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId, sysUser.getId()));
+ if (!CollectionUtils.isEmpty(baseFactoryUserList)) {
+ Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet());
+ Set<String> factoryCode = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
+ queryWrapper.in("e.factory_org_code", factoryCode);
+ } else {
+ return page;
+ }
+ }
+ //鏌ヨ鏉′欢杩囨护
+ if (query != null) {
+ if (StringUtils.isNotBlank(query.getEquipmentId())) {
+ queryWrapper.eq("tmc.equipment_id", query.getEquipmentId());
+ }
+ if (StringUtils.isNotBlank(query.getChangeOrderNum())) {
+ queryWrapper.like("tmc.order_num", query.getChangeOrderNum());
+ }
+ if (StringUtils.isNotBlank(query.getChangeStatus())) {
+ queryWrapper.eq("tmc.change_status", query.getChangeStatus());
+ }
+ if (query.getApplyDateBegin() != null && query.getApplyDateEnd() != null) {
+ queryWrapper.between("tmc.apply_date", query.getApplyDateBegin(), query.getApplyDateEnd());
+ }
+ //鎺掑簭
+ if (StringUtils.isNotBlank(query.getColumn()) && StringUtils.isNotBlank(query.getOrder())) {
+ String column = query.getColumn();
+ if (column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
+ column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
+ }
+ if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(query.getOrder())) {
+ queryWrapper.orderByAsc("tmc." + oConvertUtils.camelToUnderline(column));
+ } else {
+ queryWrapper.orderByDesc("tmc." + oConvertUtils.camelToUnderline(column));
+ }
+ } else {
+ queryWrapper.orderByDesc("tmc.create_time");
+ }
+ } else {
+ queryWrapper.orderByDesc("tmc.create_time");
+ }
+ return eamThirdMaintenanceChangeMapper.queryPageList(page, queryWrapper);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean saveThirdMaintenanceChange(EamThirdMaintenanceChange request) {
+ //鏌ヨ宸ュ崟
+ EamThirdMaintenanceOrder order = thirdMaintenanceOrderService.getById(request.getOrderId());
+ if (order == null) {
+ throw new JeecgBootException("涓変繚宸ュ崟涓嶅瓨鍦紝鎿嶄綔澶辫触锛�");
+ }
+ //鏌ヨ璁惧
+ EamEquipment equipment = equipmentService.getById(order.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧淇℃伅涓嶅瓨鍦紝鎿嶄綔澶辫触锛�");
+ }
+ //鐢ㄦ埛鏁版嵁鏉冮檺
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ throw new JeecgBootException("鐧诲綍鐢ㄦ埛淇℃伅涓虹┖锛屾搷浣滃け璐ワ紒");
+ }
+ String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.THIRD_MAINTENANCE_CHANGE_CODE_RULE);
+ request.setChangeOrderNum(codeSeq);
+ request.setId(null);
+ request.setChangeStatus(ThirdMaintenanceChangeStatusEnum.WAIT_SUBMIT.name());
+ request.setDelFlag(CommonConstant.DEL_FLAG_0);
+ request.setApplicant(sysUser.getUsername());
+ request.setApplyDate(new Date());
+ request.setFactoryOrgCode(equipment.getFactoryOrgCode());
+ // 涓変繚鍙樻洿宸ュ崟HF
+ EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.THIRD_MAINTENANCE_CHANGE.name());
+ if (eamBaseHFCode == null) {
+ throw new JeecgBootException("鏈厤缃妧鏈姸鎬侀壌瀹氬彉鏇寸殑HF缂栫爜锛屾坊鍔犲け璐ワ紒");
+ }
+ request.setHfCode(eamBaseHFCode.getHfCode());
+ this.getBaseMapper().insert(request);
+ boolean b = thirdMaintenanceOrderService.updateMaintenanceStatus(request.getOrderId(), ThirdMaintenanceStatusEnum.CHANGE.name());
+ if (!b) {
+ throw new JeecgBootException("涓変繚宸ュ崟鐘舵�佸彉鏇村け璐ワ紝鏃犳硶鍙樻洿锛�");
+ }
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean editThirdMaintenanceChange(EamThirdMaintenanceChange request) {
+ EamThirdMaintenanceChange entity = this.getBaseMapper().selectById(request);
+ if(entity == null) {
+ throw new JeecgBootException("缂栬緫鐨勬暟鎹凡鍒犻櫎锛岃鍒锋柊閲嶈瘯锛�");
+ }
+ if(!ThirdMaintenanceChangeStatusEnum.WAIT_SUBMIT.name().equals(entity.getChangeStatus())) {
+ throw new JeecgBootException("鍙湁寰呮彁浜ょ姸鎬佹墠鍙紪杈戯紒");
+ }
+ entity.setApplyReasonType(request.getApplyReasonType());
+ entity.setApplyReason(request.getApplyReason());
+ this.getBaseMapper().updateById(entity);
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean submit(String id) {
+ EamThirdMaintenanceChange entity = this.getBaseMapper().selectById(id);
+ if (entity == null) {
+ throw new JeecgBootException("瑕佹彁浜ょ殑宸ュ崟涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
+ }
+ if (!ThirdMaintenanceChangeStatusEnum.WAIT_SUBMIT.name().equals(entity.getChangeStatus())) {
+ throw new JeecgBootException("璇ュ伐鍗曞凡杩涜杩囨彁浜わ紒");
+ }
+ EamThirdMaintenanceOrder order = thirdMaintenanceOrderService.getById(entity.getOrderId());
+ if(order == null) {
+ throw new JeecgBootException("瑕佸彉鏇寸殑涓変繚宸ュ崟涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
+ }
+ EamEquipment equipment = equipmentService.getById(order.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紝鎻愪氦澶辫触锛�");
+ }
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if(sysUser == null || !sysUser.getUsername().equals(entity.getApplicant())) {
+ throw new JeecgBootException("涓嶆槸鏈汉锛屼笉鑳芥彁浜ゆ宸ュ崟锛�");
+ }
+ entity.setChangeStatus(ThirdMaintenanceChangeStatusEnum.EQUIPMENT_MANAGER_SIGNING.name());
+ //鏌ヨ涓嬬骇瀹℃壒浜哄憳
+ List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0011);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈垎閰嶇粰浣跨敤鍗曚綅涓荤瀹ょ骇棰嗗锛屾棤娉曟彁浜わ紒");
+ }
+ List<String> userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ //鏇存柊瀹炰綋
+ this.getBaseMapper().updateById(entity);
+ //鍚姩娴佺▼
+ flowCommonService.initActBusiness("宸ュ崟鍙�: " + entity.getChangeOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode(),
+ entity.getId(), "IEamThirdMaintenanceChangeService", "third_maintenance_change", null);
+ Map<String, Object> variables = new HashMap<>();
+ variables.put("dataId", entity.getId());
+ String applyReasonTypeText = translateDictTextUtils.translateField("applyReasonType", entity.getApplyReasonType(), "third_maintenance_change_reason");
+ if (StrUtil.isEmpty(applyReasonTypeText)) {
+ variables.put("organization", "鏂板涓変繚宸ュ崟鍙樻洿榛樿鍚姩娴佺▼");
+ variables.put("comment", "鏂板涓変繚宸ュ崟鍙樻洿榛樿鍚姩娴佺▼");
+ } else {
+ variables.put("organization", applyReasonTypeText);
+ variables.put("comment", applyReasonTypeText);
+ }
+ Result<?> result = flowDefinitionService.startProcessInstanceByKey("third_maintenance_change", variables);
+ if(result == null || !result.isSuccess()) {
+ throw new JeecgBootException("鍚姩娴佺▼澶辫触锛�");
+ }
+ //鏇存柊宸ュ崟鐘舵�佷负鍙樻洿涓�
+ order.setMaintenanceStatus(ThirdMaintenanceStatusEnum.CHANGE.name());
+ boolean b = thirdMaintenanceOrderService.updateById(order);
+ if(!b) {
+ throw new JeecgBootException("涓変繚宸ュ崟鐘舵�佹洿鏂板け璐ワ紒");
+ }
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public EamThirdMaintenanceChange approval(EamThirdMaintenanceChangeRequest request) {
+ EamThirdMaintenanceChange entity = this.getBaseMapper().selectById(request.getId());
+ if (entity == null) {
+ throw new JeecgBootException("瀹℃壒鐨勬暟鎹凡鍒犻櫎锛岃鍒锋柊閲嶈瘯锛�");
+ }
+ EamThirdMaintenanceOrder order = thirdMaintenanceOrderService.getById(entity.getOrderId());
+ if(order == null) {
+ throw new JeecgBootException("瑕佸彉鏇寸殑涓変繚宸ュ崟涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
+ }
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (user == null || StrUtil.isBlank(user.getId())) {
+ throw new JeecgBootException("鏈幏鍙栧埌鐧诲綍鐢ㄦ埛锛岃閲嶆柊鐧诲綍鍚庡啀璇曪紒");
+ }
+ request.setAssignee(user.getUsername());
+ // 鑾峰彇娴佺▼涓氬姟璁板綍
+ FlowMyBusiness flowMyBusiness = flowMyBusinessService.getFlowMyBusiness(request.getInstanceId(), request.getTaskId());
+ if (flowMyBusiness == null) {
+ throw new JeecgBootException("娴佺▼瀹炰緥涓嶅瓨鍦紝璇峰埛鏂板悗閲嶈瘯锛�");
+ }
+
+ if (!isUserAuthorized(flowMyBusiness, user)) {
+ throw new JeecgBootException("鐢ㄦ埛鏃犳潈鎿嶄綔姝や换鍔★紝璇峰埛鏂板悗閲嶈瘯锛�");
+ }
+ // 璁ら浠诲姟
+ if (!claimTask(flowMyBusiness.getTaskId(), user)) {
+ throw new JeecgBootException("浠诲姟涓嶅瓨鍦ㄣ�佸凡瀹屾垚鎴栧凡琚粬浜鸿棰嗭紒");
+ }
+ EamEquipment equipment = eamEquipmentService.getById(order.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紝璇锋鏌ワ紒");
+ }
+
+ // 璁剧疆娴佺▼鍙橀噺
+ setupProcessVariables(request, order, user, equipment);
+
+ // 瀹屾垚娴佺▼浠诲姟
+ Result result = flowTaskService.complete(request);
+
+ // 鏍规嵁浠诲姟瀹屾垚缁撴灉鏇存柊宸ュ崟鐘舵��
+ updateOrderStatus(result, request, order, user);
+
+ //鏇存柊宸ュ崟淇℃伅
+ this.getBaseMapper().updateById(entity);
+ return entity;
+ }
+
+ /**
+ * 璁剧疆娴佺▼鍙橀噺
+ */
+ private void setupProcessVariables(EamThirdMaintenanceChangeRequest request, EamThirdMaintenanceOrder order, LoginUser user, EamEquipment equipment) {
+
+ }
+
+ /**
+ * 鏇存柊宸ュ崟鐘舵��
+ */
+ private void updateOrderStatus(Result result, EamThirdMaintenanceChangeRequest request, EamThirdMaintenanceOrder order, LoginUser user) {
+
+ }
+
+ private boolean isUserAuthorized(FlowMyBusiness flowMyBusiness, LoginUser user) {
+ List<String> todoUsers = JSON.parseArray(flowMyBusiness.getTodoUsers(), String.class);
+ return todoUsers != null && todoUsers.contains(user.getUsername());
+ }
+
+ 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;
+ }
+
}
--
Gitblit v1.9.3