|
@@ -77,7 +77,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
MapUtil.populateMap(params, queryInfo);
|
|
|
|
|
|
- List<Integer> nextLevelOrganIds = organizationService.getChildOrganIds(queryInfo.getOrganId(), false);
|
|
|
+ List<Integer> nextLevelOrganIds = organizationService.getNextLevelOrganIds(queryInfo.getOrganId(), false);
|
|
|
params.put("organIds", nextLevelOrganIds);
|
|
|
|
|
|
List<ExamOrganizationRelationExtraDto> dataList = new ArrayList<>();
|
|
@@ -315,7 +315,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
|
|
|
List<String> days=new ArrayList<>();
|
|
|
days.add(today.toString());
|
|
|
for (int i=-1;i>-7;i--){
|
|
|
- today.plusDays(i);
|
|
|
+ today = today.plusDays(i);
|
|
|
days.add(today.toString());
|
|
|
}
|
|
|
for (String day : days) {
|