修复人力成本不全问题。

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

@@ -18,5 +18,53 @@ public class ChuanyunBuildProject extends BasicDO {
     @JsonProperty(value = "F0000003")
     private String projectCode;
 
+    /**
+     * 项目名称
+     */
+    @JsonProperty(value = "F0000004")
+    private String projectName;
+
+    /**
+     * 签约公司
+     */
+    @JsonProperty(value = "F0000051")
+    private String signingCompany;
+
+    /**
+     * 客户名称
+     */
+    @JsonProperty(value = "F0000039")
+    private String customerName;
+    /**
+     * 业主名称
+     */
+    @JsonProperty(value = "F0000040")
+    private String nameOfOwner;
+
+    /**
+     * 项目经理
+     */
+    @JsonProperty(value = "F0000037")
+    private String projectManager;
+
+    /**
+     * 销售负责人
+     */
+    @JsonProperty(value = "F0000011")
+    private String SalesDirector;
+
+    /**
+     * 系统免费维保期
+     */
+    @JsonProperty(value = "F0000104")
+    private Integer systemWarranty;
+
+
+    /**
+     * 设备免费维保期
+     */
+    @JsonProperty(value = "F0000105")
+    private Integer deviceWarranty;
+
 
 }

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

@@ -0,0 +1,22 @@
+package com.galaxis.manatee.entity.chuanyun.data.object;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ChuanyunProjectSubAccount extends BasicDO {
+    /**
+     * 表名
+     */
+    public static final String SCHEMA_CODE = "D0017894df4f53e50244f29ad440f11ead89fad";
+
+    /**
+     * 项目编号
+     */
+    @JsonProperty(value = "F0000003")
+    private String projectCode;
+
+
+}

src/main/java/com/galaxis/manatee/entity/chuanyun/dto/ChuanyunLaborCostPrimaryKey.java

@@ -4,10 +4,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import com.galaxis.manatee.util.ChuanyunLocalDateTimeDeserializer;
-import com.galaxis.manatee.util.ChuanyunLocalDateTimeSerializer;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.Embeddable;
 import java.time.LocalDateTime;

src/main/java/com/galaxis/manatee/entity/chuanyun/dto/ChuanyunLaborCostWgDTO.java

@@ -3,17 +3,14 @@ package com.galaxis.manatee.entity.chuanyun.dto;
 
 import lombok.Data;
 
+import javax.persistence.EmbeddedId;
 import java.math.BigDecimal;
 
 @Data
 public class ChuanyunLaborCostWgDTO {
 
-
-    private ChuanyunLaborCostPrimaryKey chuanyunLaborCostPrimaryKey;
+    @EmbeddedId
+    private ChuanyunLaborCostWgPrimaryKey chuanyunLaborCostWgPrimaryKey;
 
     private BigDecimal costamount;
-
-    private String workgroupid;
-
-    private String workgroupname;
 }

src/main/java/com/galaxis/manatee/entity/chuanyun/dto/ChuanyunLaborCostWgPrimaryKey.java

@@ -0,0 +1,27 @@
+package com.galaxis.manatee.entity.chuanyun.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import lombok.Data;
+
+import javax.persistence.Embeddable;
+import java.time.LocalDateTime;
+
+@Embeddable
+@Data
+public class ChuanyunLaborCostWgPrimaryKey {
+
+    protected String projectcode;
+
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    protected LocalDateTime period;
+
+    protected String department;
+
+    protected String workgroupid;
+
+    protected String workgroupname;
+}

src/main/java/com/galaxis/manatee/task/U9InfoTask.java

@@ -626,10 +626,10 @@ public class U9InfoTask {
                 try {
                     if (!Objects.isNull(laborCostWgDTO)) {
                         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");
-                        String newDate = dateTimeFormatter.format(laborCostWgDTO.getChuanyunLaborCostPrimaryKey().getPeriod());
+                        String newDate = dateTimeFormatter.format(laborCostWgDTO.getChuanyunLaborCostWgPrimaryKey().getPeriod());
                         LocalDateTime dt = LocalDateTime.parse(newDate, dateTimeFormatter);
-                        laborCostWgDTO.getChuanyunLaborCostPrimaryKey().setPeriod(dt);
-                        String[] department = laborCostWgDTO.getChuanyunLaborCostPrimaryKey().getDepartment().split("/");
+                        laborCostWgDTO.getChuanyunLaborCostWgPrimaryKey().setPeriod(dt);
+                        String[] department = laborCostWgDTO.getChuanyunLaborCostWgPrimaryKey().getDepartment().split("/");
 
                         LaborCostWgDTO costWgDTO = new LaborCostWgDTO(laborCostWgDTO);
                         if (department.length > 1 && (department[1].equals("EBG") || department[1].equals("IBG"))) {
@@ -641,10 +641,10 @@ public class U9InfoTask {
                         ChuanyunSaveDTO chuanyunSaveDTO;
                         //根据项目号判断是否存在
                         List<String> matchers = new ArrayList<>();
-                        matchers.add("F0000005_2," + laborCostWgDTO.getChuanyunLaborCostPrimaryKey().getProjectcode());
-                        matchers.add("F0000002_2," + TimeUtil.formatDateTime(laborCostWgDTO.getChuanyunLaborCostPrimaryKey().getPeriod()));
-                        if (StringUtils.hasLength(laborCostWgDTO.getChuanyunLaborCostPrimaryKey().getDepartment())) {
-                            matchers.add("F0000018_2," + laborCostWgDTO.getChuanyunLaborCostPrimaryKey().getDepartment());
+                        matchers.add("F0000005_2," + laborCostWgDTO.getChuanyunLaborCostWgPrimaryKey().getProjectcode());
+                        matchers.add("F0000002_2," + TimeUtil.formatDateTime(laborCostWgDTO.getChuanyunLaborCostWgPrimaryKey().getPeriod()));
+                        if (StringUtils.hasLength(laborCostWgDTO.getChuanyunLaborCostWgPrimaryKey().getDepartment())) {
+                            matchers.add("F0000018_2," + laborCostWgDTO.getChuanyunLaborCostWgPrimaryKey().getDepartment());
                         }
                         var filter = Filter.instance(0, 1, true, "And", matchers);
                         var chuanyunFindAllResponse = chuanYunManager.findAll(ChuanyunMonthLaborCostWgDO.SCHEMA_CODE, filter);
@@ -684,8 +684,8 @@ public class U9InfoTask {
      */
     private void saveDbLaborCostWg() {
         log.info("开始保存项目工作组人力成本");
-        var page = 33;
-        var size = 1000;
+        var page = 1;
+        var size = 200;
         var flag = true;
         while (flag) {
             Map<String, String> map = new HashMap<>(1);
@@ -704,10 +704,10 @@ public class U9InfoTask {
                 if (!Objects.isNull(laborCostWgDTO)) {
                     // 保存至数据库
                     // 查询数据库比较数据
-                    String projectCode = laborCostWgDTO.getChuanyunLaborCostPrimaryKey().getProjectcode();
-                    LocalDateTime time = laborCostWgDTO.getChuanyunLaborCostPrimaryKey().getPeriod();
-                    String department = laborCostWgDTO.getChuanyunLaborCostPrimaryKey().getDepartment();
-                    String workGroupId = laborCostWgDTO.getWorkgroupid();
+                    String projectCode = laborCostWgDTO.getChuanyunLaborCostWgPrimaryKey().getProjectcode();
+                    LocalDateTime time = laborCostWgDTO.getChuanyunLaborCostWgPrimaryKey().getPeriod();
+                    String department = laborCostWgDTO.getChuanyunLaborCostWgPrimaryKey().getDepartment();
+                    String workGroupId = laborCostWgDTO.getChuanyunLaborCostWgPrimaryKey().getWorkgroupid();
                     List<ChuanyunMonthLaborCostWgDTO> laborCostWg = chuanyunMonthLaborCostWgDao.findAllByProjectCodeAndLogDateAndWorkGroupIdAndDepartment(projectCode, time, workGroupId, department);
 
                     if (laborCostWg.isEmpty()) {
@@ -741,7 +741,7 @@ public class U9InfoTask {
         ChuanyunMonthLaborCostWgDTO monthLaborCostWgDTO = new ChuanyunMonthLaborCostWgDTO();
         monthLaborCostWgDTO.setProjectCode(projectCode);
         monthLaborCostWgDTO.setWorkGroupId(workGroupId);
-        monthLaborCostWgDTO.setWorkGroupName(laborCostWgDTO.getWorkgroupname());
+        monthLaborCostWgDTO.setWorkGroupName(laborCostWgDTO.getChuanyunLaborCostWgPrimaryKey().getWorkgroupname());
         monthLaborCostWgDTO.setAmount(laborCostWgDTO.getCostamount());
         monthLaborCostWgDTO.setLogDate(time);
         monthLaborCostWgDTO.setDepartment(department);
@@ -1030,21 +1030,21 @@ public class U9InfoTask {
                 if (null != chuanyunMonthLaborCostWgDTO.getCostamount()) {
                     this.amount = chuanyunMonthLaborCostWgDTO.getCostamount();
                 }
-                if (null != chuanyunMonthLaborCostWgDTO.getChuanyunLaborCostPrimaryKey().getProjectcode()) {
-                    this.projectCode = chuanyunMonthLaborCostWgDTO.getChuanyunLaborCostPrimaryKey().getProjectcode();
+                if (null != chuanyunMonthLaborCostWgDTO.getChuanyunLaborCostWgPrimaryKey().getProjectcode()) {
+                    this.projectCode = chuanyunMonthLaborCostWgDTO.getChuanyunLaborCostWgPrimaryKey().getProjectcode();
                 }
-                if (null != chuanyunMonthLaborCostWgDTO.getChuanyunLaborCostPrimaryKey().getPeriod()) {
-                    this.logDate = chuanyunMonthLaborCostWgDTO.getChuanyunLaborCostPrimaryKey().getPeriod();
+                if (null != chuanyunMonthLaborCostWgDTO.getChuanyunLaborCostWgPrimaryKey().getPeriod()) {
+                    this.logDate = chuanyunMonthLaborCostWgDTO.getChuanyunLaborCostWgPrimaryKey().getPeriod();
                 }
-                if (null != chuanyunMonthLaborCostWgDTO.getChuanyunLaborCostPrimaryKey().getDepartment()) {
-                    this.departmentName = chuanyunMonthLaborCostWgDTO.getChuanyunLaborCostPrimaryKey().getDepartment();
+                if (null != chuanyunMonthLaborCostWgDTO.getChuanyunLaborCostWgPrimaryKey().getDepartment()) {
+                    this.departmentName = chuanyunMonthLaborCostWgDTO.getChuanyunLaborCostWgPrimaryKey().getDepartment();
                 }
-                if (!Objects.isNull(chuanyunMonthLaborCostWgDTO.getWorkgroupid())) {
-                    this.workGroupId = chuanyunMonthLaborCostWgDTO.getWorkgroupid();
+                if (!Objects.isNull(chuanyunMonthLaborCostWgDTO.getChuanyunLaborCostWgPrimaryKey().getWorkgroupid())) {
+                    this.workGroupId = chuanyunMonthLaborCostWgDTO.getChuanyunLaborCostWgPrimaryKey().getWorkgroupid();
                 }
 
-                if (!Objects.isNull(chuanyunMonthLaborCostWgDTO.getWorkgroupname())) {
-                    this.workGroupName = chuanyunMonthLaborCostWgDTO.getWorkgroupname();
+                if (!Objects.isNull(chuanyunMonthLaborCostWgDTO.getChuanyunLaborCostWgPrimaryKey().getWorkgroupname())) {
+                    this.workGroupName = chuanyunMonthLaborCostWgDTO.getChuanyunLaborCostWgPrimaryKey().getWorkgroupname();
                 }
 
             }