修改模具设备选择接口

cloud-model/src/main/java/com/hssx/cloudmodel/entity/vo/MouldVO.java

@@ -2,6 +2,7 @@ package com.hssx.cloudmodel.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hssx.cloudmodel.entity.Mould;
+import lombok.Data;
 
 import java.time.LocalDateTime;
 
@@ -11,6 +12,7 @@ import java.time.LocalDateTime;
  * Description:<描述>
  * Version: 1.0
  */
+@Data
 public class MouldVO extends Mould {
     private String mouldEquipmentNo;
     private String projectName;
@@ -18,4 +20,44 @@ public class MouldVO extends Mould {
     private LocalDateTime endTime;
     private String mangerName;
     private String equipmentNo;
+
+    public String getMouldEquipmentNo() {
+        return mouldEquipmentNo;
+    }
+
+    public void setMouldEquipmentNo(String mouldEquipmentNo) {
+        this.mouldEquipmentNo = mouldEquipmentNo;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public LocalDateTime getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(LocalDateTime endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getMangerName() {
+        return mangerName;
+    }
+
+    public void setMangerName(String mangerName) {
+        this.mangerName = mangerName;
+    }
+
+    public String getEquipmentNo() {
+        return equipmentNo;
+    }
+
+    public void setEquipmentNo(String equipmentNo) {
+        this.equipmentNo = equipmentNo;
+    }
 }

cloud-model/src/main/resources/mapper/MouldMapper.xml

@@ -40,6 +40,7 @@
         <result column="is_delete" property="isDelete" />
         <result column="creator_id" property="creatorId" />
         <result column="project_id" property="projectId" />
+        <result column="projectName" property="projectName" />
         <result column="rfid" property="rfid" />
         <result column="setting_life" property="settingLife" />
         <result column="area" property="area" />
@@ -51,6 +52,8 @@
         <result column="produce_company_id" property="produceCompanyId" />
         <result column="projectName" property="projectName" />
         <result column="mangerName" property="mangerName" />
+        <result column="equipmentNo" property="equipmentNo" />
+        <result column="endTime" property="endTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -63,8 +66,10 @@
 
     <select id="selectListByCondition" resultMap="BaseResultMapVO">
         select
-          tbm.model_no model_no, tbm.model_name, tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,
-          tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbmp.equipment_no equipmentNo,tbm.setting_life setting_life
+        tbm.id id,tbm.model_no model_no, tbm.model_name,
+        tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,
+        tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,
+        tbmp.equipment_no equipmentNo,tbm.setting_life setting_life
         from
           tb_mould tbm
         left join
@@ -91,7 +96,7 @@
     </select>
     <select id="selectListByConditionByProject" resultMap="BaseResultMapVO">
         select
-        tbm.model_no model_no, tbm.model_name, tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,
+        tbm.id id,tbm.model_no model_no, tbm.model_name, tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,
         tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbmp.equipment_no equipmentNo,tbm.setting_life setting_life
         from
         tb_mould tbm