|
@@ -43,8 +43,9 @@ public class DataArcherService {
|
|
|
matchers.add("F0000002_2," + chuanyunSelfWorkHourDTO.getUserId());
|
|
|
matchers.add("F0000003_2," + chuanyunSelfWorkHourDTO.getDayLogDate());
|
|
|
matchers.add("F0000005_2," + chuanyunSelfWorkHourDTO.getProjectType());
|
|
|
+ matchers.add("F0000006_2," + chuanyunSelfWorkHourDTO.getStatus());
|
|
|
var filter = Filter.instance(0, 1, true, "And", matchers);
|
|
|
- var chuanyunFindAllResponse = chuanYunManager.findAll(ChuanyunSelfWorkHourDTO.SCHEMA_CODE, filter);
|
|
|
+ var chuanyunFindAllResponse = chuanYunManager.findAll(ChuanyunMemberHourDO.SCHEMA_CODE, filter);
|
|
|
var selfMonthString = objectMapper.writeValueAsString(chuanyunSelfWorkHourDTO);
|
|
|
ChuanyunSaveDTO chuanyunSaveDTO;
|
|
|
if (chuanyunFindAllResponse.getReturnData() != null) {
|
|
@@ -59,6 +60,7 @@ public class DataArcherService {
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
+ log.info("工时:"+chuanyunSelfWorkHourDTO);
|
|
|
chuanyunSaveDTO = chuanYunManager.save(ChuanyunMemberHourDO.SCHEMA_CODE, selfMonthString, true);
|
|
|
if (!chuanyunSaveDTO.getSuccessful()) {
|
|
|
log.warn("新增工时标准化失败");
|