From 8f0fea34594bb5da8c4fb804a7f9f5cb2698c141 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 10 七月 2025 14:40:13 +0800
Subject: [PATCH] art: 技术状态鉴定-字段修改
---
db/430设备管理数据库设计.pdma.json | 114 ++++++++++++++++++++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderRequest.java | 74 ++++++++++++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EamTechnicalStatusEvaluationOrderEnum.java | 15 +++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java | 20 +++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java | 26 ++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java | 37 +++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderService.java | 8 +
db/ZHR/business_code_zhr.sql | 3
9 files changed, 291 insertions(+), 8 deletions(-)
diff --git "a/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json" "b/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
index a3e60c4..08906d9 100644
--- "a/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
+++ "b/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
@@ -4,7 +4,7 @@
"avatar": "",
"version": "4.9.2",
"createdTime": "2025-3-10 16:38:19",
- "updatedTime": "2025-7-10 10:43:18",
+ "updatedTime": "2025-7-10 12:02:35",
"dbConns": [],
"profile": {
"default": {
@@ -24725,7 +24725,7 @@
{
"defKey": "evaluation_status",
"defName": "閴村畾鐘舵��",
- "comment": "寰呴壌瀹氥�侀壌瀹氫腑銆佺淮淇涓讳换绛惧瓧銆佸伐鑹轰汉鍛樼瀛椼�佹妧鏈富绠＄瀛椼�佽澶囨楠屽憳绛惧瓧銆佸凡瀹屾垚銆佸凡閿佸畾銆佸彉鏇翠腑銆佸凡杩囨湡",
+ "comment": "寰呴壌瀹氥�侀壌瀹氫腑銆佺淮淇涓讳换绛惧瓧銆佸伐鑹轰汉鍛樼瀛椼�佷娇鐢ㄥ崟浣嶆妧鏈富绠＄瀛椼�佽澶囨楠屽憳绛惧瓧銆佸凡瀹屾垚銆佸凡閿佸畾銆佸彉鏇翠腑銆佸凡杩囨湡",
"type": "",
"len": "",
"scale": "",
@@ -24899,7 +24899,7 @@
"baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
},
{
- "defKey": "repair_manager_signature_time_1",
+ "defKey": "repair_manager_signature_time",
"defName": "缁翠慨瀹や富浠荤瀛楁椂闂�",
"comment": "",
"type": "",
@@ -24925,6 +24925,24 @@
"attr9": "",
"id": "ADE87D39-0E76-4D32-8C2E-05F1D4C0B137",
"baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
+ },
+ {
+ "defKey": "repair_manager_comment",
+ "defName": "缁翠慨瀹や富浠绘剰瑙�",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "0F13D1D1-36B5-4A0D-BD5B-AFDA084E1DDB"
},
{
"defKey": "sample_check_result",
@@ -24979,6 +24997,78 @@
"extProps": {},
"domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
"id": "CD0EC1A3-9216-45AE-A386-43654B1F1F3C"
+ },
+ {
+ "defKey": "process_technician_comment",
+ "defName": "宸ヨ壓鍛樻剰瑙�",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "47FF3E75-03DE-4CF8-B26E-6648E50AFF57"
+ },
+ {
+ "defKey": "depart_technical_leader_signature",
+ "defName": "浣跨敤鍗曚綅鎶�鏈富绠＄瀛�",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+ "id": "6ADA4571-938B-45C3-94E9-597976870FC9"
+ },
+ {
+ "defKey": "depart_technical_leader_signature_time",
+ "defName": "浣跨敤鍗曚綅鎶�鏈富绠＄瀛楁椂闂�",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "0B2E03D2-7AE1-447D-AE76-91D7287805A9"
+ },
+ {
+ "defKey": "depart_technical_leader_comment",
+ "defName": "浣跨敤鍗曚綅鎶�鏈富绠℃剰瑙�",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "83DD647B-8CF8-431D-AFF0-E73ECE6A107D"
},
{
"defKey": "evaluation_result",
@@ -25073,6 +25163,24 @@
"baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
},
{
+ "defKey": "inspector_comment",
+ "defName": "璁惧妫�鏌ヤ汉鎰忚",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "8DA86471-B224-4E8C-9290-9C3BF5BC2B5D"
+ },
+ {
"defKey": "hf_code_a",
"defName": "闄勫綍A HF缂栫爜",
"comment": "",
diff --git a/db/ZHR/business_code_zhr.sql b/db/ZHR/business_code_zhr.sql
new file mode 100644
index 0000000..ef24b26
--- /dev/null
+++ b/db/ZHR/business_code_zhr.sql
@@ -0,0 +1,3 @@
+--鎶�鏈姸鎬侀壌瀹氱浉鍏崇紪鐮佽鍒�
+INSERT INTO [dbo].[sys_business_code_rule] ([id], [create_by], [create_time], [update_by], [update_time], [del_flag], [business_name], [business_code], [prefix], [year_format], [month_format], [day_format], [seq_length]) VALUES (N'1942396178475687937', N'admin', '2025-07-08 09:31:51.5660000', NULL, NULL, 0, N'鎶�鏈姸鎬侀壌瀹氳鑼冪紪鐮佽鍒�', N'TechnicalStatusStandardCodeRule', N'TSES', N'yyyy', NULL, NULL, 4);
+INSERT INTO [dbo].[sys_business_code_rule] ([id], [create_by], [create_time], [update_by], [update_time], [del_flag], [business_name], [business_code], [prefix], [year_format], [month_format], [day_format], [seq_length]) VALUES (N'1943153060836503553', N'admin', '2025-07-10 11:39:26.4060000', NULL, NULL, 0, N'鎶�鏈姸鎬侀壌瀹氬伐鍗曠紪鐮佽鍒�', N'TechnicalStatusEvaluationOrderCodeRule', N'TSEO', N'yyyy', NULL, NULL, 4);
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
index a45204b..c75dbbb 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
@@ -29,6 +29,8 @@
String SCRAP_CODE_RULE = "EquipmentScrapCodeRule";
//鎶�鏈姸鎬侀壌瀹氳鑼冪紪鐮佽鍒�
String TECHNICAL_STATUS_EVALUATION_STANDARD_CODE_RULE = "TechnicalStatusStandardCodeRule";
+ //鎶�鏈姸鎬侀壌瀹氬伐鍗曠紪鐮佽鍒�
+ String TECHNICAL_STATUS_EVALUATION_ORDER_CODE_RULE = "TechnicalStatusEvaluationOrderCodeRule";
/**
* 澶囦欢璇疯喘鍗曠姸鎬� 1:宸插垱寤� 2:宸叉彁浜� 3:宸查�氳繃 4:宸查┏鍥� 5:宸插畬鎴�
*/
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EamTechnicalStatusEvaluationOrderEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EamTechnicalStatusEvaluationOrderEnum.java
new file mode 100644
index 0000000..46d09bc
--- /dev/null
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EamTechnicalStatusEvaluationOrderEnum.java
@@ -0,0 +1,15 @@
+package org.jeecg.modules.eam.constant;
+
+public enum EamTechnicalStatusEvaluationOrderEnum {
+ WAIT_EVALUATION, //寰呴壌瀹�
+ UNDER_EVALUATION, //閴村畾涓�
+ repair_manager_signing, //缁翠慨瀹や富浠荤瀛�
+ PROCESS_TECHNICIAN_SIGNING, //宸ヨ壓浜哄憳绛惧瓧
+ DEPART_TECHNICAL_LEADER_SIGNING, //浣跨敤鍗曚綅鎶�鏈富绠＄瀛�
+ INSPECTOR_SIGNING, //璁惧妫�楠屽憳绛惧瓧
+ COMPLETED, //宸插畬鎴�
+ LOCKED, //宸查攣瀹�
+ CHANGING, //鍙樻洿涓�
+ EXPIRED, //宸茶繃鏈�
+ ;
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java
index 7b5cbe9..c3a7cc4 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.controller;
+import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -8,9 +9,13 @@
import org.jeecg.common.api.vo.Result;
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.OrderCreationMethodEnum;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderQuery;
+import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderRequest;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderService;
+import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -27,7 +32,8 @@
public class EamTechnicalStatusEvaluationOrderController extends JeecgController<EamTechnicalStatusEvaluationOrder, IEamTechnicalStatusEvaluationOrderService> {
@Autowired
private IEamTechnicalStatusEvaluationOrderService eamTechnicalStatusEvaluationOrderService;
-
+ @Autowired
+ private ISysBusinessCodeRuleService businessCodeRuleService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -49,14 +55,26 @@
/**
* 娣诲姞
*
- * @param eamTechnicalStatusEvaluationOrder
+ * @param request
* @return
*/
@AutoLog(value = "鎶�鏈姸鎬侀壌瀹氬伐鍗�-娣诲姞")
@ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗�-娣诲姞", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗�-娣诲姞")
@PostMapping(value = "/add")
- public Result<?> add(@RequestBody EamTechnicalStatusEvaluationOrder eamTechnicalStatusEvaluationOrder) {
- eamTechnicalStatusEvaluationOrderService.save(eamTechnicalStatusEvaluationOrder);
+ public Result<?> add(@RequestBody EamTechnicalStatusEvaluationOrderRequest request) {
+ if (request == null) {
+ return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ if (CollectionUtil.isEmpty(request.getTableDetailList())) {
+ return Result.error("妫�鏌ラ」涓嶈兘涓虹┖锛�");
+ }
+ String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.TECHNICAL_STATUS_EVALUATION_ORDER_CODE_RULE);
+ request.setOrderNum(codeSeq);
+ request.setCreationMethod(OrderCreationMethodEnum.MANUAL.name());
+ boolean b = eamTechnicalStatusEvaluationOrderService.addTechnicalStatusEvaluationOrder(request);
+ if (!b) {
+ return Result.error("娣诲姞澶辫触锛�");
+ }
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 44ce3da..58973d0 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
@@ -94,7 +94,10 @@
private String repairManagerSignature;
/**缁翠慨瀹や富浠荤瀛楁椂闂�*/
@ApiModelProperty(value = "缁翠慨瀹や富浠荤瀛楁椂闂�")
- private Date repairManagerSignatureTime1;
+ private Date repairManagerSignatureTime;
+ /**缁翠慨瀹や富浠绘剰瑙�*/
+ @ApiModelProperty(value = "缁翠慨瀹や富浠绘剰瑙�")
+ private String repairManagerComment;
/**璇曚欢妫�鏌ョ粨鏋�;鍚堟牸銆佷笉鍚堟牸*/
@ApiModelProperty(value = "璇曚欢妫�鏌ョ粨鏋�;鍚堟牸銆佷笉鍚堟牸")
private String sampleCheckResult;
@@ -104,6 +107,18 @@
/**宸ヨ壓鍛樼瀛楁椂闂�*/
@ApiModelProperty(value = "宸ヨ壓鍛樼瀛楁椂闂�")
private Date processTechnicianSignatureTime;
+ /**宸ヨ壓鍛樻剰瑙�*/
+ @ApiModelProperty(value = "宸ヨ壓鍛樻剰瑙�")
+ private String processTechnicianComment;
+ /**浣跨敤鍗曚綅鎶�鏈富绠＄瀛�*/
+ @ApiModelProperty(value = "浣跨敤鍗曚綅鎶�鏈富绠＄瀛�")
+ private String departTechnicalLeaderSignature;
+ /**浣跨敤鍗曚綅鎶�鏈富绠＄瀛楁椂闂�*/
+ @ApiModelProperty(value = "浣跨敤鍗曚綅鎶�鏈富绠＄瀛楁椂闂�")
+ private Date departTechnicalLeaderSignatureTime;
+ /**浣跨敤鍗曚綅鎶�鏈富绠℃剰瑙�*/
+ @ApiModelProperty(value = "浣跨敤鍗曚綅鎶�鏈富绠℃剰瑙�")
+ private String departTechnicalLeaderComment;
/**閴村畾缁撴灉;鍚堟牸銆侀檺鐢ㄣ�佺鐢�*/
@ApiModelProperty(value = "閴村畾缁撴灉;鍚堟牸銆侀檺鐢ㄣ�佺鐢�")
private String evaluationResult;
@@ -116,6 +131,9 @@
/**璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿*/
@ApiModelProperty(value = "璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿")
private Date inspectorSignatureTime;
+ /**璁惧妫�鏌ヤ汉鎰忚*/
+ @ApiModelProperty(value = "璁惧妫�鏌ヤ汉鎰忚")
+ private String inspectorComment;
/**闄勫綍A HF缂栫爜*/
@ApiModelProperty(value = "闄勫綍A HF缂栫爜")
private String hfCodeA;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderRequest.java
new file mode 100644
index 0000000..b4f75fe
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderRequest.java
@@ -0,0 +1,74 @@
+package org.jeecg.modules.eam.request;
+
+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.modules.eam.entity.EamTechnicalStatusEvaluationOrderDetail;
+import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="鎶�鏈姸鎬侀壌瀹氬伐鍗曞璞�", description="鎶�鏈姸鎬侀壌瀹氬伐鍗�")
+public class EamTechnicalStatusEvaluationOrderRequest extends FlowTaskVo implements Serializable {
+ /**涓婚敭*/
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**宸ュ崟鍙�*/
+ @ApiModelProperty(value = "宸ュ崟鍙�")
+ private String orderNum;
+ /**璁惧ID*/
+ @ApiModelProperty(value = "璁惧ID")
+ private String equipmentId;
+ /**瑙勮寖ID*/
+ @ApiModelProperty(value = "瑙勮寖ID")
+ private String standardId;
+ /**璁″垝閴村畾鏃ユ湡*/
+ @ApiModelProperty(value = "璁″垝閴村畾鏃ユ湡")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date evaluationDate;
+ /**閴村畾浜�*/
+ @ApiModelProperty(value = "閴村畾浜�")
+ private String evaluator;
+ /**鍒涘缓鏂瑰紡*/
+ @ApiModelProperty(value = "鍒涘缓鏂瑰紡")
+ private String creationMethod;
+ /**澶囨敞*/
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+ /**鍒楄〃 淇濆吇椤规槑缁�*/
+ @ApiModelProperty(value = "鍒楄〃 妫�鏌ラ」鏄庣粏")
+ private List<EamTechnicalStatusEvaluationOrderDetail> tableDetailList;
+
+ //瀹℃壒鎿嶄綔
+ /**瀹夊叏瑁呯疆妫�鏌ョ粨鏋�;鏄�佸惁*/
+ @ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ョ粨鏋�;鏄�佸惁")
+ private String safetyEquipmentCheckResult;
+ /**绮惧害鍙傛暟妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤*/
+ @ApiModelProperty(value = "绮惧害鍙傛暟妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤")
+ private String precisionCheckResult;
+ /**鍔熻兘鐘舵�佹鏌ョ粨鏋�;鏄�佸惁*/
+ @ApiModelProperty(value = "鍔熻兘鐘舵�佹鏌ョ粨鏋�;鏄�佸惁")
+ private String functionalCheckResult;
+ /**鍏朵粬妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤*/
+ @ApiModelProperty(value = "鍏朵粬妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤")
+ private String otherCheckResult;
+ /**璇曚欢妫�鏌ョ粨鏋�;鍚堟牸銆佷笉鍚堟牸*/
+ @ApiModelProperty(value = "璇曚欢妫�鏌ョ粨鏋�;鍚堟牸銆佷笉鍚堟牸")
+ private String sampleCheckResult;
+ /**閴村畾缁撴灉;鍚堟牸銆侀檺鐢ㄣ�佺鐢�*/
+ @ApiModelProperty(value = "閴村畾缁撴灉;鍚堟牸銆侀檺鐢ㄣ�佺鐢�")
+ private String evaluationResult;
+ /**闄怽绂佺敤鍘熷洜(澶氶��);瀹夊叏瑁呯疆銆佽澶囧姛鑳姐�佺簿搴︺�佽瘯浠躲�佸叾浠�*/
+ @ApiModelProperty(value = "闄�/绂佺敤鍘熷洜(澶氶��);瀹夊叏瑁呯疆銆佽澶囧姛鑳姐�佺簿搴︺�佽瘯浠躲�佸叾浠�")
+ private String evaluationReason;
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderService.java
index 3a39770..779c744 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderService.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderQuery;
+import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderRequest;
/**
* @Description: 鎶�鏈姸鎬侀壌瀹氬伐鍗�
@@ -21,4 +22,11 @@
* @return
*/
IPage<EamTechnicalStatusEvaluationOrder> queryPageList(Page<EamTechnicalStatusEvaluationOrder> page, EamTechnicalStatusEvaluationOrderQuery query);
+
+ /**
+ * 鎵嬪姩娣诲姞鎶�鏈壌瀹氬伐鍗�
+ * @param request
+ * @return
+ */
+ boolean addTechnicalStatusEvaluationOrder(EamTechnicalStatusEvaluationOrderRequest request);
}
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 3cd996f..6398882 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
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,11 +11,15 @@
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
+import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.constant.EamTechnicalStatusEvaluationOrderEnum;
+import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder;
import org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationOrderMapper;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderQuery;
+import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderRequest;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderDetailService;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderService;
@@ -25,6 +30,7 @@
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
@@ -113,4 +119,35 @@
queryWrapper.orderByDesc("ems.create_time");
return this.getBaseMapper().queryPageList(page, queryWrapper);
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean addTechnicalStatusEvaluationOrder(EamTechnicalStatusEvaluationOrderRequest request) {
+ EamEquipment equipment = equipmentService.getById(request.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紝娣诲姞澶辫触锛�");
+ }
+ EamTechnicalStatusEvaluationOrder order = new EamTechnicalStatusEvaluationOrder();
+ order.setOrderNum(request.getOrderNum());
+ order.setEquipmentId(request.getEquipmentId());
+ order.setStandardId(request.getStandardId());
+ order.setEvaluationDate(request.getEvaluationDate());
+ order.setEvaluator(request.getEvaluator());
+ order.setRemark(request.getRemark());
+ //鐘舵�佸垵濮嬪寲
+ order.setEvaluationStatus(EamTechnicalStatusEvaluationOrderEnum.WAIT_EVALUATION.name());
+ order.setCreationMethod(request.getCreationMethod());
+ //鍒犻櫎鏍囪
+ order.setDelFlag(CommonConstant.DEL_FLAG_0);
+ this.getBaseMapper().insert(order);
+ //澶勭悊鏄庣粏鏁版嵁
+ if (CollectionUtil.isNotEmpty(request.getTableDetailList())) {
+ request.getTableDetailList().forEach(tableDetail -> {
+ tableDetail.setId(null);
+ tableDetail.setOrderId(order.getId());
+ });
+ orderDetailService.saveBatch(request.getTableDetailList());
+ }
+ return true;
+ }
}
--
Gitblit v1.9.3