Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/entity/NewsNotice.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;
 
 /**
@@ -16,7 +14,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-08-10
+ * @since 2019-09-03
  */
 @TableName("tb_news_notice")
 public class NewsNotice extends Model<NewsNotice> {
@@ -42,13 +40,13 @@ public class NewsNotice extends Model<NewsNotice> {
     private String projectName;
 
     /**
-     * 引用的外部表id(模具，文档，设备)
+     * 引用的外部表id(模具，文档，模具，模具)
      */
     @TableField("ref_id")
     private Integer refId;
 
     /**
-     * 消息提醒类型0-审批，1-保养，2-告警
+     * 消息提醒类型0-审批，1-保养，2-告警，3-待报废
      */
     @TableField("notice_type")
     private Integer noticeType;
@@ -58,19 +56,19 @@ public class NewsNotice extends Model<NewsNotice> {
      */
     @TableField("content")
     private String content;
-    /**
-     * 文件类型 0-模具文档，1-零件文档，2-试模验收 3-保养方案 4-模具更新 5-模具报废
-     */
-    @TableField("belong_type")
-    private Integer belongType;
 
     /**
      * 时间
      */
     @TableField("indate")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
+    /**
+     * 文件类型0-模具文档，1-零件文档，2-试模验收 3-保养方案 4-模具更新 5-模具报废，2-试模验收 3-保养方案 4-模具更新 5-模具报废
+     */
+    @TableField("belong_type")
+    private Integer belongType;
+
 
     public Integer getId() {
         return id;
@@ -128,11 +126,6 @@ public class NewsNotice extends Model<NewsNotice> {
         this.indate = indate;
     }
 
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
     public Integer getBelongType() {
         return belongType;
     }
@@ -142,7 +135,11 @@ public class NewsNotice extends Model<NewsNotice> {
     }
 
     @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
 
+    @Override
     public String toString() {
         return "NewsNotice{" +
         "id=" + id +
@@ -152,6 +149,7 @@ public class NewsNotice extends Model<NewsNotice> {
         ", noticeType=" + noticeType +
         ", content=" + content +
         ", indate=" + indate +
+        ", belongType=" + belongType +
         "}";
     }
 }

cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("vnotice_user");
+        strategy.setInclude("tb_news_notice");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

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

@@ -11,11 +11,12 @@
         <result column="notice_type" property="noticeType" />
         <result column="content" property="content" />
         <result column="indate" property="indate" />
+        <result column="belong_type" property="belongType" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_id, project_name, ref_id, notice_type, content, indate
+        id, project_id, project_name, ref_id, notice_type, content, indate, belong_type
     </sql>
 
 </mapper>