|
@@ -268,12 +268,18 @@ public class WorkHourStatistics {
|
|
|
List<ChuanyunMemberHourDO> result = objectMapper.convertValue(chuanyunFindAllResponse.getReturnData().getBizObjectArray(), new TypeReference<>() {
|
|
|
});
|
|
|
ChuanyunMemberHourDO firstResult = result.get(0);
|
|
|
- chuanyunSaveDTO = chuanYunManager.update(ChuanyunMemberHourDO.SCHEMA_CODE, firstResult.getObjectId(), selfMonthString);
|
|
|
+ //增加工时不相等再更新每日工时数据的
|
|
|
+ if(0!=firstResult.getStandardWorkHour().compareTo(chuanyunSelfWorkHourDO.getStandardWorkHour())){
|
|
|
+ chuanyunSaveDTO = chuanYunManager.update(ChuanyunMemberHourDO.SCHEMA_CODE, firstResult.getObjectId(), selfMonthString);
|
|
|
+ if (!chuanyunSaveDTO.getSuccessful()) {
|
|
|
+ log.warn("更新工时标准化失败");
|
|
|
+ }
|
|
|
+ }
|
|
|
} else {
|
|
|
chuanyunSaveDTO = chuanYunManager.save(ChuanyunMemberHourDO.SCHEMA_CODE, selfMonthString, true);
|
|
|
- }
|
|
|
- if (!chuanyunSaveDTO.getSuccessful()) {
|
|
|
- log.warn("新增工时标准化失败");
|
|
|
+ if (!chuanyunSaveDTO.getSuccessful()) {
|
|
|
+ log.warn("新增工时标准化失败");
|
|
|
+ }
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
@@ -327,12 +333,17 @@ public class WorkHourStatistics {
|
|
|
List<ChuanyunProjectMemberWeekHourDO> result = objectMapper.convertValue(chuanyunFindAllResponse.getReturnData().getBizObjectArray(), new TypeReference<>() {
|
|
|
});
|
|
|
ChuanyunProjectMemberWeekHourDO firstResult = result.get(0);
|
|
|
- chuanyunSaveDTO = chuanYunManager.update(ChuanyunProjectMemberWeekHourDO.SCHEMA_CODE, firstResult.getObjectId(), selfMonthString);
|
|
|
+ if(0!=firstResult.getTotalHour().compareTo(chuanyunWeekMemberHourDO.getStandardWorkHour())){
|
|
|
+ chuanyunSaveDTO = chuanYunManager.update(ChuanyunProjectMemberWeekHourDO.SCHEMA_CODE, firstResult.getObjectId(), selfMonthString);
|
|
|
+ if (!chuanyunSaveDTO.getSuccessful()) {
|
|
|
+ log.warn("更新人员项目周度工时失败");
|
|
|
+ }
|
|
|
+ }
|
|
|
} else {
|
|
|
chuanyunSaveDTO = chuanYunManager.save(ChuanyunProjectMemberWeekHourDO.SCHEMA_CODE, selfMonthString, true);
|
|
|
- }
|
|
|
- if (!chuanyunSaveDTO.getSuccessful()) {
|
|
|
- log.warn("新增人员项目周度工时失败");
|
|
|
+ if (!chuanyunSaveDTO.getSuccessful()) {
|
|
|
+ log.warn("新增人员项目周度工时失败");
|
|
|
+ }
|
|
|
}
|
|
|
} catch (JsonProcessingException | BigSizeException e) {
|
|
|
e.printStackTrace();
|