|
|
@@ -358,7 +358,7 @@ public class ChuanyunProjectScheduledTask {
|
|
|
matchers.add("F0000002_2,"+chuanyunWeekMemberHourDO.getUserId());
|
|
|
matchers.add("F0000006_2,"+chuanyunWeekMemberHourDO.getWeek());
|
|
|
matchers.add("F0000003_2,"+chuanyunWeekMemberHourDO.getProjectType());
|
|
|
-// matchers.add("F0000007_2,"+chuanyunWeekMemberHourDO.getStatus());
|
|
|
+ matchers.add("F0000007_2,"+chuanyunWeekMemberHourDO.getStatus());
|
|
|
var filter= Filter.instance(0,1,true,"And",matchers);
|
|
|
var chuanyunFindAllResponse=chuanYunManager.findAll(ChuanyunProjectMemberWeekHourDO.SCHEMA_CODE,filter);
|
|
|
var selfMonthString=objectMapper.writeValueAsString(chuanyunProjectMemberWeekHourDTO);
|
|
|
@@ -566,7 +566,7 @@ public class ChuanyunProjectScheduledTask {
|
|
|
matchers.add("F0000002_2,"+chuanyunUserCompanyDO.getUserId());
|
|
|
matchers.add("F0000003_2,"+self.getDayLogDate());
|
|
|
matchers.add("F0000005_2,"+self.getProjectType());
|
|
|
- matchers.add("F0000006_2,"+self.getStatus());
|
|
|
+// matchers.add("F0000006_2,"+self.getStatus());
|
|
|
var filter= Filter.instance(0,1,true,"And",matchers);
|
|
|
var chuanyunFindAllResponse=chuanYunManager.findAll(ChuanyunMemberHourDO.SCHEMA_CODE,filter);
|
|
|
var selfMonthString=objectMapper.writeValueAsString(chuanyunSelfWorkHourDTO);
|
|
|
@@ -643,7 +643,7 @@ public class ChuanyunProjectScheduledTask {
|
|
|
try {
|
|
|
List<String> matchers = new ArrayList<>();
|
|
|
matchers.add("F0000003_2,"+projectMonth.getProjectId());
|
|
|
-// matchers.add("F0000009_2,"+projectMonth.getStatus());
|
|
|
+ matchers.add("F0000009_2,"+projectMonth.getStatus());
|
|
|
matchers.add("F0000002_2,"+projectMonth.getUserId());
|
|
|
matchers.add("F0000004_2,"+projectMonth.getDayLogDate().withDayOfMonth(1));
|
|
|
var filter= Filter.instance(0,1,true,"And",matchers);
|
verguenza