From 1480713e39834be5280e8f10df9ba74a19f57f7c Mon Sep 17 00:00:00 2001
From: 79493 <794930212@qq.com>
Date: Mon, 21 Nov 2022 10:30:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97->=E4=BC=81=E4=B8=9A=E7=AB=AFPC,=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/rzyc/model/EntDeviceMaintenanceRecord.java   | 11 +++++++++++
 .../java/com/rzyc/model/EntInspectionRecord.java     | 12 ++++++++++++
 .../java/com/rzyc/model/EntOperatingInstruction.java | 12 ++++++++++++
 .../src/main/java/com/rzyc/model/EntRepairPlan.java  |  4 ++++
 .../java/com/rzyc/model/dto/InspectionRecordDto.java |  2 ++
 .../java/com/rzyc/service/PcBusinessService.java     |  2 ++
 6 files changed, 43 insertions(+)

diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntDeviceMaintenanceRecord.java b/inventory-dao/src/main/java/com/rzyc/model/EntDeviceMaintenanceRecord.java
index 78a5536..e99bbe1 100644
--- a/inventory-dao/src/main/java/com/rzyc/model/EntDeviceMaintenanceRecord.java
+++ b/inventory-dao/src/main/java/com/rzyc/model/EntDeviceMaintenanceRecord.java
@@ -91,6 +91,17 @@ public class EntDeviceMaintenanceRecord implements Serializable {
     @TableField("modify_time")
     private Date modifyTime;
 
+    @ApiModelProperty(value = "设备id")
+    private String deviceId;
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
     public String getRecordId() {
         return recordId;
     }
diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntInspectionRecord.java b/inventory-dao/src/main/java/com/rzyc/model/EntInspectionRecord.java
index eb9fc42..ad6e2d1 100644
--- a/inventory-dao/src/main/java/com/rzyc/model/EntInspectionRecord.java
+++ b/inventory-dao/src/main/java/com/rzyc/model/EntInspectionRecord.java
@@ -62,6 +62,18 @@ public class EntInspectionRecord implements Serializable {
     @TableField("modify_time")
     private Date modifyTime;
 
+    @ApiModelProperty("设备id")
+    @TableField("device_id")
+    private String deviceId;
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
     public Integer getInspectionId() {
         return inspectionId;
     }
diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntOperatingInstruction.java b/inventory-dao/src/main/java/com/rzyc/model/EntOperatingInstruction.java
index 6fed688..f855f7b 100644
--- a/inventory-dao/src/main/java/com/rzyc/model/EntOperatingInstruction.java
+++ b/inventory-dao/src/main/java/com/rzyc/model/EntOperatingInstruction.java
@@ -45,6 +45,18 @@ public class EntOperatingInstruction implements Serializable {
     @TableField("modify_time")
     private Date modifyTime;
 
+    @ApiModelProperty("设备id")
+    @TableField(value = "device_id")
+    private String deviceId;
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
     public String getOpInstructionId() {
         return opInstructionId;
     }
diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntRepairPlan.java b/inventory-dao/src/main/java/com/rzyc/model/EntRepairPlan.java
index c8d3513..4621d2e 100644
--- a/inventory-dao/src/main/java/com/rzyc/model/EntRepairPlan.java
+++ b/inventory-dao/src/main/java/com/rzyc/model/EntRepairPlan.java
@@ -61,6 +61,10 @@ public class EntRepairPlan implements Serializable {
     @TableField("modify_by")
     private String modifyBy;
 
+
+
+
+
     public String getRepairPlanId() {
         return repairPlanId;
     }
diff --git a/inventory-dao/src/main/java/com/rzyc/model/dto/InspectionRecordDto.java b/inventory-dao/src/main/java/com/rzyc/model/dto/InspectionRecordDto.java
index fdebb5a..2bada39 100644
--- a/inventory-dao/src/main/java/com/rzyc/model/dto/InspectionRecordDto.java
+++ b/inventory-dao/src/main/java/com/rzyc/model/dto/InspectionRecordDto.java
@@ -36,6 +36,8 @@ public class InspectionRecordDto {
     @ApiModelProperty(value = "检查结果")
     private String inspectionText;
 
+
+
     public Integer getInspectionId() {
         return inspectionId;
     }
diff --git a/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java b/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java
index 782923c..65c7dc9 100644
--- a/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java
+++ b/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java
@@ -579,6 +579,7 @@ public class PcBusinessService extends BaseController {
         if (null != entDeviceMaintenanceRecordDto && null != entDeviceMaintenanceRecord.getRecordId()){
             result = entDeviceMaintenanceRecordMapper.UpdateEntDeviceMaintenanceRecord(entDeviceMaintenanceRecord);
         }else {
+            entDeviceMaintenanceRecord.setRecordId(RandomNumber.getUUid());
             result = entDeviceMaintenanceRecordMapper.insert(entDeviceMaintenanceRecord);
         }
         if (result != 1 ){
@@ -696,6 +697,7 @@ public class PcBusinessService extends BaseController {
         if (null != operatingInstructionsDto && null != entOperatingInstruction.getOpInstructionId()){
             result = entOperatingInstructionMapper.updateEntOperatingInstruction(entOperatingInstruction);
         }else {
+            entOperatingInstruction.setOpInstructionId(RandomNumber.getUUid());
             result = entOperatingInstructionMapper.insert(entOperatingInstruction);
         }
         if (result != 1 ){