1.修改销售合同管理

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

@@ -109,10 +109,10 @@ public class ChuanyunBasicDataScheduledTask {
      */
     @Scheduled(fixedDelay = 3600000L)
     private void getDataFromChuanyun() {
-        //获取集团项目数据
-        getGroupProject();
         //获取人员-归属公司信息
         getUserCompany();
+        //获取集团项目数据
+        getGroupProject();
         //获取用户数据
         getUserList();
         //支出档案类型

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

@@ -55,17 +55,18 @@ public class U9InfoTask {
     private void getDataFromU9() {
         savePurCost();
         saveCashFlow();
-        saveSupplier();
         saveLaborCost();
         saveBudgetStatistics();
-        saveSalesCollection();
         saveSalesContract();
+        saveSalesCollection();
+        saveSupplier();
     }
 
     /**
      * 更新项目物料成本
      */
     private void savePurCost() {
+        log.info("开始更新项目物料成本");
         var objectMapper=new ObjectMapper();
         var page = 1;
         var size = 20;
@@ -120,6 +121,7 @@ public class U9InfoTask {
      * 更新销售合同管理
      */
     private void saveSalesContract(){
+        log.info("开始更新销售合同管理");
         var objectMapper=new ObjectMapper();
         var page = 1;
         var size = 20;
@@ -149,6 +151,7 @@ public class U9InfoTask {
                     }
                     SalesContractDTO salesContractDTO = new SalesContractDTO(chuanyunSalesContractDTO);
                     salesContractDTO.setContractStatus("已完结");
+                    salesContractDTO.setDataSource("U9");
                     DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");
                     String newDate = dateTimeFormatter.format(chuanyunSalesContractDTO.getBusinessdate());
                     LocalDateTime dt = LocalDateTime.parse(newDate,dateTimeFormatter);
@@ -185,7 +188,7 @@ public class U9InfoTask {
                     }
                     chuanyunSaveDTO =chuanYunManager.save(ChuanyunSaleContractDO.SCHEMA_CODE,purcostString,true);
                     if(chuanyunSaveDTO.getSuccessful()){
-                        log.info("新增销售合同管理成功");
+//                        log.info("新增销售合同管理成功");
                     }else{
                         log.warn("新增销售合同管理失败");
                     }
@@ -200,6 +203,7 @@ public class U9InfoTask {
      * 更新销售合同回款明细
      */
     private void saveSalesCollection(){
+        log.info("开始更新销售合同回款明细");
         var objectMapper=new ObjectMapper();
         var start=0;
         var totalCount=0L;
@@ -226,6 +230,7 @@ public class U9InfoTask {
                     if (collectionDetailDTOList!=null&&collectionDetailDTOList.size()>0){
                         try {
                             SalesCollectionDTO salesCollectionDTO = new SalesCollectionDTO();
+                            salesCollectionDTO.setDataSource("U9");
                             //销售合同id
                             salesCollectionDTO.setSaleContractId(chuanyunSaleContractDO.getObjectId());
                             //剩余回款金额
@@ -239,10 +244,12 @@ public class U9InfoTask {
                             Set<ReceivePlanDTO> receivePlanDTOS = new HashSet<>();
                             collectionDetailDTOList.forEach(chuanyunSalesCollectionDetailDTO -> {
                                 ReceivePlanDTO receivePlanDTO = new ReceivePlanDTO(chuanyunSalesCollectionDetailDTO);
-                                DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");
-                                String newDate = dateTimeFormatter.format(chuanyunSalesCollectionDetailDTO.getPlandate());
-                                LocalDateTime dt = LocalDateTime.parse(newDate,dateTimeFormatter);
-                                receivePlanDTO.setPlanDateTime(dt);
+                                if (chuanyunSalesCollectionDetailDTO.getPlandate()!=null) {
+                                    DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");
+                                    String newDate = dateTimeFormatter.format(chuanyunSalesCollectionDetailDTO.getPlandate());
+                                    LocalDateTime dt = LocalDateTime.parse(newDate,dateTimeFormatter);
+                                    receivePlanDTO.setPlanDateTime(dt);
+                                }
                                 receivePlanDTOS.add(receivePlanDTO);
                             });
                             salesCollectionDTO.setPlanList(receivePlanDTOS);
@@ -259,7 +266,7 @@ public class U9InfoTask {
                             }
                             chuanyunSaveDTO =chuanYunManager.save(ChuanyunPaymentReceiveDO.SCHEMA_CODE,purcostString,true);
                             if(chuanyunSaveDTO.getSuccessful()){
-                                log.info("新增销售合同汇款明细成功");
+//                                log.info("新增销售合同汇款明细成功");
                             }else{
                                 log.warn("新增销售合同汇款明细失败");
                             }
@@ -280,6 +287,7 @@ public class U9InfoTask {
      * 更新项目收付款
      */
     private void saveCashFlow() {
+        log.info("开始更新项目收付款");
         var objectMapper=new ObjectMapper();
         var page = 1;
         var size = 20;
@@ -334,6 +342,7 @@ public class U9InfoTask {
      * U9供应商信息
      */
     private void saveSupplier() {
+        log.info("开始更新供应商信息");
         var objectMapper=new ObjectMapper();
         var page = 1;
         var size = 20;
@@ -384,6 +393,7 @@ public class U9InfoTask {
      * 新增人力成本
      */
     private void saveLaborCost() {
+        log.info("开始更新项目人力成本");
         var objectMapper=new ObjectMapper();
         var page = 1;
         var size = 20;
@@ -444,6 +454,7 @@ public class U9InfoTask {
      * 更新项目预决算统计
      */
     private void saveBudgetStatistics() {
+        log.info("开始更新项目预决算");
         List<ChuanyunBudgetStatisticsDO> list = chuanyunBudgetStatisticsDao.findAll();
         list.forEach(chuanyunBudgetStatisticsDO -> {
             if (!StringUtils.isEmpty(chuanyunBudgetStatisticsDO.getProject())){
@@ -739,6 +750,9 @@ public class U9InfoTask {
         @JsonProperty("F0000021")
         private BigDecimal totalAmount;
 
+        @JsonProperty("F0000077")
+        private String dataSource;
+
         @JsonProperty("D001789Ffc834ddecbfe44b084795aa48e80bfcf")
         @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
         private List<SalesContractOfferDTO> chuanyunSaleContractDetailDOList;
@@ -866,6 +880,9 @@ public class U9InfoTask {
         @JsonProperty("F0000012")
         private BigDecimal cumulativeAmount;
 
+        @JsonProperty("F0000047")
+        private String dataSource;
+
         @JsonProperty("D001789F2a010fe1818a4020b1ff5a33533f9e44")
         @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true,fetch = FetchType.EAGER)
         private Set<ReceivePlanDTO> planList;