|
@@ -277,7 +277,6 @@ public class MonthlySummaryServiceImpl extends ServiceImpl<MonthlySummaryDao, Mo
|
|
|
List<String> workNums = monthlySummaryList.stream().map(MonthlySummary::getWorkNum).collect(Collectors.toList());
|
|
List<String> workNums = monthlySummaryList.stream().map(MonthlySummary::getWorkNum).collect(Collectors.toList());
|
|
|
List<OriginalData> allOriginalDataList = originalDataService.queryByUserId(userIds, workNums);
|
|
List<OriginalData> allOriginalDataList = originalDataService.queryByUserId(userIds, workNums);
|
|
|
List<WorkerIdentity> allWorkIdentityList = workerIdentityService.queryByuserIds(userIds, workNums);
|
|
List<WorkerIdentity> allWorkIdentityList = workerIdentityService.queryByuserIds(userIds, workNums);
|
|
|
- monthlySummaryList = monthlySummaryList.stream().filter(x -> x.getWorkName().equals("王爱琴")).collect(Collectors.toList());
|
|
|
|
|
for (MonthlySummary monthlySummary : monthlySummaryList) {
|
|
for (MonthlySummary monthlySummary : monthlySummaryList) {
|
|
|
|
|
|
|
|
MonthlyDto monthlyDto = new MonthlyDto();
|
|
MonthlyDto monthlyDto = new MonthlyDto();
|