Sfoglia il codice sorgente

零件的添加与修改

5 anni fa
parent
commit
da7e67de91

+ 15 - 3
cloud-model/src/main/java/com/hssx/cloudmodel/entity/Part.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 import java.io.Serializable;
 
 /**
@@ -45,7 +43,6 @@ public class Part extends Model<Part> {
      * 添加的时间
      */
     @TableField("indate")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**
@@ -72,6 +69,12 @@ public class Part extends Model<Part> {
     @TableField("creator")
     private String creator;
 
+    /**
+     * 模具id
+     */
+    @TableField("mould_id")
+    private Integer mouldId;
+
 
     public Integer getId() {
         return id;
@@ -137,6 +140,14 @@ public class Part extends Model<Part> {
         this.creator = creator;
     }
 
+    public Integer getMouldId() {
+        return mouldId;
+    }
+
+    public void setMouldId(Integer mouldId) {
+        this.mouldId = mouldId;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -153,6 +164,7 @@ public class Part extends Model<Part> {
         ", isVulnerable=" + isVulnerable +
         ", creatorId=" + creatorId +
         ", creator=" + creator +
+        ", mouldId=" + mouldId +
         "}";
     }
 }

+ 2 - 1
cloud-model/src/main/resources/mapper/PartMapper.xml

@@ -12,11 +12,12 @@
         <result column="is_vulnerable" property="isVulnerable" />
         <result column="creator_id" property="creatorId" />
         <result column="creator" property="creator" />
+        <result column="mould_id" property="mouldId" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, part_no, part_name, indate, part_life, is_vulnerable, creator_id, creator
+        id, part_no, part_name, indate, part_life, is_vulnerable, creator_id, creator, mould_id
     </sql>
 
 </mapper>