From 2899544d5e9001cdaa824405d234d8e4138f7063 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 12 七月 2025 16:35:49 +0800
Subject: [PATCH] art: 技术状态鉴定工单变更-字典添加
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderChangeService.java | 10 +++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationResultReasonEnum.java | 10 +++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java | 4
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationStandardStatusEnum.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java | 7 ++
db/ZHR/dict_zhr.sql | 37 ++++++++++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationOrderChangeReasonEnum.java | 21 +++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java | 4
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java | 24 ++++----
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java | 3
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderChangeQuery.java | 23 +++++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationOrderChangeStatusEnum.java | 21 +++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderChangeController.java | 8 +-
13 files changed, 151 insertions(+), 23 deletions(-)
diff --git a/db/ZHR/dict_zhr.sql b/db/ZHR/dict_zhr.sql
index 86d71cd..790f3de 100644
--- a/db/ZHR/dict_zhr.sql
+++ b/db/ZHR/dict_zhr.sql
@@ -70,3 +70,40 @@
INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1940319476352299010', N'1940319386308980737', N'闄愮敤', N'RESTRICTED', '', 2, 1, N'admin', '2025-07-02 15:59:47.0000000', N'admin', '2025-07-11 11:23:52.7830000');
INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943511780124659714', N'1940319386308980737', N'绂佺敤', N'PROHIBITED', '', 3, 1, N'admin', '2025-07-11 11:24:51.7410000', NULL, NULL);
+--鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇村師鍥�
+delete from [dbo].[sys_dict_item] where dict_id in (select id from [dbo].[sys_dict] where dict_code='technical_status_evaluation_order_change_reason');
+delete from [dbo].[sys_dict] where dict_code='technical_status_evaluation_order_change_reason';
+
+INSERT INTO [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'1943939430844620802', N'鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇村師鍥�', N'technical_status_evaluation_order_change_reason', N'璁惧绠＄悊浣跨敤', 0, N'admin', '2025-07-12 15:44:11.6180000', NULL, NULL, NULL);
+
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943941741276979202', N'1943939430844620802', N'鐢熶骇浠诲姟鎬ユ棤娉曞仠鏈�', N'PRODUCTION_WORK_ORDER_EXPEDITED', '', 1, 1, N'admin', '2025-07-12 15:53:22.4680000', NULL, NULL);
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943941811498016770', N'1943939430844620802', N'璁惧鏁呴殰姝ｅ浜庣淮淇姸鎬�', N'EQUIPMENT_BREAKDOWN_REPAIR', '', 2, 1, N'admin', '2025-07-12 15:53:39.2090000', NULL, NULL);
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943941870868389889', N'1943939430844620802', N'璁惧宸叉姤搴�', N'EQUIPMENT_SCRAPPED', '', 3, 1, N'admin', '2025-07-12 15:53:53.3640000', NULL, NULL);
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943941956709015554', N'1943939430844620802', N'璁惧澶т慨', N'EQUIPMENT_MAJOR', '', 4, 1, N'admin', '2025-07-12 15:54:13.8300000', NULL, NULL);
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943942061625335809', N'1943939430844620802', N'璁惧鎼縼', N'EQUIPMENT_RELOCATION', '', 5, 1, N'admin', '2025-07-12 15:54:38.8450000', NULL, NULL);
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943942122652459010', N'1943939430844620802', N'璁惧鏀归��', N'EQUIPMENT_RETROFITTING', '', 6, 1, N'admin', '2025-07-12 15:54:53.3960000', NULL, NULL);
+
+--鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇寸姸鎬�
+delete from [dbo].[sys_dict_item] where dict_id in (select id from [dbo].[sys_dict] where dict_code='technical_status_evaluation_order_change_status');
+delete from [dbo].[sys_dict] where dict_code='technical_status_evaluation_order_change_status';
+
+INSERT INTO [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'1943933734891708418', N'鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇寸姸鎬�', N'technical_status_evaluation_order_change_status', N'璁惧绠＄悊浣跨敤', 0, N'admin', '2025-07-12 15:21:33.5970000', NULL, NULL, NULL);
+
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943938381878550530', N'1943933734891708418', N'寰呮彁浜�', N'WAIT_SUBMIT', '', 1, 1, N'admin', '2025-07-12 15:40:01.5240000', NULL, NULL);
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943938456247754753', N'1943933734891708418', N'涓荤棰嗗绛惧瓧涓�', N'EQUIPMENT_MANAGER_SIGNING', '', 2, 1, N'admin', '2025-07-12 15:40:19.2550000', NULL, NULL);
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943938510379442177', N'1943933734891708418', N'閮ㄩ棬棰嗗绛惧瓧涓�', N'DEPART_MANAGER_SIGNING', '', 3, 1, N'admin', '2025-07-12 15:40:32.1620000', NULL, NULL);
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943938563349307393', N'1943933734891708418', N'淇濋殰閮ㄩ瀵肩瀛椾腑', N'PRODUCTION_SUPPORT_SIGNING', '', 4, 1, N'admin', '2025-07-12 15:40:44.7920000', NULL, NULL);
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943938618584096770', N'1943933734891708418', N'宸蹭綔搴�', N'ABOLISH', '', 6, 1, N'admin', '2025-07-12 15:40:57.0000000', N'admin', '2025-07-12 15:41:24.3860000');
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943938696413601793', N'1943933734891708418', N'宸插畬鎴�', N'COMPLETED', '', 5, 1, N'admin', '2025-07-12 15:41:16.0000000', N'admin', '2025-07-12 15:41:29.4120000');
+
+--鎶�鏈姸鎬侀壌瀹氱粨鏋滃師鍥�
+delete from [dbo].[sys_dict_item] where dict_id in (select id from [dbo].[sys_dict] where dict_code='technical_status_evaluation_result_reason');
+delete from [dbo].[sys_dict] where dict_code='technical_status_evaluation_result_reason';
+
+INSERT INTO [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'1943508627786436609', N'鎶�鏈姸鎬侀壌瀹氱粨鏋滃師鍥�', N'technical_status_evaluation_result_reason', N'璁惧绠＄悊浣跨敤', 0, N'admin', '2025-07-11 11:12:20.1790000', NULL, NULL, NULL);
+
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943951156122116097', N'1943508627786436609', N'瀹夊叏瑁呯疆', N'SAFETY_EQUIPMENT_CHECK', '', 1, 1, N'admin', '2025-07-12 16:30:47.1420000', NULL, NULL);
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943951206004973570', N'1943508627786436609', N'璁惧绮惧害', N'EQUIPMENT_PRECISION_CHECK', '', 2, 1, N'admin', '2025-07-12 16:30:59.0340000', NULL, NULL);
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943951255988494337', N'1943508627786436609', N'璁惧鍔熻兘', N'EQUIPMENT_FUNCTIONAL_CHECK', '', 3, 1, N'admin', '2025-07-12 16:31:10.9520000', NULL, NULL);
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943951312682901505', N'1943508627786436609', N'璇曞垏', N'SAMPLE_CHECK', '', 4, 1, N'admin', '2025-07-12 16:31:24.4670000', NULL, NULL);
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943951373072490497', N'1943508627786436609', N'鍏朵粬', N'OTHER_CHECK', '', 5, 1, N'admin', '2025-07-12 16:31:38.0000000', N'admin', '2025-07-12 16:31:46.0150000');
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationOrderChangeReasonEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationOrderChangeReasonEnum.java
new file mode 100644
index 0000000..215e3cc
--- /dev/null
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationOrderChangeReasonEnum.java
@@ -0,0 +1,21 @@
+package org.jeecg.modules.eam.constant;
+
+public enum TechnicalStatusEvaluationOrderChangeReasonEnum {
+ PRODUCTION_WORK_ORDER_EXPEDITED, //鐢熶骇浠诲姟鎬ユ棤娉曞仠鏈�
+ EQUIPMENT_BREAKDOWN_REPAIR, //璁惧鏁呴殰姝ｅ浜庣淮淇姸鎬�
+ EQUIPMENT_SCRAPPED, //璁惧宸叉姤搴�
+ EQUIPMENT_MAJOR, //璁惧澶т慨
+ EQUIPMENT_RELOCATION, //璁惧鎼縼
+ EQUIPMENT_RETROFITTING, //璁惧鏀归��
+ ;
+
+ public static TechnicalStatusEvaluationOrderChangeReasonEnum getInstance(String code) {
+ TechnicalStatusEvaluationOrderChangeReasonEnum[] values = TechnicalStatusEvaluationOrderChangeReasonEnum.values();
+ for (TechnicalStatusEvaluationOrderChangeReasonEnum value : values) {
+ if (value.name().equals(code)) {
+ return value;
+ }
+ }
+ return null;
+ }
+}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationOrderChangeStatusEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationOrderChangeStatusEnum.java
new file mode 100644
index 0000000..80c3edd
--- /dev/null
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationOrderChangeStatusEnum.java
@@ -0,0 +1,21 @@
+package org.jeecg.modules.eam.constant;
+
+public enum TechnicalStatusEvaluationOrderChangeStatusEnum {
+ WAIT_SUBMIT, //寰呮彁浜�
+ EQUIPMENT_MANAGER_SIGNING, //涓荤棰嗗绛惧瓧涓�
+ DEPART_MANAGER_SIGNING, //閮ㄩ棬棰嗗绛惧瓧涓�
+ PRODUCTION_SUPPORT_SIGNING, //淇濋殰閮ㄩ瀵肩瀛椾腑
+ ABOLISH, //宸蹭綔搴�
+ COMPLETED, //宸插畬鎴�
+ ;
+
+ public static TechnicalStatusEvaluationOrderChangeStatusEnum getInstance(String code) {
+ TechnicalStatusEvaluationOrderChangeStatusEnum[] values = TechnicalStatusEvaluationOrderChangeStatusEnum.values();
+ for (TechnicalStatusEvaluationOrderChangeStatusEnum value : values) {
+ if (value.name().equals(code)) {
+ return value;
+ }
+ }
+ return null;
+ }
+}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationResultReasonEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationResultReasonEnum.java
new file mode 100644
index 0000000..23960e2
--- /dev/null
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationResultReasonEnum.java
@@ -0,0 +1,10 @@
+package org.jeecg.modules.eam.constant;
+
+public enum TechnicalStatusEvaluationResultReasonEnum {
+ SAFETY_EQUIPMENT_CHECK, //瀹夊叏瑁呯疆
+ EQUIPMENT_PRECISION_CHECK,//璁惧绮惧害
+ EQUIPMENT_FUNCTIONAL_CHECK,//璁惧鍔熻兘
+ SAMPLE_CHECK,//璇曞垏
+ OTHER_CHECK,//鍏朵粬
+ ;
+}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationStandardEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationStandardStatusEnum.java
similarity index 67%
rename from lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationStandardEnum.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationStandardStatusEnum.java
index be0c917..6ee898c 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationStandardEnum.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationStandardStatusEnum.java
@@ -1,6 +1,6 @@
package org.jeecg.modules.eam.constant;
-public enum TechnicalStatusEvaluationStandardEnum {
+public enum TechnicalStatusEvaluationStandardStatusEnum {
WAIT_SUBMIT, //寰呮彁浜�
ENABLE, //鍚敤
DISABLE, //绂佺敤
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderChangeController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderChangeController.java
index fe8cd09..b1aae48 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderChangeController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderChangeController.java
@@ -11,6 +11,7 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderChange;
+import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderChangeQuery;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderChangeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -37,7 +38,7 @@
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
- * @param eamTechnicalStatusEvaluationOrderChange
+ * @param query
* @param pageNo
* @param pageSize
* @param req
@@ -45,13 +46,12 @@
*/
@ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-鍒嗛〉鍒楄〃鏌ヨ", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
- public Result<?> queryPageList(EamTechnicalStatusEvaluationOrderChange eamTechnicalStatusEvaluationOrderChange,
+ public Result<?> queryPageList(EamTechnicalStatusEvaluationOrderChangeQuery query,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<EamTechnicalStatusEvaluationOrderChange> queryWrapper = QueryGenerator.initQueryWrapper(eamTechnicalStatusEvaluationOrderChange, req.getParameterMap());
Page<EamTechnicalStatusEvaluationOrderChange> page = new Page<EamTechnicalStatusEvaluationOrderChange>(pageNo, pageSize);
- IPage<EamTechnicalStatusEvaluationOrderChange> pageList = eamTechnicalStatusEvaluationOrderChangeService.page(page, queryWrapper);
+ IPage<EamTechnicalStatusEvaluationOrderChange> pageList = eamTechnicalStatusEvaluationOrderChangeService.queryPageList(page, query);
return Result.OK(pageList);
}
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 e099e34..2983990 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
@@ -10,7 +10,7 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
-import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationStandardEnum;
+import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationStandardStatusEnum;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationStandard;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationStandardRequest;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationStandardService;
@@ -160,7 +160,7 @@
public Result<?> submit(@RequestParam(name = "id", required = true) String id) {
EamTechnicalStatusEvaluationStandard entity = eamTechnicalStatusEvaluationStandardService.getById(id);
if (entity != null) {
- entity.setStandardStatus(TechnicalStatusEvaluationStandardEnum.ENABLE.name());
+ entity.setStandardStatus(TechnicalStatusEvaluationStandardStatusEnum.ENABLE.name());
eamTechnicalStatusEvaluationStandardService.updateById(entity);
}
return Result.OK("鎻愪氦鎴愬姛!");
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java
index 0310f65..6b1527f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java
@@ -155,7 +155,7 @@
private String safetyEquipmentCheckResult;
/**绮惧害鍙傛暟妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤*/
@ApiModelProperty(value = "绮惧害鍙傛暟妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤")
- @Dict(dicCode = "ye_no_none")
+ @Dict(dicCode = "yes_no_none")
private String precisionCheckResult;
/**鍔熻兘鐘舵�佹鏌ョ粨鏋�;鏄�佸惁*/
@ApiModelProperty(value = "鍔熻兘鐘舵�佹鏌ョ粨鏋�;鏄�佸惁")
@@ -163,7 +163,7 @@
private String functionalCheckResult;
/**鍏朵粬妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤*/
@ApiModelProperty(value = "鍏朵粬妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤")
- @Dict(dicCode = "ye_no_none")
+ @Dict(dicCode = "yes_no_none")
private String otherCheckResult;
/**缁翠慨浜虹瀛�*/
@ApiModelProperty(value = "缁翠慨浜虹瀛�")
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderChangeQuery.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderChangeQuery.java
new file mode 100644
index 0000000..00bd4d1
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderChangeQuery.java
@@ -0,0 +1,23 @@
+package org.jeecg.modules.eam.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class EamTechnicalStatusEvaluationOrderChangeQuery {
+ private String changeOrderNum;
+ private String equipmentId;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date dateBegin;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date dateEnd;
+ private String changeStatus;
+
+ private String column;
+ private String order;
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderChangeService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderChangeService.java
index 203fa1c..6797e70 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderChangeService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderChangeService.java
@@ -1,7 +1,10 @@
package org.jeecg.modules.eam.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderChange;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderChangeQuery;
/**
* @Description: 鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�
@@ -11,4 +14,11 @@
*/
public interface IEamTechnicalStatusEvaluationOrderChangeService extends IService<EamTechnicalStatusEvaluationOrderChange> {
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param page
+ * @param query
+ * @return
+ */
+ IPage<EamTechnicalStatusEvaluationOrderChange> queryPageList(Page<EamTechnicalStatusEvaluationOrderChange> page, EamTechnicalStatusEvaluationOrderChangeQuery query);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java
index 774fecb..686394c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java
@@ -1,7 +1,10 @@
package org.jeecg.modules.eam.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderChange;
import org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationOrderChangeMapper;
+import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderChangeQuery;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderChangeService;
import org.springframework.stereotype.Service;
@@ -16,4 +19,8 @@
@Service
public class EamTechnicalStatusEvaluationOrderChangeServiceImpl extends ServiceImpl<EamTechnicalStatusEvaluationOrderChangeMapper, EamTechnicalStatusEvaluationOrderChange> implements IEamTechnicalStatusEvaluationOrderChangeService {
+ @Override
+ public IPage<EamTechnicalStatusEvaluationOrderChange> queryPageList(Page<EamTechnicalStatusEvaluationOrderChange> page, EamTechnicalStatusEvaluationOrderChangeQuery query) {
+ return null;
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java
index f64b5b6..7117add 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java
@@ -8,7 +8,6 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import liquibase.pro.packaged.E;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.flowable.engine.TaskService;
@@ -158,7 +157,7 @@
if (standard == null) {
throw new JeecgBootException("鎶�鏈姸鎬侀壌瀹氳鑼冧笉瀛樺湪锛屾坊鍔犲け璐ワ紒");
}
- if (!TechnicalStatusEvaluationStandardEnum.ENABLE.name().equals(standard.getStandardStatus())) {
+ if (!TechnicalStatusEvaluationStandardStatusEnum.ENABLE.name().equals(standard.getStandardStatus())) {
throw new JeecgBootException("鎶�鏈姸鎬侀壌瀹氳鑼冩湭鍚敤锛屾坊鍔犲け璐ワ紒");
}
List<EamTechnicalStatusEvaluationStandardDetail> standardDetailList = standardDetailService.queryList(standard.getId());
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 51d0233..e0bf032 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;
@@ -130,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());
//璁惧澶勭悊
@@ -183,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);
@@ -266,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()));
//璁惧澶勭悊
@@ -320,7 +320,7 @@
}
}
//绂佺敤鍘熸潵鐨勭増鏈�
- entity.setStandardStatus(TechnicalStatusEvaluationStandardEnum.DISABLE.name());
+ entity.setStandardStatus(TechnicalStatusEvaluationStandardStatusEnum.DISABLE.name());
this.getBaseMapper().updateById(entity);
return true;
}
@@ -355,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 + ":姝よ澶囧凡瀛樺湪鍚敤鐨勮鑼冿紝璇疯繘琛岀紪杈戞垨鍗囩増锛�");
}
//鑾峰彇妫�鏌ラ」淇℃伅
@@ -366,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());
@@ -429,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 + ":姝よ澶囧凡瀛樺湪鍚敤鐨勮鑼冿紝璇疯繘琛岀紪杈戞垨鍗囩増锛�");
}
//鑾峰彇妫�鏌ラ」淇℃伅
@@ -440,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());
@@ -503,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 + ":姝よ澶囧凡瀛樺湪鍚敤鐨勮鑼冿紝璇疯繘琛岀紪杈戞垨鍗囩増锛�");
}
//鑾峰彇妫�鏌ラ」淇℃伅
@@ -514,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());
@@ -553,7 +553,7 @@
EamTechnicalStatusEvaluationStandard query = new EamTechnicalStatusEvaluationStandard();
query.setEquipmentId(equipmentId);
query.setKeyword(keyword);
- query.setStandardStatus(TechnicalStatusEvaluationStandardEnum.ENABLE.name());
+ query.setStandardStatus(TechnicalStatusEvaluationStandardStatusEnum.ENABLE.name());
IPage<EamTechnicalStatusEvaluationStandard> pageData = this.queryPageList(page, query);
return pageData.getRecords();
}
--
Gitblit v1.9.3