From 7e912d14ccffb7d462848d8177202738c7b530cf Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 08 七月 2025 17:31:03 +0800
Subject: [PATCH] art:技术状态鉴定规范-问题修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationStandardRequest.java | 3 +++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java | 2 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java | 2 +-
3 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java
index 56009c2..8f79288 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java
@@ -158,7 +158,7 @@
entity.setStandardStatus(TechnicalStatusEvaluationStandardEnum.ENABLE.name());
eamTechnicalStatusEvaluationStandardService.updateById(entity);
}
- return Result.OK("鍒犻櫎鎴愬姛!");
+ return Result.OK("鎻愪氦鎴愬姛!");
}
/**
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationStandardRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationStandardRequest.java
index 358cc2e..0f87f4d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationStandardRequest.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationStandardRequest.java
@@ -39,6 +39,9 @@
/**鏄惁鏈夊叾浠栨鏌�;鏄惁*/
@ApiModelProperty(value = "鏄惁鏈夊叾浠栨鏌�;鏄惁")
private String hasOtherCheck;
+ /**澶囨敞*/
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
/**鍒楄〃 妫�鏌ラ」鏄庣粏*/
@ApiModelProperty(value = "鍒楄〃 妫�鏌ラ」鏄庣粏")
private List<EamTechnicalStatusEvaluationStandardDetail> tableDetailList;
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 bce9547..341f040 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
@@ -188,6 +188,7 @@
entity.setHasOtherCheck(request.getHasOtherCheck());
entity.setHasPrecisionCheck(request.getHasPrecisionCheck());
entity.setHasSafetyEquipmentCheck(request.getHasSafetyEquipmentCheck());
+ entity.setRemark(request.getRemark());
this.getBaseMapper().updateById(entity);
//澶勭悊璇︽儏
if(CollectionUtil.isNotEmpty(request.getTableDetailList())) {
@@ -252,6 +253,7 @@
newEntity.setHasSafetyEquipmentCheck(request.getHasSafetyEquipmentCheck());
//鍒犻櫎鏍囪
newEntity.setDelFlag(CommonConstant.DEL_FLAG_0);
+ newEntity.setRemark(request.getRemark());
//閲嶅鎬ф牎楠�
EamTechnicalStatusEvaluationStandard exist = checkDuplicate(newEntity.getEquipmentId(), entity.getId());
if(exist != null){
--
Gitblit v1.9.3