From d073e531919d945344ae37b2df0737f245e345d3 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 11 七月 2025 11:39:04 +0800
Subject: [PATCH] art: 工单信息转译
---
db/ZHR/dict_zhr.sql | 20 +++++++--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java | 52 +++++++++++++++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java | 46 +++++++++++++++++-----
3 files changed, 101 insertions(+), 17 deletions(-)
diff --git a/db/ZHR/dict_zhr.sql b/db/ZHR/dict_zhr.sql
index 6a8b19b..a0513a2 100644
--- a/db/ZHR/dict_zhr.sql
+++ b/db/ZHR/dict_zhr.sql
@@ -1,6 +1,6 @@
--鎶�鏈姸鎬侀壌瀹氬伐鍗曠姸鎬�
-delete from [dbo].[sys_dict] where dict_code='technical_status_evaluation_order_status';
delete from [dbo].[sys_dict_item] where dict_id in (select id from [dbo].[sys_dict] where dict_code='technical_status_evaluation_order_status');
+delete from [dbo].[sys_dict] where dict_code='technical_status_evaluation_order_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'1943282255763828737', N'鎶�鏈姸鎬侀壌瀹氬伐鍗曠姸鎬�', N'technical_status_evaluation_order_status', N'璁惧绠＄悊浣跨敤', 0, N'admin', '2025-07-10 20:12:48.8660000', NULL, NULL, NULL);
@@ -17,8 +17,8 @@
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'1943283135447789569', N'1943282255763828737', N'EXPIRED', N'宸茶繃鏈�', '', 11, 1, N'admin', '2025-07-10 20:16:18.6020000', NULL, NULL);
--鎶�鏈姸鎬佹鏌ラ」鍒嗙被
-delete from [dbo].[sys_dict] where dict_code='technical_status_evaluation_check_category';
delete from [dbo].[sys_dict_item] where dict_id in (select id from [dbo].[sys_dict] where dict_code='technical_status_evaluation_check_category');
+delete from [dbo].[sys_dict] where dict_code='technical_status_evaluation_check_category';
INSERT INTO [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'1942406054790733826', N'鎶�鏈姸鎬佹鏌ラ」鍒嗙被', N'technical_status_evaluation_check_category', N'璁惧绠＄悊浣跨敤', 0, N'admin', '2025-07-08 10:11:06.2770000', NULL, NULL, NULL);
@@ -27,8 +27,8 @@
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'1942406681549774850', N'1942406054790733826', N'鍏朵粬妫�鏌�', N'OTHER_CHECK', '', 3, 1, N'admin', '2025-07-08 10:13:35.7220000', NULL, NULL);
--鎶�鏈姸鎬侀壌瀹氳鑼冪姸鎬�
-delete from [dbo].[sys_dict] where dict_code='technical_status_evaluation_standard_status';
delete from [dbo].[sys_dict_item] where dict_id in (select id from [dbo].[sys_dict] where dict_code='technical_status_evaluation_standard_status');
+delete from [dbo].[sys_dict] where dict_code='technical_status_evaluation_standard_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'1942405419550810113', N'鎶�鏈姸鎬侀壌瀹氳鑼冪姸鎬�', N'technical_status_evaluation_standard_status', N'璁惧绠＄悊浣跨敤', 0, N'admin', '2025-07-08 10:08:34.8250000', NULL, NULL, NULL);
@@ -37,8 +37,8 @@
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'1942405710740365313', N'1942405419550810113', N'绂佺敤', N'DISABLE', '', 3, 1, N'admin', '2025-07-08 10:09:44.2500000', NULL, NULL);
--HF妯℃澘鍒嗙被
-delete from [dbo].[sys_dict] where dict_code='hf_template_category';
delete from [dbo].[sys_dict_item] where dict_id in (select id from [dbo].[sys_dict] where dict_code='hf_template_category');
+delete from [dbo].[sys_dict] where dict_code='hf_template_category';
INSERT INTO [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'1941372067586695170', N'HF妯℃澘鍒嗙被', N'hf_template_category', N'璁惧绠＄悊浣跨敤', 0, N'admin', '2025-07-05 13:42:24.5310000', NULL, NULL, NULL);
@@ -52,11 +52,21 @@
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'1943211241587568641', N'1941372067586695170', N'璁惧绮惧害妫�鏌ヨ〃', N'TECHNICAL_STATUS_EVALUATION_PRECISION_CHECK', '', 8, 1, N'admin', '2025-07-10 15:30:37.0000000', N'admin', '2025-07-10 15:31:29.2060000');
--鍚敤绂佺敤
-delete from [dbo].[sys_dict] where dict_code='enable_disable';
delete from [dbo].[sys_dict_item] where dict_id in (select id from [dbo].[sys_dict] where dict_code='enable_disable');
+delete from [dbo].[sys_dict] where dict_code='enable_disable';
INSERT INTO [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'1941370835371483137', N'鍚敤绂佺敤', N'enable_disable', N'閫氱敤鏁版嵁瀛楀吀', 0, N'admin', '2025-07-05 13:37:30.7420000', 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'1941370959137005570', N'1941370835371483137', N'鍚敤', N'ENABLE', '', 1, 1, N'admin', '2025-07-05 13:38:00.2500000', 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'1941371030628917250', N'1941370835371483137', N'绂佺敤', N'DISABLE', '', 2, 1, N'admin', '2025-07-05 13:38:17.2920000', NULL, NULL);
+--鎶�鏈姸鎬�
+delete from [dbo].[sys_dict_item] where dict_id in (select id from [dbo].[sys_dict] where dict_code='equipment_technology_status');
+delete from [dbo].[sys_dict] where dict_code='equipment_technology_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'1940319386308980737', N'鎶�鏈姸鎬�', N'equipment_technology_status', N'璁惧绠＄悊浣跨敤', 0, N'admin', '2025-07-02 15:59:25.0000000', N'admin', '2025-07-03 10:27:26.5370000', 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'1940319446841176066', N'1940319386308980737', N'鍚堟牸', N'QUALIFIED', '', 1, 1, N'admin', '2025-07-02 15:59:40.0000000', N'admin', '2025-07-11 11:23:11.9870000');
+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);
+
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 732ecab..9243597 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
@@ -4,11 +4,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -54,18 +57,28 @@
@ApiModelProperty(value = "瑙勮寖ID")
private String standardId;
/**璁″垝閴村畾鏃ユ湡;鎻愬墠70澶╃敓鎴愬伐鍗�*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "璁″垝閴村畾鏃ユ湡;鎻愬墠70澶╃敓鎴愬伐鍗�")
private Date evaluationDate;
/**閿佸畾宸ュ崟鏃ユ湡;鎻愬墠55澶╅攣瀹氬伐鍗�*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "閿佸畾宸ュ崟鏃ユ湡;鎻愬墠55澶╅攣瀹氬伐鍗�")
private Date freezeOrderDate;
/**宸ュ崟杩囨湡鏃ユ湡;鍒版湡鏈仛鐩存帴杩囨湡锛屽苟淇敼璁惧鎶�鏈姸鎬佷负绂佺敤*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "宸ュ崟杩囨湡鏃ユ湡;鍒版湡鏈仛鐩存帴杩囨湡锛屽苟淇敼璁惧鎶�鏈姸鎬佷负绂佺敤")
private Date orderExpirationDate;
/**瀹為檯寮�濮嬫椂闂�*/
@ApiModelProperty(value = "瀹為檯寮�濮嬫椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date actualStartTime;
/**瀹為檯缁撴潫鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "瀹為檯缁撴潫鏃堕棿")
private Date actualEndTime;
/**閴村畾浜�*/
@@ -73,9 +86,11 @@
private String evaluator;
/**閴村畾鐘舵��;寰呴壌瀹氥�侀壌瀹氫腑銆佺淮淇涓讳换绛惧瓧銆佸伐鑹轰汉鍛樼瀛椼�佷娇鐢ㄥ崟浣嶆妧鏈富绠＄瀛椼�佽澶囨楠屽憳绛惧瓧銆佸凡瀹屾垚銆佸凡閿佸畾銆佸彉鏇翠腑銆佸凡杩囨湡*/
@ApiModelProperty(value = "閴村畾鐘舵��;寰呴壌瀹氥�侀壌瀹氫腑銆佺淮淇涓讳换绛惧瓧銆佸伐鑹轰汉鍛樼瀛椼�佷娇鐢ㄥ崟浣嶆妧鏈富绠＄瀛椼�佽澶囨楠屽憳绛惧瓧銆佸凡瀹屾垚銆佸凡閿佸畾銆佸彉鏇翠腑銆佸凡杩囨湡")
+ @Dict(dicCode = "technical_status_evaluation_order_status")
private String evaluationStatus;
/**鍒涘缓鏂瑰紡*/
@ApiModelProperty(value = "鍒涘缓鏂瑰紡")
+ @Dict(dicCode = "order_creation_method")
private String creationMethod;
/**瀹夊叏瑁呯疆妫�鏌ユ槸鍚﹀畬鎴�*/
@ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ユ槸鍚﹀畬鎴�")
@@ -88,66 +103,89 @@
private String otherCheckCompleted;
/**瀹夊叏瑁呯疆妫�鏌ョ‘璁や汉*/
@ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ョ‘璁や汉")
+ @Dict(dicCode = "sys_user, realname, username")
private String safetyCheckConfirm;
/**瀹夊叏瑁呯疆妫�鏌ョ‘璁ゆ椂闂�*/
@ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ョ‘璁ゆ椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date safetyCheckConfirmTime;
/**瀹夊叏瑁呯疆妫�鏌ョ‘璁ょ粨鏋�*/
@ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ョ‘璁ょ粨鏋�")
+ @Dict(dicCode = "approved_rejected")
private String safetyCheckResult;
/**瀹夊叏瑁呯疆妫�鏌ョ‘璁ゆ剰瑙�*/
@ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ョ‘璁ゆ剰瑙�")
private String safetyCheckComment;
/**璁惧绮惧害妫�鏌ョ‘璁や汉*/
@ApiModelProperty(value = "璁惧绮惧害妫�鏌ョ‘璁や汉")
+ @Dict(dicCode = "sys_user, realname, username")
private String precisionCheckConfirm;
/**璁惧绮惧害妫�鏌ョ‘璁ゆ椂闂�*/
@ApiModelProperty(value = "璁惧绮惧害妫�鏌ョ‘璁ゆ椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date precisionCheckConfirmTime;
/**璁惧绮惧害妫�鏌ョ‘璁ょ粨鏋�*/
@ApiModelProperty(value = "璁惧绮惧害妫�鏌ョ‘璁ょ粨鏋�")
+ @Dict(dicCode = "approved_rejected")
private String precisionCheckConfirmResult;
/**璁惧绮惧害妫�鏌ョ‘璁ゆ剰瑙�*/
@ApiModelProperty(value = "璁惧绮惧害妫�鏌ョ‘璁ゆ剰瑙�")
private String precisionCheckConfirmComment;
/**鍏朵粬妫�鏌ョ‘璁や汉*/
@ApiModelProperty(value = "鍏朵粬妫�鏌ョ‘璁や汉")
+ @Dict(dicCode = "sys_user, realname, username")
private String otherCheckConfirm;
/**鍏朵粬妫�鏌ョ‘璁ゆ椂闂�*/
@ApiModelProperty(value = "鍏朵粬妫�鏌ョ‘璁ゆ椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date otherCheckConfirmTime;
/**鍏朵粬妫�鏌ョ‘璁ょ粨鏋�*/
@ApiModelProperty(value = "鍏朵粬妫�鏌ョ‘璁ょ粨鏋�")
+ @Dict(dicCode = "approved_rejected")
private String otherCheckConfirmResult;
/**鍏朵粬妫�鏌ョ‘璁ゆ剰瑙�*/
@ApiModelProperty(value = "鍏朵粬妫�鏌ョ‘璁ゆ剰瑙�")
private String otherCheckConfirmComment;
/**瀹夊叏瑁呯疆妫�鏌ョ粨鏋�;鏄�佸惁*/
@ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ョ粨鏋�;鏄�佸惁")
+ @Dict(dicCode = "yn")
private String safetyEquipmentCheckResult;
/**绮惧害鍙傛暟妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤*/
@ApiModelProperty(value = "绮惧害鍙傛暟妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤")
+ @Dict(dicCode = "ye_no_none")
private String precisionCheckResult;
/**鍔熻兘鐘舵�佹鏌ョ粨鏋�;鏄�佸惁*/
@ApiModelProperty(value = "鍔熻兘鐘舵�佹鏌ョ粨鏋�;鏄�佸惁")
+ @Dict(dicCode = "yn")
private String functionalCheckResult;
/**鍏朵粬妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤*/
@ApiModelProperty(value = "鍏朵粬妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤")
+ @Dict(dicCode = "ye_no_none")
private String otherCheckResult;
/**缁翠慨浜虹瀛�*/
@ApiModelProperty(value = "缁翠慨浜虹瀛�")
+ @Dict(dicCode = "sys_user, realname, username")
private String repairerSignature;
/**缁翠慨浜虹瀛楁椂闂�*/
@ApiModelProperty(value = "缁翠慨浜虹瀛楁椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date repairerSignatureTime;
/**缁翠慨瀹や富浠荤瀛�*/
@ApiModelProperty(value = "缁翠慨瀹や富浠荤瀛�")
+ @Dict(dicCode = "sys_user, realname, username")
private String repairManagerSignature;
/**缁翠慨瀹や富浠荤瀛楁椂闂�*/
@ApiModelProperty(value = "缁翠慨瀹や富浠荤瀛楁椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date repairManagerSignatureTime;
/**缁翠慨瀹や富浠荤瀛楃粨鏋�*/
@ApiModelProperty(value = "缁翠慨瀹や富浠荤瀛楃粨鏋�")
+ @Dict(dicCode = "approved_rejected")
private String repairManagerSignatureResult;
/**缁翠慨瀹や富浠绘剰瑙�*/
@ApiModelProperty(value = "缁翠慨瀹や富浠绘剰瑙�")
@@ -157,36 +195,48 @@
private String sampleCheckResult;
/**宸ヨ壓鍛樼瀛�*/
@ApiModelProperty(value = "宸ヨ壓鍛樼瀛�")
+ @Dict(dicCode = "sys_user, realname, username")
private String processTechnicianSignature;
/**宸ヨ壓鍛樼瀛楁椂闂�*/
@ApiModelProperty(value = "宸ヨ壓鍛樼瀛楁椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date processTechnicianSignatureTime;
/**宸ヨ壓鍛樻剰瑙�*/
@ApiModelProperty(value = "宸ヨ壓鍛樻剰瑙�")
private String processTechnicianComment;
/**浣跨敤鍗曚綅鎶�鏈富绠＄瀛�*/
@ApiModelProperty(value = "浣跨敤鍗曚綅鎶�鏈富绠＄瀛�")
+ @Dict(dicCode = "sys_user, realname, username")
private String departTechnicalLeaderSignature;
/**浣跨敤鍗曚綅鎶�鏈富绠＄瀛楁椂闂�*/
@ApiModelProperty(value = "浣跨敤鍗曚綅鎶�鏈富绠＄瀛楁椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String departTechnicalLeaderSignatureTime;
/**浣跨敤鍗曚綅鎶�鏈富绠＄瀛楃粨鏋�*/
@ApiModelProperty(value = "浣跨敤鍗曚綅鎶�鏈富绠＄瀛楃粨鏋�")
+ @Dict(dicCode = "approved_rejected")
private String departTechnicalLeaderSignatureResult;
/**浣跨敤鍗曚綅鎶�鏈富绠℃剰瑙�*/
@ApiModelProperty(value = "浣跨敤鍗曚綅鎶�鏈富绠℃剰瑙�")
private String departTechnicalLeaderComment;
/**閴村畾缁撴灉;鍚堟牸銆侀檺鐢ㄣ�佺鐢�*/
- @ApiModelProperty(value = "閴村畾缁撴灉;鍚堟牸銆侀檺鐢ㄣ�佺鐢�")
+ @ApiModelProperty(value = "閴村畾缁撴灉;鍚堟牸銆侀檺鐢ㄣ�佺鐢�")
+ @Dict(dicCode = "equipment_technology_status")
private String evaluationResult;
/**闄�/绂佺敤鍘熷洜(澶氶��);瀹夊叏瑁呯疆銆佽澶囧姛鑳姐�佺簿搴︺�佽瘯浠躲�佸叾浠�*/
@ApiModelProperty(value = "闄�/绂佺敤鍘熷洜(澶氶��);瀹夊叏瑁呯疆銆佽澶囧姛鑳姐�佺簿搴︺�佽瘯浠躲�佸叾浠�")
+ @Dict(dicCode = "technical_status_evaluation_result_reason")
private String evaluationReason;
/**璁惧妫�鏌ヤ汉绛惧瓧*/
@ApiModelProperty(value = "璁惧妫�鏌ヤ汉绛惧瓧")
+ @Dict(dicCode = "sys_user, realname, username")
private String inspectorSignature;
/**璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿*/
@ApiModelProperty(value = "璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date inspectorSignatureTime;
/**璁惧妫�鏌ヤ汉鎰忚*/
@ApiModelProperty(value = "璁惧妫�鏌ヤ汉鎰忚")
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 43adcef..7125c4e 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
@@ -11,6 +11,7 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.flowable.engine.TaskService;
+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;
@@ -221,6 +222,10 @@
if (!TechnicalStatusEvaluationOrderStatusEnum.WAIT_EVALUATION.name().equals(entity.getEvaluationStatus())) {
throw new JeecgBootException("璇ュ伐鍗曞凡杩涜杩囬鍙栵紒");
}
+ EamTechnicalStatusEvaluationStandard standard = standardService.getById(entity.getStandardId());
+ if(standard == null) {
+ throw new JeecgBootException("璁惧淇濆吇鏍囧噯涓嶅瓨鍦紝璇锋鏌ワ紒");
+ }
EamEquipment equipment = equipmentService.getById(entity.getEquipmentId());
if (equipment == null) {
throw new JeecgBootException("璁惧涓嶅瓨鍦紝娣诲姞澶辫触锛�");
@@ -231,9 +236,9 @@
}
List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0002);
if (CollectionUtil.isEmpty(userSelectors)) {
- throw new JeecgBootException("璁惧鏈垎閰嶇粰杞﹂棿鐝粍闀匡紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+ throw new JeecgBootException("璁惧鏈垎閰嶇粰缁翠慨宸ワ紝鏃犳硶棰嗗彇锛�");
}
-
+ List<String> userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
entity.setEvaluator(sysUser.getUsername());
entity.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.UNDER_EVALUATION.name());
entity.setActualStartTime(new Date());
@@ -252,15 +257,34 @@
variables.put("comment", entity.getRemark());
}
variables.put("proofreading", true);
- List<String> usernames = new ArrayList<>();
- usernames.add(entity.getEquipmentCode());
- variables.put("NextAssignee", usernames);
-// Result result = flowDefinitionService.startProcessInstanceByKey("second_maintenance_process", variables);
-// if (result != null) {
-// //鏇存柊璁惧淇濆吇鐘舵��
-// eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_SECOND_MAINTENANCE.name());
-// return result.isSuccess();
-// }
+ if(CommonConstant.STATUS_1.equals(standard.getHasSafetyEquipmentCheck())) {
+ variables.put("hasSafetyEquipmentCheck", CommonConstant.STATUS_1);
+ variables.put("safety_equipment_check", userApprovalList);
+ entity.setSafetyCheckCompleted(CommonConstant.STATUS_0);
+ } else {
+ variables.put("hasSafetyEquipmentCheck", CommonConstant.STATUS_0);
+ variables.put("safety_equipment_check", userApprovalList);
+ }
+ if(CommonConstant.STATUS_1.equals(standard.getHasPrecisionCheck())) {
+ variables.put("hasPrecisionCheck", CommonConstant.STATUS_1);
+ variables.put("equipment_precision_check", userApprovalList);
+ entity.setPrecisionCheckCompleted(CommonConstant.STATUS_0);
+ } else {
+ variables.put("hasPrecisionCheck", CommonConstant.STATUS_0);
+ variables.put("equipment_precision_check", userApprovalList);
+ }
+ if(CommonConstant.STATUS_1.equals(standard.getHasOtherCheck())) {
+ variables.put("hasOtherCheck", CommonConstant.STATUS_1);
+ variables.put("other_check", userApprovalList);
+ entity.setOtherCheckCompleted(CommonConstant.STATUS_0);
+ } else {
+ variables.put("hasOtherCheck ", CommonConstant.STATUS_0);
+ variables.put("other_check", userApprovalList);
+ }
+ Result<?> result = flowDefinitionService.startProcessInstanceByKey("technical_status_evaluation_process", variables);
+ if(result == null || !result.isSuccess()) {
+ throw new JeecgBootException("鍚姩娴佺▼澶辫触锛岄鍙栧け璐�");
+ }
return true;
}
--
Gitblit v1.9.3