From 936d2311eb6dd189364dc38500341afebb636481 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 22 七月 2025 14:29:04 +0800
Subject: [PATCH] art: 技术状态鉴定申请-字段修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationApplication.java | 7 ++-
db/430设备管理数据库设计.pdma.json | 60 ++++++++++++++++++++++++++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationApplicationController.java | 23 ++++++++++-
3 files changed, 82 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 99ef71c..dc43291 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-21 18:29:46",
+ "updatedTime": "2025-7-22 14:27:53",
"dbConns": [],
"profile": {
"default": {
@@ -2328,7 +2328,7 @@
"id": "951E3090-8A27-4E30-A5F0-308B3E9F8E6D"
},
{
- "defKey": "technology_genarate_flag",
+ "defKey": "technology_generate_flag",
"defName": "鎶�鏈姸鎬侀壌瀹氱敓鎴愭爣璁�",
"comment": "1 宸茬敓鎴� 0 涓嬫寰呯敓鎴�",
"type": "",
@@ -2346,7 +2346,7 @@
"id": "0F8E5A79-4399-42B0-B893-254A6D9DEFAD"
},
{
- "defKey": "third_maintenance_genarate_flag",
+ "defKey": "third_maintenance_generate_flag",
"defName": "涓変繚鐢熸垚鏍囪",
"comment": "1 宸茬敓鎴� 0 涓嬫寰呯敓鎴�",
"type": "",
@@ -30332,6 +30332,24 @@
"extProps": {},
"domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
"id": "589C45F0-0F8C-4497-8999-A8314DE5D601"
+ },
+ {
+ "defKey": "acceptance_check_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": "0177078A-470B-44DE-8196-D8013935A223"
}
],
"correlations": [],
@@ -30699,6 +30717,24 @@
"baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
},
{
+ "defKey": "equipment_id",
+ "defName": "璁惧ID",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+ "id": "013BD2A8-0A95-4AC3-BF62-11D03C96304F"
+ },
+ {
"defKey": "application_status",
"defName": "鐢宠鍗曠姸鎬�",
"comment": "寰呮彁浜ゃ�佸緟鍗曚綅瀹ょ骇棰嗗瀹℃牳銆佺敓浜ц澶囩鐞嗕富绠″鏍搞�佸緟淇濋殰閮ㄩ瀵煎鏍搞�佸凡浣滃簾銆佸凡瀹屾垚",
@@ -30915,6 +30951,24 @@
"attr9": "",
"id": "1FDD4335-E2A5-4925-B353-DFB1518E8893",
"baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
+ },
+ {
+ "defKey": "remark",
+ "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": "77353547-B01B-4592-BCF4-04635339597F"
}
],
"correlations": [],
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationApplicationController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationApplicationController.java
index f402727..9b4ecd9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationApplicationController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationApplicationController.java
@@ -1,14 +1,19 @@
package org.jeecg.modules.eam.controller;
import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.Feature;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
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.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationApplicationStatusEnum;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationApplication;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationApplicationQuery;
@@ -32,7 +37,10 @@
public class EamTechnicalStatusEvaluationApplicationController extends JeecgController<EamTechnicalStatusEvaluationApplication, IEamTechnicalStatusEvaluationApplicationService> {
@Autowired
private IEamTechnicalStatusEvaluationApplicationService eamTechnicalStatusEvaluationApplicationService;
-
+ @Autowired
+ private ObjectMapper objectMapper;
+ @Autowired
+ private TranslateDictTextUtils translateDictTextUtils;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -149,7 +157,18 @@
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
EamTechnicalStatusEvaluationApplication eamTechnicalStatusEvaluationApplication = eamTechnicalStatusEvaluationApplicationService.getById(id);
- return Result.OK(eamTechnicalStatusEvaluationApplication);
+ if (eamTechnicalStatusEvaluationApplication == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ try {
+ String json = objectMapper.writeValueAsString(eamTechnicalStatusEvaluationApplication);
+ JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+ translateDictTextUtils.translateField("applicant", eamTechnicalStatusEvaluationApplication.getApplicant(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("factoryOrgCode", eamTechnicalStatusEvaluationApplication.getFactoryOrgCode(), item, "eam_base_factory,factory_name,org_code");
+ return Result.OK(item);
+ } catch (JsonProcessingException e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
}
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationApplication.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationApplication.java
index 13e614c..e3e69ae 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationApplication.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationApplication.java
@@ -73,6 +73,7 @@
private Date evaluationDate;
/**鐢宠鍗曠姸鎬�;寰呮彁浜ゃ�佸緟鍗曚綅瀹ょ骇棰嗗瀹℃牳銆佺敓浜ц澶囩鐞嗕富绠″鏍搞�佸緟淇濋殰閮ㄩ瀵煎鏍搞�佸凡浣滃簾銆佸凡瀹屾垚*/
@ApiModelProperty(value = "鐢宠鍗曠姸鎬�;寰呮彁浜ゃ�佸緟鍗曚綅瀹ょ骇棰嗗瀹℃牳銆佺敓浜ц澶囩鐞嗕富绠″鏍搞�佸緟淇濋殰閮ㄩ瀵煎鏍搞�佸凡浣滃簾銆佸凡瀹屾垚")
+ @Dict(dicCode = "technical_status_evaluation_application_status")
private String applicationStatus;
/**鐢宠鍗曚綅瀹ょ骇棰嗗绛惧瓧*/
@ApiModelProperty(value = "鐢宠鍗曚綅瀹ょ骇棰嗗绛惧瓧")
@@ -85,7 +86,7 @@
private Date departHeaderSignatureTime;
/**鐢宠鍗曚綅瀹ょ骇棰嗗绛惧瓧缁撴灉*/
@ApiModelProperty(value = "鐢宠鍗曚綅瀹ょ骇棰嗗绛惧瓧缁撴灉")
- @Dict(dicCode = "approved_rejected")
+ @Dict(dicCode = "approve_reject")
private String departHeaderSignatureResult;
/**鐢宠鍗曚綅瀹ょ骇棰嗗鎰忚*/
@ApiModelProperty(value = "鐢宠鍗曚綅瀹ょ骇棰嗗鎰忚")
@@ -101,7 +102,7 @@
private Date productionHeaderSignatureTime;
/**鐢熶骇璁惧绠＄悊涓荤绛惧瓧缁撴灉*/
@ApiModelProperty(value = "鐢熶骇璁惧绠＄悊涓荤绛惧瓧缁撴灉")
- @Dict(dicCode = "approved_rejected")
+ @Dict(dicCode = "approve_reject")
private String productionHeaderSignatureResult;
/**鐢熶骇璁惧绠＄悊涓荤鎰忚*/
@ApiModelProperty(value = "鐢熶骇璁惧绠＄悊涓荤鎰忚")
@@ -117,7 +118,7 @@
private Date productionSupportSignatureTime;
/**鐢熶骇淇濋殰閮ㄩ瀵肩瀛楄В缁撴灉*/
@ApiModelProperty(value = "鐢熶骇淇濋殰閮ㄩ瀵肩瀛楄В缁撴灉")
- @Dict(dicCode = "approved_rejected")
+ @Dict(dicCode = "approve_reject")
private String productionSupportSignatureResult;
/**鐢熶骇淇濋殰閮ㄩ瀵兼剰瑙�*/
@ApiModelProperty(value = "鐢熶骇淇濋殰閮ㄩ瀵兼剰瑙�")
--
Gitblit v1.9.3