1.修改氚云工时统计

src/main/java/com/galaxis/manatee/service/DataArcherService.java

@@ -46,25 +46,23 @@ public class DataArcherService {
             if (chuanyunSelfWorkHourDTO.getStatus().equals("3")){
                 matchers.add("F0000006_2," + chuanyunSelfWorkHourDTO.getStatus());
             }
-            var filter = Filter.instance(0, 1, true, "And", matchers);
+            var filter = Filter.instance(0, Integer.MAX_VALUE, true, "And", matchers);
             var chuanyunFindAllResponse = chuanYunManager.findAll(ChuanyunMemberHourDO.SCHEMA_CODE, filter);
             var selfMonthString = objectMapper.writeValueAsString(chuanyunSelfWorkHourDTO);
             ChuanyunSaveDTO chuanyunSaveDTO;
             if (chuanyunFindAllResponse.getReturnData() != null) {
                 List<ChuanyunMemberHourDO> result = objectMapper.convertValue(chuanyunFindAllResponse.getReturnData().getBizObjectArray(), new TypeReference<>() {
                 });
-                log.info("更新工时："+chuanyunSelfWorkHourDTO);
-                chuanyunSaveDTO = chuanYunManager.update(ChuanyunMemberHourDO.SCHEMA_CODE, result.get(0).getObjectId(), selfMonthString);
-                if (!chuanyunSaveDTO.getSuccessful()) {
-                    log.warn("更新工时标准化失败");
-                }
-            } else {
-                log.info("新增工时："+chuanyunSelfWorkHourDTO);
-                chuanyunSaveDTO = chuanYunManager.save(ChuanyunMemberHourDO.SCHEMA_CODE, selfMonthString, true);
-                if (!chuanyunSaveDTO.getSuccessful()) {
-                    log.warn("新增工时标准化失败");
-                }
+                result.forEach(chuanyunMemberHourDO -> {
+                    chuanYunManager.delete(ChuanyunMemberHourDO.SCHEMA_CODE,chuanyunMemberHourDO.getObjectId());
+                });
             }
+            log.info("新增工时："+chuanyunSelfWorkHourDTO);
+            chuanyunSaveDTO = chuanYunManager.save(ChuanyunMemberHourDO.SCHEMA_CODE, selfMonthString, true);
+            if (!chuanyunSaveDTO.getSuccessful()) {
+                log.warn("新增工时标准化失败");
+            }
+
 
         } catch (Exception e) {
             log.warn("更新标准工时异常" + chuanyunSelfWorkHourDTO,e);
@@ -87,18 +85,19 @@ public class DataArcherService {
             matchers.add("F0000008_2," + chuanyunWeekMemberHourDTO.getYear());
             matchers.add("F0000003_2," + chuanyunWeekMemberHourDTO.getProjectType());
             matchers.add("F0000007_2," + chuanyunWeekMemberHourDTO.getStatus());
-            var filter = Filter.instance(0, 1, true, "And", matchers);
+            var filter = Filter.instance(0, Integer.MAX_VALUE, true, "And", matchers);
             var chuanyunFindAllResponse = chuanYunManager.findAll(ChuanyunProjectMemberWeekHourDO.SCHEMA_CODE, filter);
             var selfMonthString = objectMapper.writeValueAsString(chuanyunWeekMemberHourDTO);
             ChuanyunSaveDTO chuanyunSaveDTO;
             if (chuanyunFindAllResponse.getReturnData() != null) {
                 List<ChuanyunProjectMemberWeekHourDO> result = objectMapper.convertValue(chuanyunFindAllResponse.getReturnData().getBizObjectArray(), new TypeReference<>() {
                 });
-                ChuanyunProjectMemberWeekHourDO firstResult = result.get(0);
-                chuanyunSaveDTO = chuanYunManager.update(ChuanyunProjectMemberWeekHourDO.SCHEMA_CODE, firstResult.getObjectId(), selfMonthString);
-            } else {
-                chuanyunSaveDTO = chuanYunManager.save(ChuanyunProjectMemberWeekHourDO.SCHEMA_CODE, selfMonthString, true);
+                result.forEach(chuanyunProjectMemberWeekHourDO -> {
+                    chuanYunManager.delete(ChuanyunProjectMemberWeekHourDO.SCHEMA_CODE,chuanyunProjectMemberWeekHourDO.getObjectId());
+                });
             }
+
+            chuanyunSaveDTO = chuanYunManager.save(ChuanyunProjectMemberWeekHourDO.SCHEMA_CODE, selfMonthString, true);
             if (!chuanyunSaveDTO.getSuccessful()) {
                 log.warn("新增人员项目周度工时失败");
             }
@@ -130,11 +129,12 @@ public class DataArcherService {
             if (chuanyunFindAllResponse.getReturnData() != null) {
                 List<ChuanyunMemberMonthCostDO> result = objectMapper.convertValue(chuanyunFindAllResponse.getReturnData().getBizObjectArray(), new TypeReference<>() {
                 });
-                ChuanyunMemberMonthCostDO firstResult = result.get(0);
-                chuanyunSaveDTO = chuanYunManager.update(ChuanyunMemberMonthCostDO.SCHEMA_CODE, firstResult.getObjectId(), memberMonthString);
-            } else {
-                chuanyunSaveDTO = chuanYunManager.save(ChuanyunMemberMonthCostDO.SCHEMA_CODE, memberMonthString, true);
+                result.forEach(chuanyunMemberMonthCostDO -> {
+                    chuanYunManager.delete(ChuanyunMemberMonthCostDO.SCHEMA_CODE,chuanyunMemberMonthCostDO.getObjectId());
+                });
             }
+
+            chuanyunSaveDTO = chuanYunManager.save(ChuanyunMemberMonthCostDO.SCHEMA_CODE, memberMonthString, true);
             if (!chuanyunSaveDTO.getSuccessful()) {
                 log.warn("新增项目成员月度工时汇总失败");
             }