更新

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

@@ -12,13 +12,22 @@ import java.util.List;
 @ApiModel("项目档案—商务信息请求参数")
 @Data
 public class BsInfo {
- @ApiModelProperty( "项目档案--里程碑信息")
- private List<ProArchivesAndBusinessAddReqDTO> mileList;
+ @ApiModelProperty( "收款计划")
+ private List<ProArchivesAndBusinessAddReqDTO> coPlanList;
+ @ApiModelProperty( "收款情况")
+ private List<ProArchivesAndBusinessAddReqDTO> coSituationList;
+ @ApiModelProperty( "付款计划")
+ private List<ProArchivesAndBusinessAddReqDTO> payPlanList;
+ @ApiModelProperty( "付款情况")
+ private List<ProArchivesAndBusinessAddReqDTO> paySituationList;
 
  public BsInfo() {
  }
 
- public BsInfo(List<ProArchivesAndBusinessAddReqDTO> mileList) {
-  this.mileList = mileList;
+ public BsInfo(List<ProArchivesAndBusinessAddReqDTO> coPlanList, List<ProArchivesAndBusinessAddReqDTO> coSituationList, List<ProArchivesAndBusinessAddReqDTO> payPlanList, List<ProArchivesAndBusinessAddReqDTO> paySituationList) {
+  this.coPlanList = coPlanList;
+  this.coSituationList = coSituationList;
+  this.payPlanList = payPlanList;
+  this.paySituationList = paySituationList;
  }
 }

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

@@ -8,8 +8,8 @@ import java.util.List;
 @ApiModel("项目档案—开发信息请求参数")
 @Data
 public class DeInfo {
-    @ApiModelProperty( "项目档案--里程碑信息")
-    private List<ProArchivesAndBusinessAddReqDTO> mileList;
+//    @ApiModelProperty( "项目档案--里程碑信息")
+//    private List<ProArchivesAndBusinessAddReqDTO> mileList;
     @ApiModelProperty( "项目档案--计划信息新增请求参数")
     private List<ProBusinessOtherAddReqDTO> planList;
 

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

@@ -13,16 +13,15 @@ import java.util.List;
  @ApiModel("项目档案—开发信息响应参数")
  @Data
 public class DeInfoRespDTO {
-    @ApiModelProperty( "项目档案--里程碑信息")
-    private List<ProArchivesAndBusinessAddReqDTO> mileList;
+//    @ApiModelProperty( "项目档案--里程碑信息")
+//    private List<ProArchivesAndBusinessAddReqDTO> mileList;
     @ApiModelProperty( "项目档案--计划信息")
     private List<ProBusinessOtherListRespDTO> planList;
 
     public DeInfoRespDTO() {
     }
 
-    public DeInfoRespDTO(List<ProArchivesAndBusinessAddReqDTO> mileList, List<ProBusinessOtherListRespDTO> planList) {
-        this.mileList = mileList;
+    public DeInfoRespDTO(List<ProBusinessOtherListRespDTO> planList) {
         this.planList = planList;
     }
 }

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

@@ -8,8 +8,8 @@ import java.util.List;
 @ApiModel("项目档案—实施信息参数")
 @Data
 public class IpInfo {
-    @ApiModelProperty( "项目档案--里程碑信息")
-    private List<ProArchivesAndBusinessAddReqDTO> mileList;
+//    @ApiModelProperty( "项目档案--里程碑信息")
+//    private List<ProArchivesAndBusinessAddReqDTO> mileList;
     @ApiModelProperty( "项目档案--计划信息新增请求参数")
     private List<ProBusinessOtherAddReqDTO> planList;
 

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

@@ -13,16 +13,15 @@ import java.util.List;
 @ApiModel("项目档案—实施信息响应参数")
 @Data
 public class IpInfoRespDTO {
-    @ApiModelProperty( "项目档案--里程碑信息")
-    private List<ProArchivesAndBusinessAddReqDTO> mileList;
+//    @ApiModelProperty( "项目档案--里程碑信息")
+//    private List<ProArchivesAndBusinessAddReqDTO> mileList;
     @ApiModelProperty( "项目档案--计划信息新增请求参数")
     private List<ProBusinessOtherListRespDTO> planList;
 
     public IpInfoRespDTO() {
     }
 
-    public IpInfoRespDTO(List<ProArchivesAndBusinessAddReqDTO> mileList, List<ProBusinessOtherListRespDTO> planList) {
-        this.mileList = mileList;
+    public IpInfoRespDTO(List<ProBusinessOtherListRespDTO> planList) {
         this.planList = planList;
     }
 }

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

@@ -19,6 +19,8 @@ public class ProArchivesAndBusinessAddReqDTO {
     private String id;
     @ApiModelProperty( "计划id")
     private String planId;
+    @ApiModelProperty( "计划类型 1.收款计划 2.回款情况 3.付款计划 4.付款情况")
+    private Integer planType;
     @ApiModelProperty( "计划名称")
     private String planName;
     @ApiModelProperty( "第一笔")
@@ -68,6 +70,7 @@ public class ProArchivesAndBusinessAddReqDTO {
     public ProArchivesAndBusinessAddReqDTO(ProjectManageArchivesAndBusiness business) {
         this.id = business.getId();
         this.planId = business.getPlanId();
+        this.planType = business.getPlanType();
         this.planName = business.getPlanName();
         this.price1 = business.getPrice1();
         this.price2 = business.getPrice2();

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

@@ -8,11 +8,15 @@ import java.util.List;
 @ApiModel("项目档案—服务信息请求参数")
 @Data
 public class SeInfo {
-    @ApiModelProperty( "项目档案--里程碑信息")
-    private List<ProArchivesAndBusinessAddReqDTO> mileList;
+//    @ApiModelProperty( "项目档案--里程碑信息")
+//    private List<ProArchivesAndBusinessAddReqDTO> mileList;
     @ApiModelProperty( "项目档案--计划信息新增请求参数")
     private List<ProBusinessOtherAddReqDTO> planList;
 
     public SeInfo() {
     }
+
+    public SeInfo(List<ProBusinessOtherAddReqDTO> planList) {
+        this.planList = planList;
+    }
 }

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

@@ -8,16 +8,15 @@ import java.util.List;
 @ApiModel("项目档案—服务信息请求参数")
 @Data
 public class SeInfoRespDTO {
-    @ApiModelProperty( "项目档案--里程碑信息")
-    private List<ProArchivesAndBusinessAddReqDTO> mileList;
+//    @ApiModelProperty( "项目档案--里程碑信息")
+//    private List<ProArchivesAndBusinessAddReqDTO> mileList;
     @ApiModelProperty( "项目档案--计划信息新增请求参数")
     private List<ProBusinessOtherListRespDTO> planList;
 
     public SeInfoRespDTO() {
     }
 
-    public SeInfoRespDTO(List<ProArchivesAndBusinessAddReqDTO> mileList, List<ProBusinessOtherListRespDTO> planList) {
-        this.mileList = mileList;
+    public SeInfoRespDTO(List<ProBusinessOtherListRespDTO> planList) {
         this.planList = planList;
     }
 }

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

@@ -27,7 +27,7 @@ public class ProjectManageArchivesAndBusiness implements Serializable {
     private String id;
     @ApiModelProperty("项目档案id")
     private String proArchivesId;
-    @ApiModelProperty("计划类型 1.商务 2.实施 3.开发 4.服务")
+    @ApiModelProperty("计划类型 1.收款计划 2.回款情况 3.付款计划 4.付款情况")
     private Integer planType;
     @ApiModelProperty("计划id")
     private String planId;
@@ -93,9 +93,9 @@ public class ProjectManageArchivesAndBusiness implements Serializable {
     public ProjectManageArchivesAndBusiness() {
     }
 
-    public ProjectManageArchivesAndBusiness(ProArchivesAndBusinessAddReqDTO mile, String proArchivesId, Integer planType, String pkOrg) {
+    public ProjectManageArchivesAndBusiness(ProArchivesAndBusinessAddReqDTO mile, String proArchivesId, String pkOrg) {
         this.proArchivesId = proArchivesId;
-        this.planType = planType;
+        this.planType = mile.getPlanType();
         this.planId = mile.getPlanId();
         this.planName = mile.getPlanName();
         this.price1 = mile.getPrice1();

src/main/java/org/jeecg/modules/archives/service/impl/ProjectManageArchivesServiceImpl.java

@@ -40,8 +40,6 @@ import java.util.stream.Collectors;
 @Service
 @Transactional
 public class ProjectManageArchivesServiceImpl extends ServiceImpl<ProjectManageArchivesMapper, ProjectManageArchives> implements ProjectManageArchivesService {
-    @Autowired
-    private ProjectManageArchivesMapper projectManageArchivesMapper;
     @Autowired
     private ProjectManageArchivesAndBusinessService projectManageArchivesAndBusinessService;
     @Autowired
@@ -122,10 +120,11 @@ public class ProjectManageArchivesServiceImpl extends ServiceImpl<ProjectManageA
      * @desc 设置里程碑数据
      */
     private void setRespDTO(ProArchivesAddRespDTO respDTO, List<ProjectManageArchivesAndBusiness> businessList, Map<Integer, List<ProjectManageBusinessOther>> otherMap) {
-        respDTO.setBsInfo(new BsInfo(getBsInfoData(businessList, 1)));
-        respDTO.setIpInfo(new IpInfoRespDTO(getBsInfoData(businessList, 2), getPlanList(otherMap.get(2))));
-        respDTO.setDeInfo(new DeInfoRespDTO(getBsInfoData(businessList, 3), getPlanList(otherMap.get(3))));
-        respDTO.setSeInfo(new SeInfoRespDTO(getBsInfoData(businessList, 4), getPlanList(otherMap.get(4))));
+        respDTO.setBsInfo(new BsInfo(getBsInfoData(businessList, 1), getBsInfoData(businessList, 2),
+                getBsInfoData(businessList, 3), getBsInfoData(businessList, 4)));
+        respDTO.setIpInfo(new IpInfoRespDTO(getPlanList(otherMap.get(2))));
+        respDTO.setDeInfo(new DeInfoRespDTO(getPlanList(otherMap.get(3))));
+        respDTO.setSeInfo(new SeInfoRespDTO(getPlanList(otherMap.get(4))));
     }
 
     /**
@@ -228,12 +227,27 @@ public class ProjectManageArchivesServiceImpl extends ServiceImpl<ProjectManageA
         if(bsInfo == null){
             throw new JeecgBootException("项目档案—商务的数据不能为空");
         }
-        List<ProArchivesAndBusinessAddReqDTO> mileList = bsInfo.getMileList();
-        if(CollectionUtils.isEmpty(mileList)){
-            throw new JeecgBootException("项目档案—商务的list数据不能为空");
+        //保存收款计划
+        List<ProArchivesAndBusinessAddReqDTO> coPlanList = bsInfo.getCoPlanList();
+        if(!CollectionUtils.isEmpty(coPlanList)){
+            saveMileData( coPlanList,  reqDTO);
+        }
+        //保存收款情况
+        List<ProArchivesAndBusinessAddReqDTO> coSituationList = bsInfo.getCoSituationList();
+        if(!CollectionUtils.isEmpty(coSituationList)){
+            saveMileData(coSituationList,  reqDTO);
+        }
+        //保存付款计划
+        List<ProArchivesAndBusinessAddReqDTO> payPlanList = bsInfo.getPayPlanList();
+        if(!CollectionUtils.isEmpty(payPlanList)){
+            saveMileData(payPlanList,  reqDTO);
+        }
+
+        //保存付款情况
+        List<ProArchivesAndBusinessAddReqDTO> paySituationList = bsInfo.getPaySituationList();
+        if(!CollectionUtils.isEmpty(paySituationList)){
+            saveMileData(paySituationList,  reqDTO);
         }
-        //保存里程碑数据
-        saveMileData( mileList,  reqDTO, 1);
     }
 
     /**
@@ -244,12 +258,12 @@ public class ProjectManageArchivesServiceImpl extends ServiceImpl<ProjectManageA
         if(ipInfo == null){
             throw new JeecgBootException("项目档案—实施的数据不能为空");
         }
-        List<ProArchivesAndBusinessAddReqDTO> mileList = ipInfo.getMileList();
-        if(CollectionUtils.isEmpty(mileList)){
-            throw new JeecgBootException("项目档案—实施的里程碑数据不能为空");
-        }
+//        List<ProArchivesAndBusinessAddReqDTO> mileList = ipInfo.getMileList();
+//        if(CollectionUtils.isEmpty(mileList)){
+//            throw new JeecgBootException("项目档案—实施的里程碑数据不能为空");
+//        }
         //保存里程碑数据
-        saveMileData(mileList, reqDTO, 2);
+//        saveMileData(mileList, reqDTO, 2);
 
         List<ProBusinessOtherAddReqDTO> planList = ipInfo.getPlanList();
         if(CollectionUtils.isEmpty(planList)){
@@ -268,12 +282,12 @@ public class ProjectManageArchivesServiceImpl extends ServiceImpl<ProjectManageA
         if(deInfo == null){
             throw new JeecgBootException("项目档案—开发的数据不能为空");
         }
-        List<ProArchivesAndBusinessAddReqDTO> mileList = deInfo.getMileList();
-        if(CollectionUtils.isEmpty(mileList)){
-            throw new JeecgBootException("项目档案—开发的里程碑数据不能为空");
-        }
+//        List<ProArchivesAndBusinessAddReqDTO> mileList = deInfo.getMileList();
+//        if(CollectionUtils.isEmpty(mileList)){
+//            throw new JeecgBootException("项目档案—开发的里程碑数据不能为空");
+//        }
        //保存里程碑数据
-        saveMileData(mileList, reqDTO, 3);
+//        saveMileData(mileList, reqDTO, 3);
 
         List<ProBusinessOtherAddReqDTO> planList = deInfo.getPlanList();
         if(CollectionUtils.isEmpty(planList)){
@@ -291,12 +305,12 @@ public class ProjectManageArchivesServiceImpl extends ServiceImpl<ProjectManageA
         if(seInfo == null){
             throw new JeecgBootException("项目档案—服务的数据不能为空");
         }
-        List<ProArchivesAndBusinessAddReqDTO> mileList = seInfo.getMileList();
-        if(CollectionUtils.isEmpty(mileList)){
-            throw new JeecgBootException("项目档案—服务的里程碑数据不能为空");
-        }
-        //保存里程碑数据
-        saveMileData(mileList, reqDTO, 4);
+//        List<ProArchivesAndBusinessAddReqDTO> mileList = seInfo.getMileList();
+//        if(CollectionUtils.isEmpty(mileList)){
+//            throw new JeecgBootException("项目档案—服务的里程碑数据不能为空");
+//        }
+//        //保存里程碑数据
+//        saveMileData(mileList, reqDTO, 4);
 
         List<ProBusinessOtherAddReqDTO> planList = seInfo.getPlanList();
         if(CollectionUtils.isEmpty(planList)){
@@ -308,10 +322,10 @@ public class ProjectManageArchivesServiceImpl extends ServiceImpl<ProjectManageA
     /**
      * @desc 保存里程碑数据
      */
-    private void saveMileData(List<ProArchivesAndBusinessAddReqDTO> mileList, ProArchivesAddReqDTO reqDTO, Integer planType) {
+    private void saveMileData(List<ProArchivesAndBusinessAddReqDTO> mileList, ProArchivesAddReqDTO reqDTO) {
         List<ProjectManageArchivesAndBusiness> list = Lists.newArrayList();
         for(ProArchivesAndBusinessAddReqDTO mile :  mileList) {
-            list.add(new ProjectManageArchivesAndBusiness(mile, reqDTO.getId(), planType, reqDTO.getPkOrg()));
+            list.add(new ProjectManageArchivesAndBusiness(mile, reqDTO.getId(), reqDTO.getPkOrg()));
         }
         projectManageArchivesAndBusinessService.saveBatch(list);
     }