Merge branch '1.0' of codeup.aliyun.com:5ec7ea24405cdab50f3fd8f0/galaxis/manatee into 1.0

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

@@ -98,16 +98,15 @@ public class ChuanyunBasicDataScheduledTask {
     public void getCostCollectionManually() {this.getCostCollection();}
 
     public void getGroupProjectForSynchronizationManually() {this.getGroupProjectForSynchronization();}
+
+
     /**
      * 定时将氚云中的数据保存到manatee
      */
     @Scheduled(fixedDelay = 3600000L)
     private void getDataFromChuanyun() {
-
-        //项目人力成本
-        saveLaborCost();
         //钉钉请假
-//        saveAskForLeave();
+        saveAskForLeave();
         //专项费用分摊
         getSpecialProcedure();
         //获取人员-归属公司信息
@@ -117,7 +116,7 @@ public class ChuanyunBasicDataScheduledTask {
         //人工成本特殊项目
         getCostCollection();
         //获取集团项目数据
-//        getGroupProject();
+        getGroupProject();
         //获取用户数据
         getUserList();
         //支出档案类型
@@ -202,8 +201,6 @@ public class ChuanyunBasicDataScheduledTask {
                         chuanyunGroupProjectDO.setIsCreate(projectDO.getIsCreate());
                         chuanyunGroupProjectDao.delete(tmpGroupProjectDO.get());
                     });
-
-//                    updateProjectDetail(chuanyunGroupProjectDO);
                     //处理项目对象中的项目成员数据
                     projectMemberListCheck(chuanyunGroupProjectDO);
                     //处理项目对象中的项目经理、项目负责人数据
@@ -218,30 +215,6 @@ public class ChuanyunBasicDataScheduledTask {
         log.info("集团项目信息保存保存"+totalCount+"项目映射更新完成");
     }
 
-    private void updateProjectDetail(ChuanyunGroupProjectDO chuanyunGroupProjectDO){
-        var objectMapper=new ObjectMapper();
-        List<ChuanyunGroupProjectDetailDO> list = new ArrayList<>();
-        if (chuanyunGroupProjectDO.getDetailList()!=null&&chuanyunGroupProjectDO.getDetailList().size()>0) {
-            for (ChuanyunGroupProjectDetailDO chuanyunGroupProjectDetailDO : chuanyunGroupProjectDO.getDetailList()) {
-                if (!chuanyunGroupProjectDO.getProjectType().equals(chuanyunGroupProjectDetailDO.getType())) {
-                    list.add(chuanyunGroupProjectDetailDO);
-                }
-            }
-        }
-        chuanyunGroupProjectDO.setDetailList(list);
-        var groupProjectDetailDTO = new GroupProjectDetailDTO(chuanyunGroupProjectDO);
-        String groupProjectUpdateString= null;
-        try {
-            groupProjectUpdateString = objectMapper.writeValueAsString(groupProjectDetailDTO);
-            ChuanyunSaveDTO chuanyunSaveDTO=chuanYunManager.update(ChuanyunGroupProjectDO.SCHEMA_CODE,chuanyunGroupProjectDO.getObjectId(),groupProjectUpdateString);
-            if (!chuanyunSaveDTO.getSuccessful()) {
-                log.info(chuanyunGroupProjectDO.getObjectId()+"更新项目组织信息失败"+groupProjectUpdateString);
-            }
-        } catch (JsonProcessingException | BigSizeException e) {
-            e.printStackTrace();
-        }
-
-    }
     /**
      * 更新项目成员方法
      * @param chuanyunGroupProjectDO    项目对象
@@ -481,6 +454,7 @@ public class ChuanyunBasicDataScheduledTask {
     /**
      * 新增人力成本
      */
+    @Scheduled(fixedDelay = 7200000L)
     private void saveLaborCost() {
         var objectMapper=new ObjectMapper();
         var page = 1;
@@ -511,10 +485,10 @@ public class ChuanyunBasicDataScheduledTask {
                         var purcostString=objectMapper.writeValueAsString(laborCostDTO);
                         ChuanyunSaveDTO chuanyunSaveDTO;
                         //根据项目号判断是否存在
-                        List<String> macthers = new ArrayList<>();
-                        macthers.add("F0000005_2,"+chuanyunLaborCostDTO.getChuanyunLaborCostPrimaryKey().getProjectcode());
-                        macthers.add("F0000002_2,"+chuanyunLaborCostDTO.getChuanyunLaborCostPrimaryKey().getPeriod());
-                        var filter= Filter.instance(0,1,true,"And",macthers);
+                        List<String> matchers = new ArrayList<>();
+                        matchers.add("F0000005_2,"+chuanyunLaborCostDTO.getChuanyunLaborCostPrimaryKey().getProjectcode());
+                        matchers.add("F0000002_2,"+chuanyunLaborCostDTO.getChuanyunLaborCostPrimaryKey().getPeriod());
+                        var filter= Filter.instance(0,1,true,"And",matchers);
                         var chuanyunFindAllResponse=chuanYunManager.findAll(ChuanyunMonthLaborCostDO.SCHEMA_CODE,filter);
                         if (chuanyunFindAllResponse.getReturnData() == null) {
                             //新增
@@ -526,7 +500,7 @@ public class ChuanyunBasicDataScheduledTask {
                             chuanyunSaveDTO = chuanYunManager.update(ChuanyunMonthLaborCostDO.SCHEMA_CODE,result.get(0).getObjectId(),purcostString);
                         }
                         if(chuanyunSaveDTO.getSuccessful()){
-                            log.info("新增项目人力成本成功");
+//                            log.info("新增项目人力成本成功");
                         }else{
                             log.warn("新增项目人力成本失败");
                         }
@@ -755,7 +729,7 @@ public class ChuanyunBasicDataScheduledTask {
                             groupProjectUpdateString = objectMapper.writeValueAsString(reimbursementItemsDTO);
                             ChuanyunSaveDTO chuanyunSaveDTO=chuanYunManager.update(ChuanyunReimbursementItemsDO.SCHEMA_CODE,chuanyunReimbursementItemsDO.getObjectId(),groupProjectUpdateString);
                             if(chuanyunSaveDTO.getSuccessful()) {
-                                log.info(chuanyunReimbursementItemsDO.getObjectId() + "同步外部项目名称成功" + groupProjectUpdateString);
+//                                log.info(chuanyunReimbursementItemsDO.getObjectId() + "同步外部项目名称成功" + groupProjectUpdateString);
                             }else{
                                 log.warn(chuanyunReimbursementItemsDO.getObjectId()+"同步外部项目名称失败"+groupProjectUpdateString);
                             }