Joburgess 5 years ago
parent
commit
2a1a717778

+ 2 - 2
edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamOrganizationRelationServiceImpl.java

@@ -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) {

+ 1 - 1
edu-user/edu-user-server/src/main/resources/config/mybatis/ExamLifecycleLogMapper.xml

@@ -74,6 +74,6 @@
 	</select>
 
     <select id="findWithExam" resultType="com.keao.edu.user.entity.ExamLifecycleLog">
-		SELECT * FROM exam_lifecycle_log WHERE examination_basic_id_=#{examId} ORDER id_ DESC
+		SELECT * FROM exam_lifecycle_log WHERE examination_basic_id_=#{examId} ORDER BY id_ DESC
 	</select>
 </mapper>