From d6372da6f37778e90a4bae02865e8ec77e980b6e Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 17 七月 2025 17:14:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
db/430设备管理数据库设计.pdma.json | 270 ++++++++++++++------------------------------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml | 1
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 56 +++++----
3 files changed, 118 insertions(+), 209 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 0e51ced..621ea76 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"
@@ -2,9 +2,9 @@
"name": "430璁惧绠＄悊鏁版嵁搴撹璁�",
"describe": "鎻忚堪璁惧绠＄悊鏁版嵁搴撹璁℃枃妗�",
"avatar": "",
- "version": "4.9.2",
+ "version": "4.9.4",
"createdTime": "2025-3-10 16:38:19",
- "updatedTime": "2025-7-17 16:47:12",
+ "updatedTime": "2025-7-17 16:59:40",
"dbConns": [],
"profile": {
"default": {
@@ -11554,6 +11554,34 @@
"id": "D5F4AD3E-A9C5-41BB-A699-720C3EAEC040"
},
{
+ "defKey": "equipment_id",
+ "defName": "璁惧ID",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+ "refDict": "",
+ "extProps": {},
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "5E70FFE3-D311-4F92-945D-9065CCB784A6",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
+ },
+ {
"defKey": "is_processed",
"defName": "鏄惁鍔犲伐",
"comment": "鍔犲伐銆佹湭鍔犲伐",
@@ -12003,24 +12031,6 @@
"id": "0F23B314-8745-474C-8A0A-81B54056C044"
},
{
- "defKey": "processing_part",
- "defName": "鍔犲伐闆朵欢鍙�",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": true,
- "refDict": "",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
- "extProps": {},
- "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
- "id": "7A45AA5D-1A2D-484F-B564-FAE0428A59E6"
- },
- {
"defKey": "report_id",
"defName": "鎶ヤ慨ID",
"comment": "",
@@ -12075,24 +12085,6 @@
"attr9": "",
"id": "E6F3DCBF-206B-43F5-B96D-C044CE796DC4",
"baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
- },
- {
- "defKey": "quantity",
- "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": "B172710B-177A-4760-818A-265145802A2A"
},
{
"defKey": "confirmer",
@@ -12744,60 +12736,6 @@
"attr9": "",
"id": "0B7D9130-C3AE-4277-AEFA-964E1805CD0D",
"baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
- },
- {
- "defKey": "scrap_part_number",
- "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": "F66CFA1B-E017-4A63-A8EB-CD9EE225619E"
- },
- {
- "defKey": "scrap_part_quantity",
- "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": "6D8029F4-851D-4588-9B47-FD1FF9607D71"
- },
- {
- "defKey": "scrap_part_value",
- "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": "5B769D79-D7E9-4600-B63B-C049C80D465A"
},
{
"defKey": "operation_certificate",
@@ -14081,6 +14019,62 @@
"attr9": "",
"id": "6AE68254-FA3D-4CBE-94B4-1A13BDC7DE19",
"baseType": ""
+ },
+ {
+ "defKey": "report_id",
+ "defName": "鎶ヤ慨ID",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+ "refDict": "",
+ "extProps": {},
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "FE265CE7-8F30-40CE-A734-220CBB217C2C",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
+ },
+ {
+ "defKey": "equipment_id",
+ "defName": "璁惧ID",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+ "refDict": "",
+ "extProps": {},
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "05318404-070F-4C0B-B49E-9B38FDC05661",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
}
],
"correlations": [],
@@ -30579,24 +30573,6 @@
"id": "054483BD-F2AA-4DD4-9A80-704EE7CDB735"
},
{
- "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": "725DECE8-22D5-4ABF-9EF1-08F2ABA68507"
- },
- {
"defKey": "applicant",
"defName": "鐢宠浜�",
"comment": "",
@@ -30681,24 +30657,6 @@
"baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
},
{
- "defKey": "evaluation_date",
- "defName": "鎶�鏈姸鎬侀壌瀹氭棩鏈�",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098",
- "extProps": {},
- "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
- "id": "FB0A5850-827B-47B9-8034-417FE43618DE"
- },
- {
"defKey": "application_status",
"defName": "鐢宠鍗曠姸鎬�",
"comment": "寰呮彁浜ゃ�佸緟鍗曚綅瀹ょ骇棰嗗瀹℃牳銆佺敓浜ц澶囩鐞嗕富绠″鏍搞�佸緟淇濋殰閮ㄩ瀵煎鏍搞�佸凡浣滃簾銆佸凡瀹屾垚",
@@ -30763,24 +30721,6 @@
"id": "69D24654-9C0B-41E5-BACA-8205ADC593B5"
},
{
- "defKey": "depart_header_signature_result",
- "defName": "鐢宠鍗曚綅瀹ょ骇棰嗗绛惧瓧缁撴灉",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
- "extProps": {},
- "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
- "id": "12E6E83C-632B-4282-B140-0A3ADA001810"
- },
- {
"defKey": "depart_header_comment",
"defName": "鐢宠鍗曚綅瀹ょ骇棰嗗鎰忚",
"comment": "",
@@ -30818,7 +30758,7 @@
},
{
"defKey": "production_header_signature_time",
- "defName": "鐢熶骇璁惧绠＄悊涓荤绛惧瓧鏃堕棿",
+ "defName": "鐢熶骇璁惧绠＄悊涓荤绛惧瓧鍥涗欢",
"comment": "",
"type": "",
"len": "",
@@ -30833,24 +30773,6 @@
"extProps": {},
"domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
"id": "211441D2-7629-4881-8140-77EBB38A346E"
- },
- {
- "defKey": "production_header_signature_result",
- "defName": "鐢熶骇璁惧绠＄悊涓荤绛惧瓧缁撴灉",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
- "extProps": {},
- "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
- "id": "75B946F2-25CB-4A20-9ABF-CE46C4F8F22E"
},
{
"defKey": "production_header_comment",
@@ -30905,24 +30827,6 @@
"extProps": {},
"domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
"id": "235E86E2-B79D-456A-AFA0-0402225859F7"
- },
- {
- "defKey": "production_support_signature_result",
- "defName": "鐢熶骇淇濋殰閮ㄩ瀵肩瀛楃粨鏋�",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
- "extProps": {},
- "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
- "id": "E0246F70-42C2-4A36-8594-1A001E5CDB91"
},
{
"defKey": "production_support_comment",
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml
index de02038..17d2d32 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml
@@ -112,6 +112,7 @@
LEFT JOIN eam_equipment t2 ON t1.equipment_id = t2.id
LEFT JOIN eam_inspection_order t3 ON t3.inspection_date = t1.plan_inspection_date
AND t3.equipment_id = t1.equipment_id
+ AND t1.inspector IS NOT NULL
WHERE
t2.equipment_code = #{equipmentCode}
AND t3.inspection_date LIKE CONCAT(#{inspectionDate},'%')
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
index 487d9fc..c91a37c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
@@ -252,19 +252,21 @@
for (int i = 1; i <= 31; i++) {
if (collect.containsKey(i)) {
String inspectionResult = "";
- switch (collect.get(i).getInspectionResult()) {
- case "NORMAL":
- inspectionResult = "鈭�";
- break;
- case "ANOMALY":
- inspectionResult = "脳";
- break;
- case "FAULT":
- inspectionResult = "鈻�";
- break;
- case "CLOSE":
- inspectionResult = "T";
- break;
+ if (!StrUtils.isEmpty(collect.get(i).getInspectionResult())) {
+ switch (collect.get(i).getInspectionResult()) {
+ case "NORMAL":
+ inspectionResult = "鈭�";
+ break;
+ case "ANOMALY":
+ inspectionResult = "脳";
+ break;
+ case "FAULT":
+ inspectionResult = "鈻�";
+ break;
+ case "CLOSE":
+ inspectionResult = "T";
+ break;
+ }
}
resultMap.put("inspectionResult" + i, inspectionResult);
} else {
@@ -386,19 +388,21 @@
for (int i = 1; i <= 5; i++) {
if (collect.containsKey(i)) {
String inspectionResult = "";
- switch (collect.get(i).getInspectionResult()) {
- case "NORMAL":
- inspectionResult = "鈭�";
- break;
- case "ANOMALY":
- inspectionResult = "脳";
- break;
- case "FAULT":
- inspectionResult = "鈻�";
- break;
- case "CLOSE":
- inspectionResult = "T";
- break;
+ if (!StrUtils.isEmpty(collect.get(i).getInspectionResult())) {
+ switch (collect.get(i).getInspectionResult()) {
+ case "NORMAL":
+ inspectionResult = "鈭�";
+ break;
+ case "ANOMALY":
+ inspectionResult = "脳";
+ break;
+ case "FAULT":
+ inspectionResult = "鈻�";
+ break;
+ case "CLOSE":
+ inspectionResult = "T";
+ break;
+ }
}
resultMap.put("inspectionResult" + i, inspectionResult);
} else {
--
Gitblit v1.9.3