yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

培训记录分页查询修改

master
徐杰盟 2024-09-26 10:36:57 +08:00
parent 4982f58106
commit bc39ec8b39
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java
View File

@ -280,7 +280,12 @@ public class PersonnelPlanLogController extends AbstractCommonFileController{
query.like(PersonnelPlanLog::getApplicant, unit); query.like(PersonnelPlanLog::getApplicant, unit);
} }
return R.ok(service.page(page.getPageSo().toPage(), query)); Page<PersonnelPlanLog> data = service.page(page.getPageSo().toPage(), query);
data.getRecords().forEach(o -> {
o.setFiles1(fileService.getFiles(getGroupId(),String.valueOf(o.getId()),"1"));
o.setFiles2(fileService.getFiles(getGroupId(),String.valueOf(o.getId()),"2"));
});
return R.ok(data);
} }
@Override @Override

1
src/main/java/com/gunshi/project/xyt/controller/SzCaseController.java
View File

@ -182,6 +182,7 @@ public class SzCaseController extends AbstractCommonFileController{
List<SzCaseStatisticsVo> vos = Lists.newArrayList(); List<SzCaseStatisticsVo> vos = Lists.newArrayList();
List<SzCase> list = query.list(); List<SzCase> list = query.list();
if (CollectionUtils.isNotEmpty(list)){ if (CollectionUtils.isNotEmpty(list)){
Map<Integer, Long> sourceCount = Maps.newHashMap(); Map<Integer, Long> sourceCount = Maps.newHashMap();
switch (num){ switch (num){