From 457fa2cb4cc7c78f1caace6ef34207ff785144f9 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 17 七月 2025 17:14:00 +0800
Subject: [PATCH] art: 技术状态鉴定申请-工单生成
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java | 57 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 12 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java
index 8bb7a21..f6932c1 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java
@@ -22,7 +22,7 @@
import org.jeecg.common.util.SimpleVersionGenerateUtil;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationCheckCategoryEnum;
-import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationStandardEnum;
+import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationStandardStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationStandard;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationStandardDetail;
@@ -105,9 +105,16 @@
queryWrapper.eq("ems.equipment_id", query.getEquipmentId());
}
- //淇濆吇鍒嗙被
+ //瑙勮寖鐘舵��
if (StringUtils.isNotBlank(query.getStandardStatus())) {
queryWrapper.eq("ems.standard_status", query.getStandardStatus());
+ }
+
+ //璁惧缂栫爜
+ if (StringUtils.isNotBlank(query.getKeyword())) {
+ queryWrapper.and(wrapper -> wrapper.like("e.equipment_name", query.getKeyword())
+ .or()
+ .like("e.equipment_code", query.getKeyword()));
}
}
queryWrapper.orderByDesc("ems.create_time");
@@ -123,7 +130,7 @@
}
EamTechnicalStatusEvaluationStandard entity = new EamTechnicalStatusEvaluationStandard();
BeanUtils.copyProperties(request, entity);
- entity.setStandardStatus(TechnicalStatusEvaluationStandardEnum.WAIT_SUBMIT.name());
+ entity.setStandardStatus(TechnicalStatusEvaluationStandardStatusEnum.WAIT_SUBMIT.name());
//鐗堟湰閫掑
entity.setStandardVersion(SimpleVersionGenerateUtil.getInitVersion());
//璁惧澶勭悊
@@ -176,7 +183,7 @@
queryWrapper.eq(EamTechnicalStatusEvaluationStandard::getEquipmentId, equipmentId);
queryWrapper.eq(EamTechnicalStatusEvaluationStandard::getDelFlag, CommonConstant.DEL_FLAG_0);
//寰呮彁浜ゃ�佸惎鐢ㄧ姸鎬�
- queryWrapper.in(EamTechnicalStatusEvaluationStandard::getStandardStatus, Arrays.asList(TechnicalStatusEvaluationStandardEnum.ENABLE.name(), TechnicalStatusEvaluationStandardEnum.WAIT_SUBMIT.name()));
+ queryWrapper.in(EamTechnicalStatusEvaluationStandard::getStandardStatus, Arrays.asList(TechnicalStatusEvaluationStandardStatusEnum.ENABLE.name(), TechnicalStatusEvaluationStandardStatusEnum.WAIT_SUBMIT.name()));
queryWrapper.orderByDesc(EamTechnicalStatusEvaluationStandard::getStandardVersion);
if (StringUtils.isNotBlank(id)) {
queryWrapper.ne(EamTechnicalStatusEvaluationStandard::getId, id);
@@ -259,7 +266,7 @@
newEntity.setStandardCode(request.getStandardCode());
newEntity.setStandardName(request.getStandardName());
newEntity.setEvaluationPeriod(request.getEvaluationPeriod());
- newEntity.setStandardStatus(TechnicalStatusEvaluationStandardEnum.ENABLE.name());
+ newEntity.setStandardStatus(TechnicalStatusEvaluationStandardStatusEnum.ENABLE.name());
//鐗堟湰閫掑
newEntity.setStandardVersion(SimpleVersionGenerateUtil.addVersion(entity.getStandardVersion()));
//璁惧澶勭悊
@@ -313,7 +320,7 @@
}
}
//绂佺敤鍘熸潵鐨勭増鏈�
- entity.setStandardStatus(TechnicalStatusEvaluationStandardEnum.DISABLE.name());
+ entity.setStandardStatus(TechnicalStatusEvaluationStandardStatusEnum.DISABLE.name());
this.getBaseMapper().updateById(entity);
return true;
}
@@ -348,7 +355,7 @@
EamEquipment equipment = extractEquipmentInfo(tables.get(0));
//鏌ョ湅鏄惁鏈夋璁惧鍚敤鐨勮鑼冧俊鎭�
EamTechnicalStatusEvaluationStandard originalStandard = checkDuplicate(equipment.getId(), null);
- if (originalStandard != null && TechnicalStatusEvaluationStandardEnum.ENABLE.name().equals(originalStandard.getStandardStatus())) {
+ if (originalStandard != null && TechnicalStatusEvaluationStandardStatusEnum.ENABLE.name().equals(originalStandard.getStandardStatus())) {
return Result.error(fileName + ":姝よ澶囧凡瀛樺湪鍚敤鐨勮鑼冿紝璇疯繘琛岀紪杈戞垨鍗囩増锛�");
}
//鑾峰彇妫�鏌ラ」淇℃伅
@@ -359,7 +366,7 @@
if(originalStandard != null) {
//宸插瓨鍦ㄦ妧鏈姸鎬侀壌瀹氳鑼�,涓旇鑼冪姸鎬佷负宸叉彁浜�
originalStandard.setHasSafetyEquipmentCheck(CommonConstant.STATUS_1);
- originalStandard.setStandardStatus(TechnicalStatusEvaluationStandardEnum.WAIT_SUBMIT.name());
+ originalStandard.setStandardStatus(TechnicalStatusEvaluationStandardStatusEnum.WAIT_SUBMIT.name());
super.getBaseMapper().updateById(originalStandard);
detailList.forEach(standardDetail -> {
standardDetail.setStandardId(originalStandard.getId());
@@ -422,7 +429,7 @@
EamEquipment equipment = extractEquipmentInfo(tables.get(0));
//鏌ョ湅鏄惁鏈夋璁惧鍚敤鐨勮鑼冧俊鎭�
EamTechnicalStatusEvaluationStandard originalStandard = checkDuplicate(equipment.getId(), null);
- if (originalStandard != null && TechnicalStatusEvaluationStandardEnum.ENABLE.name().equals(originalStandard.getStandardStatus())) {
+ if (originalStandard != null && TechnicalStatusEvaluationStandardStatusEnum.ENABLE.name().equals(originalStandard.getStandardStatus())) {
return Result.error(fileName + ":姝よ澶囧凡瀛樺湪鍚敤鐨勮鑼冿紝璇疯繘琛岀紪杈戞垨鍗囩増锛�");
}
//鑾峰彇妫�鏌ラ」淇℃伅
@@ -433,7 +440,7 @@
if(originalStandard != null) {
//宸插瓨鍦ㄦ妧鏈姸鎬侀壌瀹氳鑼�,涓旇鑼冪姸鎬佷负宸叉彁浜�
originalStandard.setHasPrecisionCheck(CommonConstant.STATUS_1);
- originalStandard.setStandardStatus(TechnicalStatusEvaluationStandardEnum.WAIT_SUBMIT.name());
+ originalStandard.setStandardStatus(TechnicalStatusEvaluationStandardStatusEnum.WAIT_SUBMIT.name());
super.getBaseMapper().updateById(originalStandard);
detailList.forEach(standardDetail -> {
standardDetail.setStandardId(originalStandard.getId());
@@ -496,7 +503,7 @@
EamEquipment equipment = extractEquipmentInfo(tables.get(0));
//鏌ョ湅鏄惁鏈夋璁惧鍚敤鐨勮鑼冧俊鎭�
EamTechnicalStatusEvaluationStandard originalStandard = checkDuplicate(equipment.getId(), null);
- if (originalStandard != null && TechnicalStatusEvaluationStandardEnum.ENABLE.name().equals(originalStandard.getStandardStatus())) {
+ if (originalStandard != null && TechnicalStatusEvaluationStandardStatusEnum.ENABLE.name().equals(originalStandard.getStandardStatus())) {
return Result.error(fileName + ":姝よ澶囧凡瀛樺湪鍚敤鐨勮鑼冿紝璇疯繘琛岀紪杈戞垨鍗囩増锛�");
}
//鑾峰彇妫�鏌ラ」淇℃伅
@@ -507,7 +514,7 @@
if(originalStandard != null) {
//宸插瓨鍦ㄦ妧鏈姸鎬侀壌瀹氳鑼�,涓旇鑼冪姸鎬佷负宸叉彁浜�
originalStandard.setHasOtherCheck(CommonConstant.STATUS_1);
- originalStandard.setStandardStatus(TechnicalStatusEvaluationStandardEnum.WAIT_SUBMIT.name());
+ originalStandard.setStandardStatus(TechnicalStatusEvaluationStandardStatusEnum.WAIT_SUBMIT.name());
super.getBaseMapper().updateById(originalStandard);
detailList.forEach(standardDetail -> {
standardDetail.setStandardId(originalStandard.getId());
@@ -540,6 +547,32 @@
return Result.OK(fileName + ":瀵煎叆鎴愬姛锛�");
}
+ @Override
+ public List<EamTechnicalStatusEvaluationStandard> queryListByKeyword(String keyword, String equipmentId, Integer pageSize) {
+ Page<EamTechnicalStatusEvaluationStandard> page = new Page<>(1, pageSize);
+ EamTechnicalStatusEvaluationStandard query = new EamTechnicalStatusEvaluationStandard();
+ query.setEquipmentId(equipmentId);
+ query.setKeyword(keyword);
+ query.setStandardStatus(TechnicalStatusEvaluationStandardStatusEnum.ENABLE.name());
+ IPage<EamTechnicalStatusEvaluationStandard> pageData = this.queryPageList(page, query);
+ return pageData.getRecords();
+ }
+
+ @Override
+ public EamTechnicalStatusEvaluationStandard queryEnableStandard(String equipmentId) {
+ LambdaQueryWrapper<EamTechnicalStatusEvaluationStandard> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamTechnicalStatusEvaluationStandard::getEquipmentId, equipmentId);
+ queryWrapper.eq(EamTechnicalStatusEvaluationStandard::getDelFlag, CommonConstant.DEL_FLAG_0);
+ //鍚敤鐘舵��
+ queryWrapper.eq(EamTechnicalStatusEvaluationStandard::getStandardStatus, TechnicalStatusEvaluationStandardStatusEnum.ENABLE.name());
+ queryWrapper.orderByDesc(EamTechnicalStatusEvaluationStandard::getStandardVersion);
+ List<EamTechnicalStatusEvaluationStandard> list = this.getBaseMapper().selectList(queryWrapper);
+ if (CollectionUtil.isEmpty(list)) {
+ return null;
+ }
+ return list.get(0);
+ }
+
/**
* 妫�鏌ュ鍏ユ枃浠跺垎绫绘槸鍚﹀尮閰�
* @param title 鏍囬娈佃惤瀛楃涓�
--
Gitblit v1.9.3