Merge remote-tracking branch 'origin/master' into master

src/main/java/com/migao/config/aop/LogAspect.java

@@ -33,7 +33,7 @@ import java.util.Map;
 @Configuration
 @Slf4j
 @Aspect
-@Component
+//@Component
 public class LogAspect {
 
     @Resource

src/main/java/com/migao/entity/po/Dictionary.java

@@ -39,6 +39,12 @@ public class Dictionary {
     @Column(name = "value", columnDefinition = "varchar(255) comment '值'")
     private String value;
 
+    @Column(name = "part_number", columnDefinition = "bigint(20) comment '环节数量'")
+    private Integer part_number;
+
+    @Column(name = "document_number", columnDefinition = "bigint(20) comment '文档数量'")
+    private Integer document_number;
+
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @Column(name = "deleted", columnDefinition = "tinyint(4) comment '逻辑删除 0未删除 1已删除'")
     private Integer deleted;

src/main/java/com/migao/entity/po/DocumentSharing.java

@@ -0,0 +1,67 @@
+package com.migao.entity.po;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @author dingsong
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Entity
+@Table(name = "t_document_share")
+@org.hibernate.annotations.Table(appliesTo = "t_document_share", comment = "文档共享")
+@TableName("t_document_share")
+public class DocumentSharing implements Serializable {
+    @Id
+    @TableId(type = IdType.AUTO)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", columnDefinition = "int comment '主键'")
+    private Integer id;
+
+    @Column(name = "document_code", columnDefinition = "bigint(20) comment '文档编码'")
+    private Integer documentCode;
+
+    @Column(name = "document_name", columnDefinition = "varchar(255) comment '文档名称'")
+    private String documentName;
+
+    @Column(name = "project_type_id", columnDefinition = "bigint(20) comment '项目类别id'")
+    private Integer projectTypeId;
+
+    @Column(name = "project_phase_id", columnDefinition = "bigint(20) comment '项目阶段id'")
+    private Integer projectPhaseId;
+
+    @Column(name = "document_format_id", columnDefinition = "bigint(20) comment '文档格式id'")
+    private Integer documentFormatId;
+
+    @Column(name = "must_project_type", columnDefinition = "varchar(255) comment '必须项目类型'")
+    private String mustProjectType;
+
+    @Column(name = "submitter", columnDefinition = "varchar(255) comment '提交人'")
+    private String submitter;
+
+    @Column(name = "submit_time", columnDefinition = "timestamp DEFAULT CURRENT_TIMESTAMP comment '提交时间'")
+    private LocalDateTime submitTime;
+
+    @Column(name = "document_id", columnDefinition = "bigint(20) comment '文档id'")
+    private Integer documentId;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @Column(name = "deleted", columnDefinition = "tinyint(4) comment '逻辑删除 0未删除 1已删除'")
+    private Integer deleted;
+
+    @Column(name = "create_time", columnDefinition = "timestamp DEFAULT CURRENT_TIMESTAMP comment '创建时间'")
+    private LocalDateTime createTime;
+
+    @JoinColumn(name = "create_user_id", columnDefinition = "bigint(20) comment '新增人'")
+    private Integer createUserId;
+}

src/main/java/com/migao/entity/po/Message.java

@@ -0,0 +1,61 @@
+package com.migao.entity.po;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @author dingsong
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Entity
+@Table(name = "t_message")
+@org.hibernate.annotations.Table(appliesTo = "t_message", comment = "我的消息")
+@TableName("t_message")
+public class Message implements Serializable {
+    @Id
+    @TableId(type = IdType.AUTO)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", columnDefinition = "int comment '主键'")
+    private Integer id;
+
+    @Column(name = "message_number", columnDefinition = "bigint(20) comment '消息序号'")
+    private Integer messageNumber;
+
+    @Column(name = "name", columnDefinition = "varchar(255) comment '标题'")
+    private String name;
+
+    @Column(name = "content", columnDefinition = "varchar(255) comment '内容'")
+    private String content;
+
+    @Column(name = "send_user_id", columnDefinition = "bigint(20) comment '发送人id'")
+    private Integer sendUserId;
+
+    @Column(name = "accept_user_id", columnDefinition = "bigint(20) comment '接收人id'")
+    private Integer acceptUserId;
+
+    @Column(name = "design_project", columnDefinition = "varchar(255) comment '设计项目'")
+    private String designProject;
+
+    @Column(name = "message_type_id", columnDefinition = "bigint(20) comment '通知类型id'")
+    private Integer messageTypeId;
+
+    @Column(name = "read", columnDefinition = "tinyint(4) comment '读取状态 0未读 1已读'")
+    private Integer read;
+
+    @Column(name = "create_time", columnDefinition = "timestamp DEFAULT CURRENT_TIMESTAMP comment '创建时间'")
+    private LocalDateTime createTime;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @Column(name = "deleted", columnDefinition = "tinyint(4) comment '逻辑删除 0未删除 1已删除'")
+    private Integer deleted;
+}

src/main/java/com/migao/entity/po/Supplier.java

@@ -77,6 +77,12 @@ public class Supplier implements Serializable {
     @Column(name = "company_create_time", columnDefinition = "timestamp DEFAULT CURRENT_TIMESTAMP comment '公司成立时间'")
     private LocalDateTime companyCreateTime;
 
+    @Column(name = "intranet_mail", columnDefinition = "varchar(255) comment '内网邮箱'")
+    private String  intranetMail;
+
+    @Column(name = "outside_mail", columnDefinition = "varchar(255) comment '外网邮箱'")
+    private String  outsideMail;
+
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @Column(name = "deleted", columnDefinition = "tinyint(4) comment '逻辑删除 0未删除 1已删除'")
     private Integer deleted;