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/EamTechnicalStatusEvaluationApplicationServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationApplicationServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationApplicationServiceImpl.java
index c9c7b24..e87990b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationApplicationServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationApplicationServiceImpl.java
@@ -19,16 +19,12 @@
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.HfTemplateCategoryEnum;
import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationApplicationStatusEnum;
-import org.jeecg.modules.eam.entity.EamBaseHFCode;
-import org.jeecg.modules.eam.entity.EamEquipment;
-import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationApplication;
-import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderChange;
+import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationApplicationMapper;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationApplicationQuery;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationApplicationRequest;
-import org.jeecg.modules.eam.service.IEamBaseHFCodeService;
-import org.jeecg.modules.eam.service.IEamEquipmentService;
-import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationApplicationService;
+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;
@@ -77,6 +73,12 @@
private IFlowTaskService flowTaskService;
@Autowired
private ISysUserService sysUserService;
+ @Autowired
+ private IEamTechnicalStatusEvaluationStandardService evaluationStandardService;
+ @Autowired
+ private IEamTechnicalStatusEvaluationStandardDetailService evaluationStandardDetailService;
+ @Autowired
+ private IEamTechnicalStatusEvaluationOrderService evaluationOrderService;
@Override
public IPage<EamTechnicalStatusEvaluationApplication> queryPageList(Page<EamTechnicalStatusEvaluationApplication> page, EamTechnicalStatusEvaluationApplicationQuery query) {
@@ -151,6 +153,14 @@
if (equipment == null) {
throw new JeecgBootException("璁惧淇℃伅涓嶅瓨鍦紝鎿嶄綔澶辫触锛�");
}
+ EamTechnicalStatusEvaluationStandard standard = evaluationStandardService.queryEnableStandard(request.getEquipmentId());
+ if(standard == null) {
+ throw new JeecgBootException("璁惧鏈厤缃妧鏈姸鎬侀壌瀹氳鑼冿紝鎿嶄綔澶辫触锛�");
+ }
+ List<EamTechnicalStatusEvaluationStandardDetail> standardDetailList = evaluationStandardDetailService.queryList(standard.getId());
+ if(CollectionUtil.isEmpty(standardDetailList)) {
+ throw new JeecgBootException("璁惧鏈厤缃妧鏈姸鎬侀壌瀹氳鑼冿紝鎿嶄綔澶辫触锛�");
+ }
//鐢ㄦ埛鏁版嵁鏉冮檺
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (sysUser == null) {
@@ -185,6 +195,7 @@
throw new JeecgBootException("鍙湁寰呮彁浜ょ姸鎬佹墠鍙紪杈戯紒");
}
entity.setRemark(request.getRemark());
+ entity.setEvaluationDate(request.getEvaluationDate());
this.getBaseMapper().updateById(entity);
return true;
}
@@ -217,7 +228,7 @@
//鏇存柊瀹炰綋
this.getBaseMapper().updateById(entity);
//鍚姩娴佺▼
- flowCommonService.initActBusiness("宸ュ崟鍙�: " + entity.getApplicationOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";瀹夎浣嶇疆" + equipment.getInstallationPosition(),
+ flowCommonService.initActBusiness("宸ュ崟鍙�: " + entity.getApplicationOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode(),
entity.getId(), "IEamTechnicalStatusEvaluationApplicationService", "technical_status_evaluation_apply_process", null);
Map<String, Object> variables = new HashMap<>();
variables.put("dataId", entity.getId());
@@ -333,6 +344,7 @@
entity.setProductionHeaderSignatureTime(new Date());
entity.setProductionHeaderSignatureResult(request.getProductionHeaderSignatureResult());
entity.setProductionHeaderComment(request.getProductionHeaderComment());
+ values.put("productionHeaderConfirmFlag", request.getProductionHeaderSignatureResult());
if(BusinessCodeConst.APPROVED.equals(request.getProductionHeaderSignatureResult())) {
//閫氳繃
entity.setApplicationStatus(TechnicalStatusEvaluationApplicationStatusEnum.PRODUCTION_SUPPORT_SIGNING.name());
@@ -362,6 +374,20 @@
if(BusinessCodeConst.APPROVED.equals(request.getProductionSupportSignatureResult())) {
//閫氳繃
entity.setApplicationStatus(TechnicalStatusEvaluationApplicationStatusEnum.COMPLETED.name());
+ //鐢熸垚宸ュ崟
+ EamTechnicalStatusEvaluationStandard standard = evaluationStandardService.queryEnableStandard(request.getEquipmentId());
+ if(standard == null) {
+ throw new JeecgBootException("璁惧鏈厤缃妧鏈姸鎬侀壌瀹氳鑼冿紝鎿嶄綔澶辫触锛�");
+ }
+ EamTechnicalStatusEvaluationOrderRequest orderRequest = new EamTechnicalStatusEvaluationOrderRequest();
+ orderRequest.setEquipmentId(equipment.getId());
+ orderRequest.setEvaluationDate(entity.getEvaluationDate());
+ orderRequest.setStandardId(standard.getId());
+ orderRequest.setRemark(entity.getRemark());
+ boolean b = evaluationOrderService.addTechnicalStatusEvaluationOrder(orderRequest);
+ if(!b) {
+ throw new JeecgBootException("鐢熸垚鎶�鏈姸鎬侀壌瀹氬伐鍗曞け璐ワ紒");
+ }
}else {
//椹冲洖
entity.setApplicationStatus(TechnicalStatusEvaluationApplicationStatusEnum.REJECTED.name());
--
Gitblit v1.9.3