|
@@ -106,7 +106,7 @@ public class LogCheckService {
|
|
});
|
|
});
|
|
chuanyunSaveDTO = chuanYunManager.delete(ChuanyunProjectMemberWeekHourDO.SCHEMA_CODE, result.get(0).getObjectId());
|
|
chuanyunSaveDTO = chuanYunManager.delete(ChuanyunProjectMemberWeekHourDO.SCHEMA_CODE, result.get(0).getObjectId());
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ log.info(chuanyunWeekMemberHourDO.getUserId()+"删除项目"+chuanyunWeekMemberHourDO.getProjectId()+"时间为"+chuanyunWeekMemberHourDO.getYear()+"年"+chuanyunWeekMemberHourDO.getWeek()+"周工时");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -145,7 +145,7 @@ public class LogCheckService {
|
|
List<String> matchers = new ArrayList<>();
|
|
List<String> matchers = new ArrayList<>();
|
|
matchers.add("F0000003_2,"+chuanyunSelfCostDO.getProjectId());
|
|
matchers.add("F0000003_2,"+chuanyunSelfCostDO.getProjectId());
|
|
matchers.add("F0000002_2,"+chuanyunSelfCostDO.getUserId());
|
|
matchers.add("F0000002_2,"+chuanyunSelfCostDO.getUserId());
|
|
- matchers.add("F0000004_2,"+chuanyunSelfCostDO.getDayLogDate());
|
|
|
|
|
|
+ matchers.add("F0000004_2,"+chuanyunSelfCostDO.getDayLogDate().plusDays(1).withDayOfMonth(1));
|
|
var filter = Filter.instance(0, 1, true, "And", matchers);
|
|
var filter = Filter.instance(0, 1, true, "And", matchers);
|
|
var chuanyunFindAllResponse = chuanYunManager.findAll(ChuanyunMemberMonthCostDO.SCHEMA_CODE, filter);
|
|
var chuanyunFindAllResponse = chuanYunManager.findAll(ChuanyunMemberMonthCostDO.SCHEMA_CODE, filter);
|
|
ChuanyunSaveDTO chuanyunSaveDTO;
|
|
ChuanyunSaveDTO chuanyunSaveDTO;
|