更新

src/main/java/org/jeecg/common/dto/archives/ProArchivesAndBusinessAddReqDTO.java

@@ -31,32 +31,63 @@ public class ProArchivesAndBusinessAddReqDTO {
     private BigDecimal price4;
     @ApiModelProperty( "第五笔")
     private BigDecimal price5;
-    @ApiModelProperty( "对应里程碑1")
+    @ApiModelProperty("对应里程碑1")
     private String milestone1;
-    @ApiModelProperty( "对应里程碑2")
+    @ApiModelProperty("里程碑id1")
+    private String mileId1;
+    @ApiModelProperty("描述1")
+    private String desc1;
+    @ApiModelProperty("对应里程碑2")
     private String milestone2;
-    @ApiModelProperty( "对应里程碑3")
+    @ApiModelProperty("里程碑id2")
+    private String mileId2;
+    @ApiModelProperty("描述2")
+    private String desc2;
+    @ApiModelProperty("对应里程碑3")
     private String milestone3;
-    @ApiModelProperty( "对应里程碑4")
+    @ApiModelProperty("里程碑id3")
+    private String mileId3;
+    @ApiModelProperty("描述3")
+    private String desc3;
+    @ApiModelProperty("对应里程碑4")
     private String milestone4;
-    @ApiModelProperty( "对应里程碑5")
+    @ApiModelProperty("描述4")
+    private String desc4;
+    @ApiModelProperty("里程碑id4")
+    private String mileId4;
+    @ApiModelProperty("对应里程碑5")
     private String milestone5;
+    @ApiModelProperty("里程碑id5")
+    private String mileId5;
+    @ApiModelProperty("描述5")
+    private String desc5;
 
     public ProArchivesAndBusinessAddReqDTO() {
     }
 
     public ProArchivesAndBusinessAddReqDTO(ProjectManageArchivesAndBusiness business) {
+        this.id = business.getId();
         this.planId = business.getPlanId();
-        this.planName = business.getId();
+        this.planName = business.getPlanName();
         this.price1 = business.getPrice1();
         this.price2 = business.getPrice2();
         this.price3 = business.getPrice3();
         this.price4 = business.getPrice4();
         this.price5 = business.getPrice5();
         this.milestone1 = business.getMilestone1();
+        this.mileId1 = business.getMileId1();
+        this.desc1 = business.getDesc1();
         this.milestone2 = business.getMilestone2();
+        this.mileId2 = business.getMileId2();
+        this.desc2 = business.getDesc2();
         this.milestone3 = business.getMilestone3();
+        this.mileId3 = business.getMileId3();
+        this.desc3 = business.getDesc3();
         this.milestone4 = business.getMilestone4();
+        this.desc4 = business.getDesc4();
+        this.mileId4 = business.getMileId4();
         this.milestone5 = business.getMilestone5();
+        this.mileId5 = business.getMileId5();
+        this.desc5 = business.getDesc5();
     }
 }

src/main/java/org/jeecg/modules/archives/entity/ProjectManageArchivesAndBusiness.java

@@ -13,82 +13,112 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.jeecg.common.dto.archives.ProArchivesAndBusinessAddReqDTO;
 import org.springframework.format.annotation.DateTimeFormat;
 
- /** 
-   * @Author jihaosen
-   * @date 2021/2/24 
-   */
- 
+/**
+ * @Author jihaosen
+ * @date 2021/2/24
+ */
+
 @ApiModel("项目档案--里程碑信息表")
 @Data
 @TableName("project_manage_archives_and_business")
 public class ProjectManageArchivesAndBusiness implements Serializable {
-	 private static final long serialVersionUID = -3625006826554966271L;
-	 @TableId(type = IdType.UUID)
-	private String id;
-	@ApiModelProperty( "项目档案id")
-	private String proArchivesId;
-	@ApiModelProperty( "计划类型 1.商务 2.实施 3.开发 4.服务")
-	private Integer planType;
-	 @ApiModelProperty( "计划id")
-	 private String planId;
-	@ApiModelProperty( "计划名称")
-	private String planName;
-	@ApiModelProperty( "第一笔")
-	private BigDecimal price1;
-	@ApiModelProperty( "第二笔")
-	private BigDecimal price2;
-	@ApiModelProperty( "第三笔")
-	private BigDecimal price3;
-	@ApiModelProperty( "第四笔")
-	private BigDecimal price4;
-	@ApiModelProperty( "第五笔")
-	private BigDecimal price5;
-	@ApiModelProperty( "对应里程碑1")
-	private String milestone1;
-	@ApiModelProperty( "对应里程碑2")
-	private String milestone2;
-	@ApiModelProperty( "对应里程碑3")
-	private String milestone3;
-	@ApiModelProperty( "对应里程碑4")
-	private String milestone4;
-	@ApiModelProperty( "对应里程碑5")
-	private String milestone5;
-	@ApiModelProperty( "创建时间")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date createTime;
-	@ApiModelProperty( "创建人")
-	private String createBy;
-	@ApiModelProperty( "修改时间")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date updateTime;
-	@ApiModelProperty( "修改人")
-	private String updateBy;
-	@ApiModelProperty( "删除状态（0，正常，1已删除）")
-	private String delFlag;
-	@ApiModelProperty( "组织")
-	private String pkOrg;
+    private static final long serialVersionUID = -3625006826554966271L;
+    @TableId(type = IdType.UUID)
+    private String id;
+    @ApiModelProperty("项目档案id")
+    private String proArchivesId;
+    @ApiModelProperty("计划类型 1.商务 2.实施 3.开发 4.服务")
+    private Integer planType;
+    @ApiModelProperty("计划id")
+    private String planId;
+    @ApiModelProperty("计划名称")
+    private String planName;
+    @ApiModelProperty("第一笔")
+    private BigDecimal price1;
+    @ApiModelProperty("第二笔")
+    private BigDecimal price2;
+    @ApiModelProperty("第三笔")
+    private BigDecimal price3;
+    @ApiModelProperty("第四笔")
+    private BigDecimal price4;
+    @ApiModelProperty("第五笔")
+    private BigDecimal price5;
+    @ApiModelProperty("对应里程碑1")
+    private String milestone1;
+    @ApiModelProperty("里程碑id1")
+    private String mileId1;
+    @ApiModelProperty("描述1")
+    private String desc1;
+    @ApiModelProperty("对应里程碑2")
+    private String milestone2;
+    @ApiModelProperty("里程碑id2")
+    private String mileId2;
+    @ApiModelProperty("描述2")
+    private String desc2;
+    @ApiModelProperty("对应里程碑3")
+    private String milestone3;
+    @ApiModelProperty("里程碑id3")
+    private String mileId3;
+    @ApiModelProperty("描述3")
+    private String desc3;
+    @ApiModelProperty("对应里程碑4")
+    private String milestone4;
+    @ApiModelProperty("描述4")
+    private String desc4;
+    @ApiModelProperty("里程碑id4")
+    private String mileId4;
+    @ApiModelProperty("对应里程碑5")
+    private String milestone5;
+    @ApiModelProperty("里程碑id5")
+    private String mileId5;
+    @ApiModelProperty("描述5")
+    private String desc5;
+    @ApiModelProperty("创建时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private java.util.Date createTime;
+    @ApiModelProperty("创建人")
+    private String createBy;
+    @ApiModelProperty("修改时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private java.util.Date updateTime;
+    @ApiModelProperty("修改人")
+    private String updateBy;
+    @ApiModelProperty("删除状态（0，正常，1已删除）")
+    private String delFlag;
+    @ApiModelProperty("组织")
+    private String pkOrg;
 
-	 public ProjectManageArchivesAndBusiness() {
-	 }
+    public ProjectManageArchivesAndBusiness() {
+    }
 
-	 public ProjectManageArchivesAndBusiness(ProArchivesAndBusinessAddReqDTO mile, String proArchivesId, Integer planType, String pkOrg) {
-		 this.proArchivesId = proArchivesId;
-		 this.planType = planType;
-		 this.planId = mile.getPlanId();
-		 this.planName = mile.getPlanName();
-		 this.price1 = mile.getPrice1();
-		 this.price2 = mile.getPrice2();
-		 this.price3 = mile.getPrice3();
-		 this.price4 = mile.getPrice4();
-		 this.price5 = mile.getPrice5();
-		 this.milestone1 = mile.getMilestone1();
-		 this.milestone2 = mile.getMilestone2();
-		 this.milestone3 = mile.getMilestone3();
-		 this.milestone4 = mile.getMilestone4();
-		 this.milestone5 = mile.getMilestone5();
-		 this.delFlag = "0";
-		 this.pkOrg = pkOrg;
-	 }
- }
+    public ProjectManageArchivesAndBusiness(ProArchivesAndBusinessAddReqDTO mile, String proArchivesId, Integer planType, String pkOrg) {
+        this.proArchivesId = proArchivesId;
+        this.planType = planType;
+        this.planId = mile.getPlanId();
+        this.planName = mile.getPlanName();
+        this.price1 = mile.getPrice1();
+        this.price2 = mile.getPrice2();
+        this.price3 = mile.getPrice3();
+        this.price4 = mile.getPrice4();
+        this.price5 = mile.getPrice5();
+        this.milestone1 = mile.getMilestone1();
+        this.mileId1 = mile.getMileId1();
+        this.desc1 = mile.getDesc1();
+        this.milestone2 = mile.getMilestone2();
+        this.mileId2 = mile.getMileId2();
+        this.desc2 = mile.getDesc2();
+        this.milestone3 = mile.getMilestone3();
+        this.mileId3 = mile.getMileId3();
+        this.desc3 = mile.getDesc3();
+        this.milestone4 = mile.getMilestone4();
+        this.desc4 = mile.getDesc4();
+        this.mileId4 = mile.getMileId4();
+        this.milestone5 = mile.getMilestone5();
+        this.mileId5 = mile.getMileId5();
+        this.desc5 = mile.getDesc5();
+        this.delFlag = "0";
+        this.pkOrg = pkOrg;
+    }
+}