图片下载相关-新增返回字段

stmms-ms-collect/src/main/java/cn/com/qmth/stmms/ms/collect/api/CollectApi.java

@@ -128,6 +128,15 @@ public class CollectApi {
             loginDTO = new LoginDTO();
             loginDTO.setExamId(activeWork.getId());
             loginDTO.setExamName(activeWork.getName());
+        } else if (loginname.equals(loginConfig.adminLoginConfig().getLoginName()) && password.equals(loginConfig.adminLoginConfig().getPassword())) {
+            activeWork = workRepo.findByActiveTrue();
+            if (Objects.isNull(activeWork)) {
+                throw new Exception("没有work");
+            }
+            loginDTO = new LoginDTO();
+            loginDTO.setExamId(activeWork.getId());
+            loginDTO.setExamName(activeWork.getName());
+            loginDTO.setRoleCode("ADMIN");
         } else {
             MarkUser markUser = markUserRepo.findByLoginName(loginname);
             //账号不存在
@@ -1176,7 +1185,7 @@ public class CollectApi {
                                                    @RequestParam(required = false) Integer startScore,
                                                    @RequestParam(required = false) Integer endScore) {
         StringBuffer sql = new StringBuffer();
-        sql.append("SELECT s.id studentId,s.name studentName,s.school, p.work_id workId, p.subject, p.area_code areaCode, p.exam_number examNumber, 0+cast(p.score as char) as score FROM paper p LEFT JOIN student s ON p.work_id = s.work_id AND p.exam_number = s.exam_number WHERE p.score is not null and p.work_id = ").append(workId);
+        sql.append("SELECT s.id studentId,s.name studentName,s.school, p.work_id workId, p.subject, p.area_code areaCode,s.area_name areaName, p.exam_number examNumber,ms.name subjectName, 0+cast(p.score as char) as score FROM paper p LEFT JOIN student s ON p.work_id = s.work_id AND p.exam_number = s.exam_number left join mark_subject ms on concat(p.work_id,'-', p.subject) = ms.id WHERE p.score is not null and p.work_id = ").append(workId);
         if (startScore != null && endScore != null) {
             sql.append(" and p.score >= ").append(startScore);
             sql.append(" and p.score <= ").append(endScore);

stmms-ms-collect/src/main/java/cn/com/qmth/stmms/ms/collect/dto/LoginDTO.java

@@ -17,6 +17,7 @@ public class LoginDTO {
     private boolean imageEnc;
     private ParamSetting paramSetting;
     private List<CollectSubjectDTO> subjects = new ArrayList<>();
+    private String roleCode;
 
     public boolean isImageEnc() {
         return imageEnc;
@@ -73,4 +74,12 @@ public class LoginDTO {
     public void setParamSetting(ParamSetting paramSetting) {
         this.paramSetting = paramSetting;
     }
+
+    public String getRoleCode() {
+        return roleCode;
+    }
+
+    public void setRoleCode(String roleCode) {
+        this.roleCode = roleCode;
+    }
 }