Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/migao/mapper/DepartmentMapper.java

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 @Data
@@ -17,7 +18,7 @@ import java.time.LocalDateTime;
 @Table(name = "t_archives")
 @org.hibernate.annotations.Table(appliesTo = "t_archives", comment = "文档管理表")
 @TableName("t_archives")
-public class Archives {
+public class Archives implements Serializable {
     @Id
     @TableId(type = IdType.AUTO)
     @GeneratedValue(strategy = GenerationType.IDENTITY)

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

@@ -1,44 +0,0 @@
-package com.migao.entity.po;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.hibernate.annotations.GenericGenerator;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * @author dingsong
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@Entity
-@Table(name = "t_company_type")
-@org.hibernate.annotations.Table(appliesTo = "t_company_type", comment = "公司类别")
-@TableName("t_company_type")
-public class CompanyType implements Serializable {
-    @Id
-    @TableId(type = IdType.AUTO)
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id", columnDefinition = "int comment '主键'")
-    private Integer id;
-
-    @Column(name = "company_type", columnDefinition = "varchar(255) comment '公司类别'")
-    private Integer companyType;
-
-    @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/DemandAttachment.java

@@ -0,0 +1,45 @@
+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_demand_attachment")
+@org.hibernate.annotations.Table(appliesTo = "t_demand_attachment", comment = "需求库附件")
+@TableName("t_demand_attachment")
+public class DemandAttachment implements Serializable {
+    @Id
+    @TableId(type = IdType.AUTO)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    @Column(columnDefinition = "int(11) comment '需求库id'")
+    private Integer demandId;
+
+    @Column(columnDefinition = "int(11) comment '文件表id'")
+    private Integer fileId;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @Column(columnDefinition = "tinyint(1) comment '逻辑删除 0未删除 1已删除'")
+    private Integer deleted;
+
+    @Column(columnDefinition = "timestamp DEFAULT CURRENT_TIMESTAMP comment '创建时间'")
+    private LocalDateTime createTime;
+
+    @JoinColumn(columnDefinition = "int(11) comment '新增人'")
+    private Integer createUserId;
+}

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

@@ -10,6 +10,8 @@ import javax.persistence.*;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author dingsong
@@ -40,8 +42,8 @@ public class DemandLibrary implements Serializable {
     @Column(columnDefinition = "int(11) comment '需求分类id'")
     private Integer demandClassId;
 
-    @Column(columnDefinition = "int(11) comment '提交单位id'")
-    private Integer unitId;
+    @Column(columnDefinition = "varchar(11) comment '提交单位id'")
+    private String unitName;
 
     @Column(columnDefinition = "tinyint(1) comment '需求状态 -1废除 0立项 1认领'")
     private Integer demandStatus;
@@ -58,9 +60,6 @@ public class DemandLibrary implements Serializable {
     @Column(columnDefinition = "timestamp DEFAULT CURRENT_TIMESTAMP comment '提交时间'")
     private LocalDateTime submitTime;
 
-    @Column(columnDefinition = "int(11) comment '附件id'")
-    private Integer attachmentId;
-
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @Column(columnDefinition = "tinyint(1) comment '逻辑删除 0未删除 1已删除'")
     private Integer deleted;

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

@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.GenericGenerator;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 
@@ -19,7 +20,7 @@ import java.time.LocalDateTime;
 @Table(name = "t_department")
 @org.hibernate.annotations.Table(appliesTo = "t_department", comment = "部门表")
 @TableName("t_department")
-public class Department {
+public class Department implements Serializable {
 
     @Id
     @TableId(type = IdType.AUTO)

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 @Data
@@ -17,7 +18,7 @@ import java.time.LocalDateTime;
 @Table(name = "t_dictionary")
 @org.hibernate.annotations.Table(appliesTo = "t_dictionary", comment = "字典表")
 @TableName("t_dictionary")
-public class Dictionary {
+public class Dictionary implements Serializable {
     @Id
     @TableId(type = IdType.AUTO)
     @GeneratedValue(strategy = GenerationType.IDENTITY)

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

@@ -0,0 +1,42 @@
+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;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Entity
+@Table(name = "t_document_attachment")
+@org.hibernate.annotations.Table(appliesTo = "t_document_attachment", comment = "文档共享附件")
+@TableName("t_document_attachment")
+public class DocumentAttachment implements Serializable {
+    @Id
+    @TableId(type = IdType.AUTO)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    @Column(columnDefinition = "int(11) comment '文档共享id'")
+    private Integer documentId;
+
+    @Column(columnDefinition = "int(11) comment '文件表id'")
+    private Integer fileId;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @Column(columnDefinition = "tinyint(1) comment '逻辑删除 0未删除 1已删除'")
+    private Integer deleted;
+
+    @Column(columnDefinition = "timestamp DEFAULT CURRENT_TIMESTAMP comment '创建时间'")
+    private LocalDateTime createTime;
+
+    @JoinColumn(columnDefinition = "int(11) comment '新增人'")
+    private Integer createUserId;
+}

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

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
@@ -19,7 +20,7 @@ import java.time.LocalDateTime;
 @Table(name = "t_finances")
 @org.hibernate.annotations.Table(appliesTo = "t_finances", comment = "财务管理表")
 @TableName("t_finances")
-public class Finances {
+public class Finances implements Serializable {
 
     @Id
     @TableId(type = IdType.AUTO)

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 @Data
@@ -17,7 +18,7 @@ import java.time.LocalDateTime;
 @Table(name = "t_milestone")
 @org.hibernate.annotations.Table(appliesTo = "t_milestone", comment = "里程碑表")
 @TableName("t_milestone")
-public class Milestone {
+public class Milestone implements Serializable {
 
     @Id
     @TableId(type = IdType.AUTO)

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

@@ -10,6 +10,8 @@ import javax.persistence.*;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author dingsong
@@ -46,6 +48,15 @@ public class PayApprove implements Serializable {
     @Column(columnDefinition = "decimal comment '付款进度'")
     private BigDecimal paySchedule;
 
+    @Column(columnDefinition = "decimal comment '付款金额(万元)'")
+    private BigDecimal payMoney;
+
+    @Column(columnDefinition = "varchar(255) comment '收款账号'")
+    private String proceedsAccount;
+
+    @Column(columnDefinition = "varchar(255) comment '收款公司名称'")
+    private String proceedsCompanyName;
+
     @Column(columnDefinition = "int(11) comment '申请人id'")
     private Integer applicantId;
 
@@ -62,6 +73,6 @@ public class PayApprove implements Serializable {
     @Column(columnDefinition = "timestamp DEFAULT CURRENT_TIMESTAMP comment '创建时间'")
     private LocalDateTime createTime;
 
-    @JoinColumn(name = "create_user_id", columnDefinition = "int(11) comment '新增人'")
+    @JoinColumn(columnDefinition = "int(11) comment '新增人'")
     private Integer createUserId;
 }

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

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
@@ -20,7 +21,7 @@ import java.time.LocalDateTime;
 @Table(name = "t_project")
 @org.hibernate.annotations.Table(appliesTo = "t_project", comment = "项目储备表")
 @TableName("t_project")
-public class Project {
+public class Project implements Serializable {
 
     @Id
     @TableId(type = IdType.AUTO)

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
@@ -19,7 +20,7 @@ import java.time.LocalDateTime;
 @Table(name = "t_project_field")
 @org.hibernate.annotations.Table(appliesTo = "t_project_field", comment = "项目储备字段")
 @TableName("t_project_field")
-public class ProjectField {
+public class ProjectField implements Serializable {
 
     @Id
     @TableId(type = IdType.AUTO)

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 @Data
@@ -17,7 +18,7 @@ import java.time.LocalDateTime;
 @Table(name = "t_project_member")
 @org.hibernate.annotations.Table(appliesTo = "t_project_member", comment = "项目成员")
 @TableName("t_project_member")
-public class ProjectMember {
+public class ProjectMember implements Serializable {
 
 
     @Id

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
@@ -19,7 +20,7 @@ import java.time.LocalDateTime;
 @Table(name = "t_project_type")
 @org.hibernate.annotations.Table(appliesTo = "t_project_type", comment = "项目类型表")
 @TableName("t_project_type")
-public class ProjectType {
+public class ProjectType implements Serializable {
     @Id
     @TableId(type = IdType.AUTO)
     @GeneratedValue(strategy = GenerationType.IDENTITY)

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

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 @Data
@@ -18,7 +19,7 @@ import java.time.LocalDateTime;
 @Table(name = "t_purchasing_approval")
 @org.hibernate.annotations.Table(appliesTo = "t_purchasing_approval", comment = "采购审批表")
 @TableName("t_purchasing_approval")
-public class PurchasingApproval {
+public class PurchasingApproval implements Serializable {
     @Id
     @TableId(type = IdType.AUTO)
     @GeneratedValue(strategy = GenerationType.IDENTITY)

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 @Data
@@ -17,7 +18,7 @@ import java.time.LocalDateTime;
 @Table(name = "t_timeline")
 @org.hibernate.annotations.Table(appliesTo = "t_timeline", comment = "时间轴表")
 @TableName("t_timeline")
-public class Timeline {
+public class Timeline implements Serializable {
     @Id
     @TableId(type = IdType.AUTO)
     @GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/com/migao/mapper/ArchivesMapper.java

@@ -0,0 +1,10 @@
+package com.migao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.migao.entity.po.Archives;
+
+/**
+ * @author dingsong
+ */
+public interface ArchivesMapper extends BaseMapper<Archives> {
+}

src/main/java/com/migao/mapper/CompanyEvaluationMapper.java

@@ -0,0 +1,10 @@
+package com.migao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.migao.entity.po.CompanyEvaluation;
+
+/**
+ * @author dingsong
+ */
+public interface CompanyEvaluationMapper extends BaseMapper<CompanyEvaluation> {
+}

src/main/java/com/migao/mapper/DemandAttachmentMapper.java

@@ -0,0 +1,10 @@
+package com.migao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.migao.entity.po.DemandAttachment;
+
+/**
+ * @author dingsong
+ */
+public interface DemandAttachmentMapper extends BaseMapper<DemandAttachment> {
+}

src/main/java/com/migao/mapper/DemandLibraryMapper.java

@@ -0,0 +1,10 @@
+package com.migao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.migao.entity.po.DemandLibrary;
+
+/**
+ * @author dingsong
+ */
+public interface DemandLibraryMapper extends BaseMapper<DemandLibrary> {
+}

src/main/java/com/migao/mapper/DepartmentMapper.java

@@ -2,14 +2,9 @@ package com.migao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.migao.entity.po.Department;
-import org.apache.ibatis.annotations.Param;
-
-import java.time.LocalDate;
-import java.util.List;
 
 /**
- * @author : lcl
- * @date : 2020/4/16 16:28
+ * @author dingsong
  */
 public interface DepartmentMapper extends BaseMapper<Department> {
 }

src/main/java/com/migao/mapper/DictionaryMapper.java

@@ -0,0 +1,7 @@
+package com.migao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.migao.entity.po.Dictionary;
+
+public interface DictionaryMapper extends BaseMapper<Dictionary> {
+}

src/main/java/com/migao/mapper/DocumentAttachmentMapper.java

@@ -0,0 +1,10 @@
+package com.migao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.migao.entity.po.DocumentAttachment;
+
+/**
+ * @author dingsong
+ */
+public interface DocumentAttachmentMapper extends BaseMapper<DocumentAttachment> {
+}

src/main/java/com/migao/mapper/DocumentSharingMapper.java

@@ -0,0 +1,10 @@
+package com.migao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.migao.entity.po.DocumentSharing;
+
+/**
+ * @author dingsong
+ */
+public interface DocumentSharingMapper extends BaseMapper<DocumentSharing> {
+}

src/main/java/com/migao/mapper/FinancesFileMapper.java

@@ -0,0 +1,10 @@
+package com.migao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.migao.entity.po.FinancesFile;
+
+/**
+ * @author dingsong
+ */
+public interface FinancesFileMapper extends BaseMapper<FinancesFile> {
+}

src/main/java/com/migao/mapper/FinancesMapper.java

@@ -0,0 +1,10 @@
+package com.migao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.migao.entity.po.Finances;
+
+/**
+ * @author dingsong
+ */
+public interface FinancesMapper extends BaseMapper<Finances> {
+}

src/main/java/com/migao/mapper/MessageMapper.java

@@ -0,0 +1,7 @@
+package com.migao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.migao.entity.po.Message;
+
+public interface MessageMapper extends BaseMapper<Message> {
+}

src/main/java/com/migao/mapper/MilestoneMapper.java

@@ -0,0 +1,10 @@
+package com.migao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.migao.entity.po.Milestone;
+
+/**
+ * @author dingsong
+ */
+public interface MilestoneMapper extends BaseMapper<Milestone> {
+}

src/main/java/com/migao/mapper/PayApproveMapper.java

@@ -0,0 +1,10 @@
+package com.migao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.migao.entity.po.PayApprove;
+
+/**
+ * @author dingsong
+ */
+public interface PayApproveMapper extends BaseMapper<PayApprove> {
+}

src/main/java/com/migao/mapper/ProjectFieldMapper.java

@@ -0,0 +1,10 @@
+package com.migao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.migao.entity.po.ProjectField;
+
+/**
+ * @author dingsong
+ */
+public interface ProjectFieldMapper extends BaseMapper<ProjectField> {
+}

src/main/java/com/migao/mapper/ProjectMapper.java

@@ -0,0 +1,10 @@
+package com.migao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.migao.entity.po.Project;
+
+/**
+ * @author dingsong
+ */
+public interface ProjectMapper extends BaseMapper<Project> {
+}

src/main/java/com/migao/mapper/ProjectMemberMapper.java

@@ -0,0 +1,10 @@
+package com.migao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.migao.entity.po.ProjectMember;
+
+/**
+ * @author dingsong
+ */
+public interface ProjectMemberMapper extends BaseMapper<ProjectMember> {
+}

src/main/java/com/migao/mapper/ProjectTypeMapper.java

@@ -0,0 +1,7 @@
+package com.migao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.migao.entity.po.ProjectType;
+
+public interface ProjectTypeMapper extends BaseMapper<ProjectType> {
+}

src/main/java/com/migao/mapper/PurchasingApprovalMapper.java

@@ -0,0 +1,10 @@
+package com.migao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.migao.entity.po.PurchasingApproval;
+
+/**
+ * @author dingsong
+ */
+public interface PurchasingApprovalMapper extends BaseMapper<PurchasingApproval> {
+}

src/main/java/com/migao/mapper/SupplierMapper.java

@@ -0,0 +1,10 @@
+package com.migao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.migao.entity.po.Supplier;
+
+/**
+ * @author dingsong
+ */
+public interface SupplierMapper extends BaseMapper<Supplier> {
+}

src/main/java/com/migao/mapper/TimelineMapper.java

@@ -0,0 +1,10 @@
+package com.migao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.migao.entity.po.Timeline;
+
+/**
+ * @author dingsong
+ */
+public interface TimelineMapper extends BaseMapper<Timeline> {
+}