From 688d546088329eb5ec2780de2d9048448cfc0a37 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期一, 25 十二月 2023 11:50:25 +0800
Subject: [PATCH] ABC评分
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/ABCAssessment.java | 2 ++
lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_12_11(lnl)/lnl_12_25.sql | 8 ++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java | 2 +-
3 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java
index 6ddd177..b714a49 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java
@@ -615,7 +615,7 @@
List<EquipmentMaintenancePlanDetail> details = new ArrayList<>();
for(ABCAssessment abcAssessment:abcAssessments){
Equipment equipment = equipmentService.getById(abcAssessment.getEquipmentId());
- String oldStandard = equipment.getEquipmentImportanceId();
+ String oldStandard = abcAssessment.getOldStandard();
String newStandard = abcAssessment.getFinalStandard();
LocalDate currentDate = LocalDate.now();
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/ABCAssessment.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/ABCAssessment.java
index 51b87b5..6db5e68 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/ABCAssessment.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/ABCAssessment.java
@@ -80,4 +80,6 @@
@TableField(exist = false)
@Dict(dicCode = "ABC-standard-result")
private String equipmentImportanceId;
+ @Dict(dicCode = "ABC-standard-result")
+ private String oldStandard;
}
diff --git "a/lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_12_11\050lnl\051/lnl_12_25.sql" "b/lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_12_11\050lnl\051/lnl_12_25.sql"
new file mode 100644
index 0000000..50fe0da
--- /dev/null
+++ "b/lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_12_11\050lnl\051/lnl_12_25.sql"
@@ -0,0 +1,8 @@
+ALTER TABLE [dbo].[mom_eam_ABC_assessment] ADD [old_standard] nvarchar(16) NULL
+ GO
+
+ EXEC sp_addextendedproperty
+ 'MS_Description', N'鑰佺粨鏋�',
+ 'SCHEMA', N'dbo',
+ 'TABLE', N'mom_eam_ABC_assessment',
+ 'COLUMN', N'old_standard'
--
Gitblit v1.9.3