From 57df7097f99ffe16a4b81876f23aebf38b637ec5 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期二, 22 七月 2025 11:24:15 +0800 Subject: [PATCH] art: 技术状态变更申请-验收接口 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusChangeServiceImpl.java | 335 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 324 insertions(+), 11 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusChangeServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusChangeServiceImpl.java index 8638c38..59a3a62 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusChangeServiceImpl.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusChangeServiceImpl.java @@ -1,5 +1,7 @@ package org.jeecg.modules.eam.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -8,34 +10,46 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; +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.DateUtils; +import org.jeecg.common.util.TranslateDictTextUtils; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.eam.entity.EamTechnicalStatusChange; +import org.jeecg.modules.eam.constant.*; +import org.jeecg.modules.eam.entity.*; import org.jeecg.modules.eam.mapper.EamTechnicalStatusChangeMapper; import org.jeecg.modules.eam.request.EamTechnicalStatusChangeQuery; import org.jeecg.modules.eam.request.EamTechnicalStatusChangeRequest; -import org.jeecg.modules.eam.service.IEamTechnicalStatusChangeService; +import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderRequest; +import org.jeecg.modules.eam.service.*; 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.FlowCallBackServiceI; +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 java.util.List; -import java.util.Map; -import java.util.Set; +import java.time.LocalDate; +import java.util.*; import java.util.stream.Collectors; /** * @Description: 鎶�鏈姸鎬佸彉鏇寸敵璇� * @Author: jeecg-boot - * @Date: 2025-07-09 + * @Date: 2025-07-09 * @Version: V1.0 */ @Service("IEamTechnicalStatusChangeService") @@ -44,6 +58,33 @@ private IBaseFactoryUserService baseFactoryUserService; @Autowired private IBaseFactoryService baseFactoryService; + @Autowired + private ISysBusinessCodeRuleService businessCodeRuleService; + @Autowired + private IEamBaseHFCodeService hfCodeService; + @Autowired + private IEamTechnicalStatusChangeDetailService changeDetailService; + @Autowired + private IEamEquipmentService equipmentService; + @Autowired + private ISysUserService sysUserService; + @Autowired + private FlowCommonService flowCommonService; + @Autowired + private IFlowDefinitionService flowDefinitionService; + @Autowired + private IFlowMyBusinessService flowMyBusinessService; + @Autowired + private IFlowTaskService flowTaskService; + @Autowired + private TranslateDictTextUtils translateDictTextUtils; + @Autowired + private IEamEquipmentExtendService equipmentExtendService; + @Autowired + private IEamTechnicalStatusEvaluationStandardService evaluationStandardService; + @Autowired + private IEamTechnicalStatusEvaluationOrderService evaluationOrderService; + @Override public IPage<EamTechnicalStatusChange> queryPageList(Page<EamTechnicalStatusChange> page, EamTechnicalStatusChangeQuery query) { QueryWrapper<EamTechnicalStatusChange> queryWrapper = new QueryWrapper<>(); @@ -76,7 +117,7 @@ queryWrapper.between("designer_time", query.getDateBegin(), query.getDateEnd()); } //鐢宠鍗曚綅 - if(StringUtils.isNotBlank(query.getFactoryOrgCode())) { + if (StringUtils.isNotBlank(query.getFactoryOrgCode())) { queryWrapper.eq("factory_org_code", query.getFactoryOrgCode()); } //鎺掑簭 @@ -102,25 +143,297 @@ @Override @Transactional(rollbackFor = Exception.class) public boolean addEamTechnicalStatusChange(EamTechnicalStatusChangeRequest request) { - return false; + //鐢ㄦ埛鏁版嵁鏉冮檺 + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (sysUser == null) { + throw new JeecgBootException("鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅澶辫触锛�"); + } + EamTechnicalStatusChange order = new EamTechnicalStatusChange(); + order.setDesigner(sysUser.getUsername()); + order.setDesignerTime(new Date()); + order.setRemark(request.getRemark()); + order.setChangeStatus(TechnicalStatusChangeOrderStatusEnum.WAIT_SUBMIT.name()); + order.setFactoryOrgCode(request.getFactoryOrgCode()); + String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.TECHNICAL_STATUS_CHANGE_CODE_RULE); + order.setChangeOrderNum(codeSeq); + //鍒犻櫎鏍囪 + order.setDelFlag(CommonConstant.DEL_FLAG_0); + //鎶�鏈姸鎬佸彉鏇寸敵璇疯〃 + EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.TECHNICAL_STATUS_CHANGE.name()); + if (eamBaseHFCode == null) { + throw new JeecgBootException("鏈厤缃妧鏈姸鎬佸彉鏇寸殑HF缂栫爜锛屾坊鍔犲け璐ワ紒"); + } + order.setHfCode(eamBaseHFCode.getHfCode()); + this.getBaseMapper().insert(order); + //澶勭悊鏄庣粏鏁版嵁 + request.getTableDetailList().forEach(detail -> { + EamEquipment equipment = equipmentService.getById(detail.getEquipmentId()); + if (equipment == null) { + throw new JeecgBootException("璁惧[" + detail.getEquipmentCode() + "]涓嶅瓨鍦紒"); + } + detail.setId(null); + detail.setCreateBy(null); + detail.setCreateTime(null); + detail.setUpdateBy(null); + detail.setUpdateTime(null); + detail.setChangeOrderId(order.getId()); + }); + changeDetailService.saveBatch(request.getTableDetailList()); + return true; } @Override @Transactional(rollbackFor = Exception.class) public boolean editEamTechnicalStatusChange(EamTechnicalStatusChangeRequest request) { - return false; + EamTechnicalStatusChange entity = this.getBaseMapper().selectById(request.getId()); + if(entity == null) { + throw new JeecgBootException("瑕佺紪杈戠殑鏁版嵁涓嶅瓨鍦紒"); + } + if(!TechnicalStatusChangeOrderStatusEnum.WAIT_SUBMIT.name().equals(entity.getChangeStatus())) { + throw new JeecgBootException("鍙湁寰呮彁浜ょ殑鐘舵�佹墠鏀寔缂栬緫锛�"); + } + //鐢ㄦ埛鏁版嵁鏉冮檺 + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (sysUser == null) { + throw new JeecgBootException("鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅澶辫触锛�"); + } + entity.setRemark(request.getRemark()); + entity.setFactoryOrgCode(request.getFactoryOrgCode()); + this.getBaseMapper().updateById(entity); + //鍒犻櫎鍘熸潵鐨勮澶囨槑缁� + changeDetailService.removeByChangeId(entity.getId()); + //澶勭悊鏄庣粏鏁版嵁 + request.getTableDetailList().forEach(detail -> { + EamEquipment equipment = equipmentService.getById(detail.getEquipmentId()); + if (equipment == null) { + throw new JeecgBootException("璁惧[" + detail.getEquipmentCode() + "]涓嶅瓨鍦紒"); + } + detail.setId(null); + detail.setCreateBy(null); + detail.setCreateTime(null); + detail.setUpdateBy(null); + detail.setUpdateTime(null); + detail.setChangeOrderId(entity.getId()); + }); + changeDetailService.saveBatch(request.getTableDetailList()); + return true; } @Override @Transactional(rollbackFor = Exception.class) public boolean submit(String id) { - return false; + EamTechnicalStatusChange entity = this.getBaseMapper().selectById(id); + if (entity == null) { + throw new JeecgBootException("瑕佹彁浜ょ殑宸ュ崟涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒"); + } + if (!TechnicalStatusChangeOrderStatusEnum.WAIT_SUBMIT.name().equals(entity.getChangeStatus())) { + throw new JeecgBootException("璇ュ伐鍗曞凡杩涜杩囨彁浜わ紒"); + } + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if(sysUser == null || !sysUser.getUsername().equals(entity.getDesigner())) { + throw new JeecgBootException("涓嶆槸鏈汉锛屼笉鑳芥彁浜ゆ宸ュ崟锛�"); + } + entity.setChangeStatus(TechnicalStatusChangeOrderStatusEnum.DEPART_HEADER_SIGNING.name()); + //鏌ヨ涓嬬骇瀹℃壒浜哄憳 + List<UserSelector> userSelectors = sysUserService.selectOperatorList(null, entity.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); + //浣跨敤鍗曚綅缈昏瘧 + String factoryName = translateDictTextUtils.translateField("factory_org_code", entity.getFactoryOrgCode(), "eam_base_factory, factory_name, org_code"); + //鍚姩娴佺▼ + flowCommonService.initActBusiness("宸ュ崟鍙�: " + entity.getChangeOrderNum() + ";鐢宠鍗曚綅: " + factoryName, + entity.getId(), "IEamTechnicalStatusChangeService", "technical_status_change_process", null); + Map<String, Object> variables = new HashMap<>(); + variables.put("dataId", entity.getId()); + if (StrUtil.isEmpty(entity.getRemark())) { + variables.put("organization", "鏂板鎶�鏈姸鎬佸彉鏇撮粯璁ゅ惎鍔ㄦ祦绋�"); + variables.put("comment", "鏂板鎶�鏈姸鎬佸彉鏇撮粯璁ゅ惎鍔ㄦ祦绋�"); + } else { + variables.put("organization", entity.getRemark()); + variables.put("comment", entity.getRemark()); + } + variables.put("proofreading", true); + variables.put("NextAssignee", userApprovalList); + Result<?> result = flowDefinitionService.startProcessInstanceByKey("technical_status_change_process", variables); + if(result == null || !result.isSuccess()) { + throw new JeecgBootException("鍚姩娴佺▼澶辫触锛�"); + } + return true; } @Override @Transactional(rollbackFor = Exception.class) public EamTechnicalStatusChange approval(EamTechnicalStatusChangeRequest request) { - return null; + EamTechnicalStatusChange entity = this.getBaseMapper().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.setAssignee(user.getUsername()); + // 鑾峰彇娴佺▼涓氬姟璁板綍 + FlowMyBusiness flowMyBusiness = flowMyBusinessService.getFlowMyBusiness(request.getInstanceId(), request.getTaskId()); + if (flowMyBusiness == null) { + throw new JeecgBootException("娴佺▼瀹炰緥涓嶅瓨鍦紝璇峰埛鏂板悗閲嶈瘯锛�"); + } + + boolean userAuthorized = flowMyBusinessService.isUserAuthorized(flowMyBusiness, user); + if (!userAuthorized) { + throw new JeecgBootException("鐢ㄦ埛鏃犳潈鎿嶄綔姝や换鍔★紝璇峰埛鏂板悗閲嶈瘯锛�"); + } + // 璁ら浠诲姟 + if (!flowMyBusinessService.claimTask(flowMyBusiness.getTaskId(), user)) { + throw new JeecgBootException("浠诲姟涓嶅瓨鍦ㄣ�佸凡瀹屾垚鎴栧凡琚粬浜鸿棰嗭紒"); + } + + TechnicalStatusChangeOrderStatusEnum status = TechnicalStatusChangeOrderStatusEnum.getInstance(entity.getChangeStatus()); + if (status == null) { + return null; + } + //娴佺▼鍙橀噺 + Map<String, Object> values = new HashMap<>(); + List<String> userApprovalList; + List<UserSelector> userSelectors; + switch (status) { + case DEPART_HEADER_SIGNING: + userSelectors = sysUserService.selectOperatorList(null, entity.getFactoryOrgCode(), BusinessCodeConst.PCR0018); + if (CollectionUtil.isEmpty(userSelectors)) { + throw new JeecgBootException("璁惧鏈垎閰嶇粰浣跨敤鍗曚綅涓荤閮ㄧ骇棰嗗锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒"); + } + userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList()); + values.put("dataId", entity.getId()); + if(StringUtils.isBlank(request.getDepartHeaderComment())) { + values.put("organization", "鎶�鏈姸鎬佸彉鏇翠娇鐢ㄥ崟浣嶄富绠″绾ч瀵�"); + values.put("comment", "鎶�鏈姸鎬佸彉鏇翠娇鐢ㄥ崟浣嶄富绠″绾ч瀵�"); + request.setComment("鎶�鏈姸鎬佸彉鏇翠娇鐢ㄥ崟浣嶄富绠″绾ч瀵�"); + } else { + values.put("organization", request.getDepartHeaderComment()); + values.put("comment", request.getDepartHeaderComment()); + request.setComment(request.getDepartHeaderComment()); + } + + //璁剧疆entity + entity.setDepartHeaderSignature(user.getUsername()); + entity.setDepartHeaderSignatureTime(new Date()); + entity.setDepartHeaderComment(request.getDepartHeaderComment()); + entity.setDepartHeaderSignatureResult(request.getDepartHeaderSignatureResult()); + values.put("departHeaderConfirmFlag", request.getDepartHeaderSignatureResult()); + if(BusinessCodeConst.APPROVED.equals(request.getDepartHeaderSignatureResult())) { + //閫氳繃 + entity.setChangeStatus(TechnicalStatusChangeOrderStatusEnum.DEPART_LEADER_SIGNING.name()); + values.put("NextAssignee", userApprovalList); + }else { + //椹冲洖 + entity.setChangeStatus(TechnicalStatusChangeOrderStatusEnum.REJECTED.name()); + } + break; + case DEPART_LEADER_SIGNING: + //閮ㄩ棬棰嗗瀹℃牳 + values.put("dataId", entity.getId()); + if(StringUtils.isBlank(request.getDepartLeaderComment())) { + values.put("organization", "鎶�鏈姸鎬佸彉鏇撮儴绾ч瀵煎鏍�"); + values.put("comment", "鎶�鏈姸鎬佸彉鏇撮儴绾ч瀵煎鏍�"); + request.setComment("鎶�鏈姸鎬佸彉鏇撮儴绾ч瀵煎鏍�"); + } else { + values.put("organization", request.getDepartLeaderComment()); + values.put("comment", request.getDepartLeaderComment()); + request.setComment(request.getDepartLeaderComment()); + } + //璁剧疆entity + entity.setDepartLeaderSignature(user.getUsername()); + entity.setDepartLeaderSignatureTime(new Date()); + entity.setDepartLeaderSignatureResult(request.getDepartLeaderSignatureResult()); + entity.setDepartLeaderComment(request.getDepartLeaderComment()); + if(BusinessCodeConst.APPROVED.equals(request.getDepartLeaderSignatureResult())) { + //閫氳繃 + entity.setChangeStatus(TechnicalStatusEvaluationOrderChangeStatusEnum.COMPLETED.name()); + }else { + //椹冲洖 + entity.setChangeStatus(TechnicalStatusEvaluationOrderChangeStatusEnum.REJECTED.name()); + } + break; + } + request.setValues(values); + + // 瀹屾垚娴佺▼浠诲姟 + Result<?> result = flowTaskService.complete(request); + if (!result.isSuccess()) { + throw new JeecgBootException("瀹℃壒澶辫触锛岃鍒锋柊鏌ョ湅锛�"); + } + //淇濆瓨宸ュ崟 + this.getBaseMapper().updateById(entity); + return entity; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean acceptance(EamTechnicalStatusChangeDetail request) { + // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛 + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (user == null || StrUtil.isBlank(user.getId())) { + throw new JeecgBootException("鏈幏鍙栧埌鐧诲綍鐢ㄦ埛锛岃閲嶆柊鐧诲綍鍚庡啀璇曪紒"); + } + EamTechnicalStatusChange order = this.getBaseMapper().selectById(request.getChangeOrderId()); + if(order == null) { + throw new JeecgBootException("鍙樻洿宸ュ崟涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒"); + } + if(!TechnicalStatusChangeOrderStatusEnum.COMPLETED.name().equals(order.getChangeStatus())) { + throw new JeecgBootException("鍙樻洿宸ュ崟鏈畬鎴愶紝鏃犳硶鎻愪氦楠屾敹锛�"); + } + TechnicalStatusChangeReasonEnum instance = TechnicalStatusChangeReasonEnum.getInstance(request.getChangeCategory()); + if(instance == null) { + throw new JeecgBootException("鍙樻洿鍘熷洜鏃犳晥锛屾搷浣滃け璐ワ紒"); + } + EamEquipment equipment = equipmentService.getById(request.getEquipmentId()); + if(equipment == null) { + throw new JeecgBootException("璁惧淇℃伅涓嶅瓨鍦紝鎿嶄綔澶辫触锛�"); + } + EamEquipmentExtend extend = equipmentExtendService.getById(request.getEquipmentId()); + if(extend == null) { + throw new JeecgBootException("璁惧淇℃伅涓嶅瓨鍦紝鎿嶄綔澶辫触锛�"); + } + switch (instance) { + case EQUIPMENT_MAJOR: + case EQUIPMENT_RETROFITTING: + case OTHER: + //璁惧澶т慨銆佹敼閫犮�佸叾浠栫殑閫昏緫 + request.setAcceptanceChecker(user.getUsername()); + request.setAcceptanceCheckTime(new Date()); + changeDetailService.updateById(request); + //鏇存柊璁惧鎶�鏈壌瀹氱姸鎬� + equipmentExtendService.updateTechnologyParam(request.getEquipmentId(), request.getAcceptanceCheckResult(), DateUtils.localDateToDate(LocalDate.now()), null); + break; + case EQUIPMENT_RELOCATION: + //璁惧鎼縼閫昏緫 + request.setAcceptanceChecker(user.getUsername()); + request.setAcceptanceCheckTime(new Date()); + request.setAcceptanceCheckResult(null); + changeDetailService.updateById(request); + //鐢熸垚鎶�鏈姸鎬侀壌瀹氬伐鍗� + EamTechnicalStatusEvaluationStandard standard = evaluationStandardService.queryEnableStandard(request.getId()); + if (standard == null) { + throw new JeecgBootException("璁惧锛歿"+equipment.getEquipmentCode()+"}锛屾湭閰嶇疆鎶�鏈姸鎬侀壌瀹氳鑼冿紝鏃犳硶鐢熸垚鎶�鏈壌瀹氬伐鍗曪紒"); + } + EamTechnicalStatusEvaluationOrderRequest orderRequest = new EamTechnicalStatusEvaluationOrderRequest(); + orderRequest.setEquipmentId(extend.getId()); + orderRequest.setStandardId(standard.getId()); + orderRequest.setEvaluationDate(DateUtils.localDateToDate(LocalDate.now())); + orderRequest.setFreezeOrderDate(null); + orderRequest.setOrderExpirationDate(null); + orderRequest.setCreationMethod(OrderCreationMethodEnum.AUTO.name()); + evaluationOrderService.addTechnicalStatusEvaluationOrder(orderRequest); + //鏇存柊鎵╁睍琛ㄤ腑鐨勭敓鎴愭爣璇� + equipmentExtendService.updateTechnologyParam(equipment.getId(), null, null, CommonConstant.STATUS_1); + break; + } + return false; } @Override -- Gitblit v1.9.3