更新图片下载工具还原图片接口

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/dao/InspectHistoryDao.java

@@ -38,4 +38,6 @@ public interface InspectHistoryDao extends PagingAndSortingRepository<InspectHis
 
     @Query("select distinct s.inspectRound from InspectHistory s where s.examId=?1 ")
     public List<Integer> findInspectRound(int examId);
+
+    List<InspectHistory> findByStudentId(Integer studentId);
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/InspectHistoryService.java

@@ -29,4 +29,5 @@ public interface InspectHistoryService {
 
 	List<Integer> findInspectRound(int examId);
 
+    List<InspectHistory> findByStudentId(Integer studentId);
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/InspectHistoryServiceImpl.java

@@ -133,4 +133,9 @@ public class InspectHistoryServiceImpl extends BaseQueryService<InspectHistory>
         return inspectHistoryDao.findInspectRound(examId);
     }
 
+    @Override
+    public List<InspectHistory> findByStudentId(Integer studentId) {
+        return inspectHistoryDao.findByStudentId(studentId);
+    }
+
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/user/dao/UserDao.java

@@ -19,4 +19,6 @@ public interface UserDao extends PagingAndSortingRepository<User, Integer>, JpaS
 
     @Query(value = "select u from User u where u.loginName like ?1" + "%")
     List<User> findStartWithLoginName(String loginName);
+    @Query(value = "select u from User u where u.id in ?1")
+    List<User> findByIdIn(List<Integer> ids);
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/user/service/UserService.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.stmms.biz.user.service;
 
+import java.util.List;
 import java.util.Set;
 
 import cn.com.qmth.stmms.biz.user.model.User;
@@ -37,4 +38,5 @@ public interface UserService {
 
     public int findMaxNumberByLoginNameStart(String prefix);
 
+    List<User> findByIdIn(List<Integer> userIds);
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/user/service/impl/UserServiceImpl.java

@@ -438,4 +438,9 @@ public class UserServiceImpl implements UserService {
         return number;
     }
 
+    @Override
+    public List<User> findByIdIn(List<Integer> ids) {
+        return this.userDao.findByIdIn(ids);
+    }
+
 }

stmms-common/src/main/java/cn/com/qmth/stmms/common/utils/VersionInfo.java

@@ -5,7 +5,7 @@ package cn.com.qmth.stmms.common.utils;
  */
 public class VersionInfo {
 
-    public static final String NAME = "1.5.0";
+    public static final String NAME = "1.5.1";
 
-    public static final String DATE = "20240715";
+    public static final String DATE = "20240818";
 }

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/ExamStudentController.java

@@ -3,15 +3,9 @@ package cn.com.qmth.stmms.api.controller;
 import cn.com.qmth.stmms.api.dto.MenualAbsentDTO;
 import cn.com.qmth.stmms.api.exception.ApiException;
 import cn.com.qmth.stmms.api.utils.AESUtil;
-import cn.com.qmth.stmms.biz.exam.model.Exam;
-import cn.com.qmth.stmms.biz.exam.model.ExamQuestion;
-import cn.com.qmth.stmms.biz.exam.model.ExamStudent;
-import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
+import cn.com.qmth.stmms.biz.exam.model.*;
 import cn.com.qmth.stmms.biz.exam.query.ExamStudentSearchQuery;
-import cn.com.qmth.stmms.biz.exam.service.ExamQuestionService;
-import cn.com.qmth.stmms.biz.exam.service.ExamService;
-import cn.com.qmth.stmms.biz.exam.service.ExamStudentService;
-import cn.com.qmth.stmms.biz.exam.service.ExamSubjectService;
+import cn.com.qmth.stmms.biz.exam.service.*;
 import cn.com.qmth.stmms.biz.file.service.FileService;
 import cn.com.qmth.stmms.biz.mark.model.MarkLibrary;
 import cn.com.qmth.stmms.biz.mark.service.MarkLibraryService;
@@ -70,6 +64,9 @@ public class ExamStudentController extends BaseApiController {
     @Autowired
     private ExamSubjectService examSubjectService;
 
+    @Autowired
+    private InspectHistoryService inspectHistoryService;
+
     @RoleRequire({ Role.SCHOOL_ADMIN, Role.SCANNER })
     @RequestMapping(value = "/student/check", method = RequestMethod.POST)
     @ResponseBody
@@ -170,7 +167,7 @@ public class ExamStudentController extends BaseApiController {
                 obj.accumulate("className", StringUtils.trimToEmpty(student.getClassName()));
                 obj.accumulate("teacher", StringUtils.trimToEmpty(student.getTeacher()));
                 if (student.getInspectorId() != null) {
-                    obj.accumulate("inspector", getInspector(student.getInspectorId()));
+                    obj.accumulate("inspector", getInspector(student.getId()));
                 }
 
                 try {
@@ -252,12 +249,19 @@ public class ExamStudentController extends BaseApiController {
         return array;
     }
 
-    private String getInspector(Integer inspectorId) {
-        JSONObject obj = new JSONObject();
-        User inspector = userService.findById(inspectorId);
-        obj.accumulate("loginName", inspector.getLoginName());
-        obj.accumulate("name", inspector.getName());
-        return obj.toString();
+    private JSONArray getInspector(Integer studentId) {
+        List<InspectHistory> historyList = inspectHistoryService.findByStudentId(studentId);
+        JSONArray array = new JSONArray();
+        if(!historyList.isEmpty()){
+            List<User> userList = userService.findByIdIn(historyList.stream().map(e->e.getInspectorId()).collect(Collectors.toList()));
+            for (User u: userList) {
+                JSONObject obj = new JSONObject();
+                obj.accumulate("loginName", u.getLoginName());
+                obj.accumulate("name", u.getName());
+                array.add(obj);
+            }
+        }
+        return array;
     }
 
     private String getMarkerNames(ExamStudent student, Integer groupNumber) {
@@ -437,7 +441,7 @@ public class ExamStudentController extends BaseApiController {
                 obj.accumulate("className", StringUtils.trimToEmpty(student.getClassName()));
                 obj.accumulate("teacher", StringUtils.trimToEmpty(student.getTeacher()));
                 if (student.getInspectorId() != null) {
-                    obj.accumulate("inspector", getInspector(student.getInspectorId()));
+                    obj.accumulate("inspector", getInspector(student.getId()));
                 }
 
                 try {