Merge remote-tracking branch 'origin/master'

src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunBuildProject.java

@@ -10,6 +10,9 @@ import com.galaxis.manatee.util.ChuanyunLocalDateTimeSerializer;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.persistence.CascadeType;
+import javax.persistence.FetchType;
+import javax.persistence.OneToMany;
 import javax.persistence.Transient;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -63,8 +66,9 @@ public class ChuanyunBuildProject extends BasicDO {
     private String benefitingDepartment;
 
     //实施项目经理
-    @JsonProperty("F0000120")
-    private String implementationManager;
+    @JsonProperty("F0000120Object")
+    @Transient
+    private ChuanyunObject implementationManager;
 
     //签约公司
     @JsonProperty(value = "F0000051")
@@ -107,9 +111,11 @@ public class ChuanyunBuildProject extends BasicDO {
 
     //维保-交付子表
     @JsonProperty(value = "D001789F28649f6f044a4224b5c68aa821918f50")
+    @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true,fetch = FetchType.EAGER)
     private List<ChuanyunMaintenanceProDO> maintenanceProList;
 
     //维保-周期子表
     @JsonProperty(value = "D001789F3ffb030bffbf45a78c830cd7da9d59c9")
+    @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true,fetch = FetchType.EAGER)
     private List<ChuanyunMaintenanceCycleDO> maintenanceCycleList;
 }

src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunMaintenanceProDO.java

@@ -2,10 +2,13 @@ package com.galaxis.manatee.entity.chuanyun.data.object;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.galaxis.manatee.capsule.bo.ChuanyunObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 
+import javax.persistence.Transient;
+
 @Slf4j
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -24,8 +27,9 @@ public class ChuanyunMaintenanceProDO extends BasicSubDO {
     private String proVersion;
 
     //维保承接负责人
-    @JsonProperty("F0000087")
-    private String maintenanceChargeMan;
+    @JsonProperty("F0000087Object")
+    @Transient
+    private ChuanyunObject maintenanceChargeMan;
 
     //备注
     @JsonProperty("F0000088")

src/test/java/com/galaxis/manatee/Test/zzx/ProjectTest1.java

@@ -26,6 +26,7 @@ import javax.persistence.CascadeType;
 import javax.persistence.FetchType;
 import javax.persistence.OneToMany;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
@@ -60,7 +61,7 @@ public class ProjectTest1 {
             }
 
             ChuanyunBuildProject chuanyunBuildProject = bpList.get(i);
-             log.info("{chuanyunBuildProject => {}}", chuanyunBuildProject);
+            // log.info("{chuanyunBuildProject => {}}", chuanyunBuildProject);
 
             try {
                 Thread.sleep(200);  //避免同步数据时因为氚云的限制而导致失败
@@ -72,14 +73,30 @@ public class ProjectTest1 {
                 aftermarket.setAfterProType(chuanyunBuildProject.getProjectType());
                 aftermarket.setProClassify(chuanyunBuildProject.getProjectClassify());
 
-                if (chuanyunBuildProject.getProjectType() == "维保") {    //DW(维保)
+                if (chuanyunBuildProject.getProjectType().equals("维保")) {    //DW(维保)
                     aftermarket.setMaintenanceProManager(chuanyunBuildProject.getProjectManager().getObjectId());
                     aftermarket.setMaintenanceProDirector(chuanyunBuildProject.getProjectDirector().getObjectId());
                     aftermarket.setMaintenanceSaleChargeMan(chuanyunBuildProject.getSalesDirector().getObjectId());
+                    aftermarket.setImplProManager(chuanyunBuildProject.getImplementationManager().getObjectId());
+
+//                    List<ChuanyunMaintenanceProDO> maintenanceProList = new ArrayList<>();
+//                    if (chuanyunBuildProject.getMaintenanceProList().size() > 0) {
+//                        for (int j = 0; j < chuanyunBuildProject.getMaintenanceProList().size(); j++) {
+//                            ChuanyunMaintenanceProDO chuanyunMaintenanceProDO = chuanyunBuildProject.getMaintenanceProList().get(j);
+//                            ChuanyunMaintenanceProDO newChuanyunMaintenanceProDO = new ChuanyunMaintenanceProDO();
+//                            newChuanyunMaintenanceProDO.setProProperty(chuanyunMaintenanceProDO.getProProperty());
+//                            newChuanyunMaintenanceProDO.setProContent(chuanyunMaintenanceProDO.getProContent());
+//                            newChuanyunMaintenanceProDO.setProVersion(chuanyunMaintenanceProDO.getProVersion());
+//                            newChuanyunMaintenanceProDO.setMaintenanceChargeMan(chuanyunMaintenanceProDO.getMaintenanceChargeMan());
+//                            newChuanyunMaintenanceProDO.setRemark(chuanyunMaintenanceProDO.getRemark());
+//                            // log.info("{chuanyunMaintenanceProDO => {}}", chuanyunMaintenanceProDO);
+//                            maintenanceProList.add(newChuanyunMaintenanceProDO);
+//                        }
+//                    }
+//                    aftermarket.setMaintenanceProList(maintenanceProList);
 
-                    aftermarket.setImplProManager(chuanyunBuildProject.getImplementationManager());
                     aftermarket.setMaintenanceProList(chuanyunBuildProject.getMaintenanceProList());
-                    aftermarket.setMaintenanceCycleList(chuanyunBuildProject.getMaintenanceCycleList());
+//                    aftermarket.setMaintenanceCycleList(chuanyunBuildProject.getMaintenanceCycleList());
                 } else { //AS(售后)
                     aftermarket.setAfterSaleManager(chuanyunBuildProject.getProjectManager().getObjectId());
                     aftermarket.setAfterSaleDirector(chuanyunBuildProject.getProjectDirector().getObjectId());
@@ -91,7 +108,7 @@ public class ProjectTest1 {
                     aftermarket.setSetUpDate(chuanyunBuildProject.getSetUpDate());
                 }
 
-                log.info("{aftermarket => {}}", aftermarket);
+                // log.info("{aftermarket => {}}", aftermarket);
 
                 String json = null;
                 try {