1.上传测试

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

@@ -58,8 +58,8 @@ public class U9InfoTask {
 
     @Scheduled(fixedDelay = 3600000L)
     private void getDataFromU9() {
-        savePurCost();
-        saveCashFlow();
+//        savePurCost();
+//        saveCashFlow();
         saveLaborCost();
         saveSubLaborCost();
         saveBudgetStatistics();
@@ -112,7 +112,7 @@ public class U9InfoTask {
                             chuanyunSaveDTO = chuanYunManager.update(ChuanyunPurCostDO.SCHEMA_CODE,chuanyunPurCostDO.getObjectId(),purcostString);
                         }
                         if(chuanyunSaveDTO.getSuccessful()){
-//                            log.info("新增项目物料成本成功");
+                            log.info("新增项目物料成本成功");
                         }else{
                             log.warn("新增项目物料成本失败");
                         }
@@ -482,7 +482,7 @@ public class U9InfoTask {
                     ChuanyunSaveDTO chuanyunSaveDTO;
                     //根据编码判断供应商是否存在
                     List<String> macthers = new ArrayList<>();
-                    macthers.add("F0000001_2,"+chuanyunSupplierDTO.getName());
+                    macthers.add("F0000002_2,"+chuanyunSupplierDTO.getCode());
                     var filter= Filter.instance(0,1,true,"And",macthers);
                     var chuanyunFindAllResponse=chuanYunManager.findAll(ChuanyunSupplierDO.SCHEMA_CODE,filter);
                     if (chuanyunFindAllResponse.getReturnData() == null) {
@@ -492,7 +492,7 @@ public class U9InfoTask {
                         chuanyunSaveDTO=chuanYunManager.update(ChuanyunSupplierDO.SCHEMA_CODE,result.get(0).getObjectId(),supplierString);
                     }
                     if(chuanyunSaveDTO.getSuccessful()){
-//                        log.info("新增供应商信息成功");
+                        log.info("新增供应商信息成功");
                     }else{
                         log.warn("新增供应商信息失败");
                     }
@@ -518,15 +518,15 @@ public class U9InfoTask {
             map.put("page",String.valueOf(page));
             map.put("size",String.valueOf(size));
             //获取物料成本
-            PageDTO<ChuanyunLaborCostDTO> pageInfo = clawFeign.findChuanyunLaborCost(map);
-            if (page<=pageInfo.getTotalPages()){
-                page += 1;
-            }else {
-                flag = false;
-                break;
-            }
-            List<ChuanyunLaborCostDTO> list = pageInfo.getContent();
-            list.forEach(chuanyunLaborCostDTO -> {
+            List<ChuanyunLaborCostDTO> pageInfo = clawFeign.findAlllabCost();
+//            if (page<=pageInfo.getTotalPages()){
+//                page += 1;
+//            }else {
+//                flag = false;
+//                break;
+//            }
+//            List<ChuanyunLaborCostDTO> list = pageInfo.getContent();
+            pageInfo.forEach(chuanyunLaborCostDTO -> {
                 try {
                     if(chuanyunLaborCostDTO != null) {
                         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");
@@ -534,15 +534,14 @@ public class U9InfoTask {
                         LocalDateTime dt = LocalDateTime.parse(newDate,dateTimeFormatter);
                         chuanyunLaborCostDTO.getChuanyunLaborCostPrimaryKey().setPeriod(dt);
                         String[] department = chuanyunLaborCostDTO.getChuanyunLaborCostPrimaryKey().getDepartment().split("/");
-//                        if (department!=null&&department.length>0){
-//                            chuanyunLaborCostDTO.getChuanyunLaborCostPrimaryKey().setDepartment(department[department.length-1]);
-//                        }
+
                         LaborCostDTO laborCostDTO = new LaborCostDTO(chuanyunLaborCostDTO);
                         if (department.length>1 && (department[1].equals("EBG")||department[1].equals("IBG"))){
                             laborCostDTO.setBg(department[1]);
                         }
                         laborCostDTO.setDataType("U9");
                         var purcostString=objectMapper.writeValueAsString(laborCostDTO);
+                        log.info(purcostString);
                         ChuanyunSaveDTO chuanyunSaveDTO;
                         //根据项目号判断是否存在
                         List<String> matchers = new ArrayList<>();
@@ -554,16 +553,17 @@ public class U9InfoTask {
                         if (chuanyunFindAllResponse.getReturnData() == null) {
                             //新增
                             chuanyunSaveDTO =chuanYunManager.save(ChuanyunMonthLaborCostDO.SCHEMA_CODE,purcostString,true);
+                            log.info("人力成本新增成功");
                         }else {
                             List<ChuanyunMonthLaborCostDO> result=objectMapper.convertValue(chuanyunFindAllResponse.getReturnData().getBizObjectArray(), new TypeReference<>(){});
-//                            ChuanyunMonthLaborCostDO chuanyunMonthLaborCostDO = result.get(0);
-                            //更新
-                            chuanyunSaveDTO = chuanYunManager.update(ChuanyunMonthLaborCostDO.SCHEMA_CODE,result.get(0).getObjectId(),purcostString);
-                        }
-                        if(chuanyunSaveDTO.getSuccessful()){
-                            log.info("新增项目人力成本成功");
-                        }else{
-                            log.warn("新增项目人力成本失败");
+                            if (result.size()>0){
+                                ChuanyunMonthLaborCostDO chuanyunMonthLaborCostDO = result.get(0);
+                                //更新
+                                if (chuanyunMonthLaborCostDO.getAmount().compareTo(chuanyunLaborCostDTO.getCostamount())!=0){
+                                    chuanyunSaveDTO = chuanYunManager.update(ChuanyunMonthLaborCostDO.SCHEMA_CODE,chuanyunMonthLaborCostDO.getObjectId(),purcostString);
+                                    log.info("人力成本更新成功");
+                                }
+                            }
                         }
                     }
                 } catch (JsonProcessingException | BigSizeException e) {