3.3.0 fix

distributed-print/install/mysql/upgrade/3.3.0.sql

@@ -198,3 +198,12 @@ ALTER TABLE `exam_student`
     ADD COLUMN `can_delete` TINYINT(1) NULL DEFAULT 0 COMMENT '是否可以删除（手动新增可以删除）' AFTER `attachment_id`;
 ALTER TABLE `exam_student`
     CHANGE COLUMN `org_id` `org_id` BIGINT NULL COMMENT '机构id' ;
+UPDATE `sys_privilege` SET `url` = 'ScoreManage' WHERE (`id` = '487');
+DELETE FROM `sys_privilege` WHERE (`id` = '501');
+DELETE FROM `sys_privilege` WHERE (`id` = '503');
+UPDATE `sys_privilege` SET `url` = '/api/admin/mark/archive/score/list', `parent_id` = '487' WHERE (`id` = '542');
+UPDATE `sys_privilege` SET `url` = '/api/admin/mark/archive/score/export', `parent_id` = '488' WHERE (`id` = '543');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('488', '班级详情', 'ClassScoreDetail', 'LINK', '487', '1', 'AUTH', '490,543', '1', '0', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('489', '成绩报告', 'ScoreReport', 'LINK', '487', '2', 'AUTH', '494', '1', '0', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('490', '列表查询', '/api/admin/mark/archive/student/list', 'URL', '488', '1', 'AUTH', NULL, '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('494', '报告数据', '/api/admin/mark/archive/score/report', 'URL', '489', '1', 'AUTH', '1', '1', '1');

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/bean/archivescore/ArchiveScoreVo.java

@@ -1,9 +1,13 @@
 package com.qmth.teachcloud.mark.bean.archivescore;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 public class ArchiveScoreVo {
 
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long examId;
 	private String courseCode;
-
 	private String courseName;
 	private String paperNumber;
 	private Integer studentCount;
@@ -17,6 +21,14 @@ public class ArchiveScoreVo {
 	private Integer excellentCount;
 	private String excellentRate;
 
+	public Long getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+
 	public String getCourseCode() {
 		return courseCode;
 	}

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/bean/archivescore/ArchiveStudentVo.java

@@ -5,7 +5,7 @@ import java.util.List;
 import com.qmth.teachcloud.common.annotation.ExcelProperty;
 
 public class ArchiveStudentVo {
-	private Long id;
+	private Long studentId;
 
 	@ExcelProperty(name = "学生姓名", width = 20, index = 1)
     private String studentName;
@@ -24,6 +24,8 @@ public class ArchiveStudentVo {
     
     private List<String> sheetUrls;
 
+	private String sheetPath;
+
 	public String getCourseCode() {
 		return courseCode;
 	}
@@ -88,14 +90,19 @@ public class ArchiveStudentVo {
 		this.sheetUrls = sheetUrls;
 	}
 
-	public Long getId() {
-		return id;
+	public Long getStudentId() {
+		return studentId;
 	}
 
-	public void setId(Long id) {
-		this.id = id;
+	public void setStudentId(Long studentId) {
+		this.studentId = studentId;
 	}
-    
-    
 
+	public String getSheetPath() {
+		return sheetPath;
+	}
+
+	public void setSheetPath(String sheetPath) {
+		this.sheetPath = sheetPath;
+	}
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/mapper/MarkStudentMapper.java

@@ -65,4 +65,6 @@ public interface MarkStudentMapper extends BaseMapper<MarkStudent> {
 	List<TeacherVo> teacher(@Param("examId") Long examId, @Param("paperNumber") String paperNumber);
 
     List<UnexistStudentDto> listUnexistStudentByExamIdAndCoursePaperId(@Param("examId") Long examId);
+
+	IPage<ArchiveStudentVo> studentList(@Param("page") Page<ArchiveStudentVo> page, @Param("req") ArchiveStudentQuery query);
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/mapper/MarkUserGroupMapper.java

@@ -24,7 +24,7 @@ public interface MarkUserGroupMapper extends BaseMapper<MarkUserGroup> {
 
     IPage<MarkEntranceDto> listEntranceGroup(@Param("page") Page<MarkUserGroup> page, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("userId") Long userId);
 
-    List<MarkUser> listGroupUserByExamIdAndPaperNumberAndGroupNumber(@Param("examId") Long examId, @Param("paperNumber") String paperNumber, @Param("groupNumber") Integer groupNumber);
+    List<MarkUser> listGroupUserByExamIdAndPaperNumberAndGroupNumber(@Param("examId") Long examId, @Param("paperNumber") String paperNumber, @Param("groupNumber") Integer groupNumber, @Param("className") String className);
 
     IPage<MarkUserGroupProgressDto> pageGroupUserByExamIdAndPaperNumberAndGroupNumber(@Param("page") Page<MarkUserGroupProgressDto> page, @Param("examId") Long examId, @Param("paperNumber") String paperNumber, @Param("groupNumber") Integer groupNumber, @Param("loginName") String loginName);
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkStudentService.java

@@ -102,7 +102,7 @@ public interface MarkStudentService extends IService<MarkStudent> {
 
     void saveSubjectiveInspectedTask(MarkHeaderResult markResult);
 
-	List<ArchiveStudentVo> studentList(ArchiveStudentQuery query);
+	IPage<ArchiveStudentVo> studentList(ArchiveStudentQuery query);
 
 	void scoreExport(ArchiveStudentQuery query, HttpServletResponse response);
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkUserGroupService.java

@@ -23,7 +23,7 @@ public interface MarkUserGroupService extends IService<MarkUserGroup> {
 
     IPage<MarkEntranceDto> listEntranceGroup(Long examId, String courseCode, String paperNumber, Integer pageNumber, Integer pageSize);
 
-    List<MarkUser> listGroupUserByExamIdAndPaperNumberAndGroupNumber(Long examId, String paperNumber, Integer number);
+    List<MarkUser> listGroupUserByExamIdAndPaperNumberAndGroupNumberAndClassName(Long examId, String paperNumber, Integer number, String className);
 
     IPage<MarkUserGroupProgressDto> pageGroupUserByExamIdAndPaperNumberAndGroupNumber(Long examId, String paperNumber, Integer groupNumber, String loginName, Integer pageNumber, Integer pageSize);
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkGroupServiceImpl.java

@@ -92,7 +92,7 @@ public class MarkGroupServiceImpl extends MppServiceImpl<MarkGroupMapper, MarkGr
                     markGroupDto.setPictureConfigs(JSON.parseArray(markGroup.getPicList(), PictureConfig.class));
                 }
                 // 评卷员
-                markGroupDto.setMarkers(markUserGroupService.listGroupUserByExamIdAndPaperNumberAndGroupNumber(examId, paperNumber, markGroup.getNumber()));
+                markGroupDto.setMarkers(markUserGroupService.listGroupUserByExamIdAndPaperNumberAndGroupNumberAndClassName(examId, paperNumber, markGroup.getNumber(), null));
                 // 题目
                 markGroupDto.setQuestions(markQuestionService.listQuestionByExamIdAndPaperNumberAndGroupNumber(examId, paperNumber, markGroup.getNumber(), false));
                 markGroupDto.setGroupQuestions(markQuestionService.assembleGroupQuestionsByExamIdAndPaperNumberAndNumber(examId, paperNumber, markGroup.getNumber()));
@@ -187,7 +187,7 @@ public class MarkGroupServiceImpl extends MppServiceImpl<MarkGroupMapper, MarkGr
             MarkGroupProgressDto markGroupProgressDto = new MarkGroupProgressDto();
             markGroupProgressDto.setGroupNumber(markGroup.getNumber());
             markGroupProgressDto.setGroupQuestions(markQuestionService.assembleGroupQuestionsByExamIdAndPaperNumberAndNumber(examId, paperNumber, markGroup.getNumber()));
-            List<MarkUser> markUserList = markUserGroupService.listGroupUserByExamIdAndPaperNumberAndGroupNumber(examId, paperNumber, markGroup.getNumber());
+            List<MarkUser> markUserList = markUserGroupService.listGroupUserByExamIdAndPaperNumberAndGroupNumberAndClassName(examId, paperNumber, markGroup.getNumber(), null);
             markGroupProgressDto.setMarkerCount(markUserList.size());
             markGroup.setQuestionList(markQuestionService.listQuestionByExamIdAndPaperNumberAndGroupNumber(examId, paperNumber, markGroup.getNumber(), false));
             markGroupProgressDto.setScoreList(markGroup.getScoreList());
@@ -218,7 +218,7 @@ public class MarkGroupServiceImpl extends MppServiceImpl<MarkGroupMapper, MarkGr
                 for (String s : markGroupClassProgressDto.getGroupNumbers().split(",")) {
                     Integer groupNumber = Integer.parseInt(s);
                     totalMarkTaskList.addAll(markTaskService.listByExamIdAndPaperNumberAndGroupNumberAndUserId(examId, paperNumber, groupNumber, null));
-                    totalMarkUserList.addAll(markUserGroupService.listGroupUserByExamIdAndPaperNumberAndGroupNumber(examId, paperNumber, groupNumber));
+                    totalMarkUserList.addAll(markUserGroupService.listGroupUserByExamIdAndPaperNumberAndGroupNumberAndClassName(examId, paperNumber, groupNumber, markGroupClassProgressDto.getClassName()));
 
                     MarkGroup markGroup = markGroupService.getByExamIdAndPaperNumberAndGroupNumber(examId, paperNumber, groupNumber);
                     List<MarkUser> markUserList = markUserClassService.listClassMarkerByExamIdAndPaperNumberAndGroupNumberAndClassName(examId, paperNumber, groupNumber, markGroupClassProgressDto.getClassName());

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkPaperServiceImpl.java

@@ -277,8 +277,8 @@ public class MarkPaperServiceImpl extends ServiceImpl<MarkPaperMapper, MarkPaper
         if (CollectionUtils.isNotEmpty(ret.getRecords())) {
             for (ArchiveScoreVo vo : ret.getRecords()) {
                 double total = vo.getStudentCount() - vo.getAbsentCount();
-                vo.setPassRate(Calculator.divide2String(Calculator.multiply(vo.getPassCount(), 100), total, 2) + "%");
-                vo.setExcellentRate(Calculator.divide2String(Calculator.multiply(vo.getExcellentCount(), 100), total, 2) + "%");
+                vo.setPassRate(Calculator.divide2String(Calculator.multiply(vo.getPassCount(), 100), total, 2));
+                vo.setExcellentRate(Calculator.divide2String(Calculator.multiply(vo.getExcellentCount(), 100), total, 2));
             }
         }
         return ret;

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkServiceImpl.java

@@ -1065,9 +1065,10 @@ public class MarkServiceImpl implements MarkService {
     }
 
     private boolean submitTask(MarkTask task, Long userId, MarkGroup group, MarkResult result) {
+        MarkUserGroup markUserGroup = markUserGroupService.getByExamIdAndPaperNumberAndGroupNumberAndUserId(group.getExamId(), group.getPaperNumber(), group.getNumber(), userId);
         // 非本人领取的待评任务
         if ((task.getStatus() == MarkTaskStatus.WAITING || task.getStatus() == MarkTaskStatus.REJECTED)
-                && !hasApplied(task, userId)) {
+                && !hasApplied(task, markUserGroup.getId())) {
             return false;
         }
         // 非本人的回评任务

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkStudentServiceImpl.java

@@ -722,40 +722,20 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
     }
 
     @Override
-    public List<ArchiveStudentVo> studentList(ArchiveStudentQuery query) {
-        List<ArchiveStudentVo> ret = baseMapper.studentList(query);
-        if (CollectionUtils.isNotEmpty(ret)) {
-            fillSheetUrls(ret);
+    public IPage<ArchiveStudentVo> studentList(ArchiveStudentQuery query) {
+        Page<ArchiveStudentVo> page = new Page<>(query.getPageNumber(), query.getPageSize());
+        IPage<ArchiveStudentVo> ret = baseMapper.studentList(page, query);
+        for (ArchiveStudentVo record : ret.getRecords()) {
+            List<String> list = new ArrayList<String>();
+            List<FilePathVo> vos = JSON.parseArray(StringUtils.trimToNull(record.getSheetPath()),FilePathVo.class);
+            for (FilePathVo filePathVo : vos) {
+                list.add(JSON.toJSONString(filePathVo));
+            }
+            record.setSheetUrls(teachcloudCommonService.filePreview(list));
         }
         return ret;
     }
 
-    private void fillSheetUrls(List<ArchiveStudentVo> ret) {
-        List<Long> studentIds = ret.stream().map(p -> p.getId()).collect(Collectors.toList());
-        // 查找page
-        List<ScanPaperPageVo> paperPageList = new BatchGetDataUtil<ScanPaperPageVo, Long>() {
-
-            @Override
-            public List<ScanPaperPageVo> getData(List<Long> studentIds) {
-                return scanPaperPageService.listByStudentIds(studentIds);
-            }
-        }.getDataForBatch(studentIds, 200);
-
-        Map<Long, List<String>> map = new HashMap<>();
-        if (CollectionUtils.isNotEmpty(paperPageList)) {
-            for (ScanPaperPageVo p : paperPageList) {
-                List<String> tem = map.get(p.getStudentId());
-                if (tem == null) {
-                    tem = new ArrayList<>();
-                    map.put(p.getStudentId(), tem);
-                }
-                tem.add(p.getSheetPath());
-            }
-        }
-        for (ArchiveStudentVo vo : ret) {
-            vo.setSheetUrls(map.get(vo.getId()));
-        }
-    }
 
     @Override
     public void scoreExport(ArchiveStudentQuery query, HttpServletResponse response) {

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkUserClassServiceImpl.java

@@ -65,7 +65,7 @@ public class MarkUserClassServiceImpl extends ServiceImpl<MarkUserClassMapper, M
         List<MarkGroupDto> markGroupDtoList = markGroupList.stream().map(m -> {
             MarkGroupDto markGroupDto = new MarkGroupDto();
             markGroupDto.setGroupNumber(m.getNumber());
-            markGroupDto.setMarkers(markUserGroupService.listGroupUserByExamIdAndPaperNumberAndGroupNumber(examId, paperNumber, m.getNumber()));
+            markGroupDto.setMarkers(markUserGroupService.listGroupUserByExamIdAndPaperNumberAndGroupNumberAndClassName(examId, paperNumber, m.getNumber(), null));
             markGroupDto.setGroupQuestions(markQuestionService.assembleGroupQuestionsByExamIdAndPaperNumberAndNumber(examId, paperNumber, m.getNumber()));
             return markGroupDto;
         }).collect(Collectors.toList());

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkUserGroupServiceImpl.java

@@ -87,8 +87,8 @@ public class MarkUserGroupServiceImpl extends ServiceImpl<MarkUserGroupMapper, M
     }
 
     @Override
-    public List<MarkUser> listGroupUserByExamIdAndPaperNumberAndGroupNumber(Long examId, String paperNumber, Integer groupNumber) {
-        return this.baseMapper.listGroupUserByExamIdAndPaperNumberAndGroupNumber(examId, paperNumber, groupNumber);
+    public List<MarkUser> listGroupUserByExamIdAndPaperNumberAndGroupNumberAndClassName(Long examId, String paperNumber, Integer groupNumber, String className) {
+        return this.baseMapper.listGroupUserByExamIdAndPaperNumberAndGroupNumber(examId, paperNumber, groupNumber, className);
     }
 
     @Override

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/ScanBatchServiceImpl.java

@@ -111,7 +111,7 @@ public class ScanBatchServiceImpl extends ServiceImpl<ScanBatchMapper, ScanBatch
             List<ScanPaperPage> paperPages = scanPaperPageService.listByPaperId(paper.getId());
             if (CollectionUtils.isNotEmpty(paperPages)) {
                 for (ScanPaperPage pp : paperPages) {
-                    pages.add(pp.getSheetPath());
+                    pages.add(teachcloudCommonService.filePreview(pp.getSheetPath()));
                 }
             }
             resPapers.add(p);

teachcloud-mark/src/main/resources/mapper/MarkPaperMapper.xml

@@ -115,7 +115,7 @@
         ORDER BY ms.package_code
     </select>
     <select id="scoreList" resultType="com.qmth.teachcloud.mark.bean.archivescore.ArchiveScoreVo">
-        SELECT t.course_code,t.course_name,t.paper_number,
+        SELECT t.exam_id,t.course_code,t.course_name,t.paper_number,
         count(*) studentCount,count(distinct s.class_name) classCount,
         sum(case when s.is_absent =1 then 1 else 0 end) absentCount,
         avg(case when s.is_absent !=1 then s.objective_score+s.subjective_score else null end) avgScore,
@@ -128,7 +128,7 @@
             left join mark_student s on t.exam_id=s.exam_id and t.course_paper_id=s.course_paper_id
         WHERE
             t.exam_id = #{req.examId}
-            <if test="req.courseCode =! null and req.courseCode != ''">
+            <if test="req.courseCode != null and req.courseCode != ''">
                 AND t.course_code = #{req.courseCode}
             </if>
         group by t.course_code,t.course_name,t.paper_number

teachcloud-mark/src/main/resources/mapper/MarkStudentMapper.xml

@@ -239,20 +239,20 @@
     </select>
     <select id="studentList"
             resultType="com.qmth.teachcloud.mark.bean.archivescore.ArchiveStudentVo">
-        select t.*,t.objective_score+t.subjective_score totalScore
+        select t.*,t.id studentId, ifnull(t.objective_score,0)+ifnull(t.subjective_score,0) totalScore
         from mark_student t
         where t.exam_id=#{req.examId} and t.paper_number=#{req.paperNumber}
-        <if test="query.studentCode != null and query.studentCode !=''">
-            and t.student_code=#{query.studentCode}
+        <if test="req.studentCode != null and req.studentCode !=''">
+            and t.student_code=#{req.studentCode}
         </if>
-        <if test="query.studentName != null and query.studentName !=''">
-            and t.student_name=#{query.studentName}
+        <if test="req.studentName != null and req.studentName !=''">
+            and t.student_name=#{req.studentName}
         </if>
-        <if test="query.college != null and query.college !=''">
-            and t.college=#{query.college}
+        <if test="req.college != null and req.college !=''">
+            and t.college=#{req.college}
         </if>
-        <if test="query.className != null and query.className !=''">
-            and t.class_name=#{query.className}
+        <if test="req.className != null and req.className !=''">
+            and t.class_name=#{req.className}
         </if>
         order by t.id
     </select>

teachcloud-mark/src/main/resources/mapper/MarkTaskMapper.xml

@@ -181,6 +181,9 @@
 			mark_task t
 			WHERE
 			t.student_id = mt.student_id
+            AND t.exam_id = mt.exam_id
+            AND t.paper_number = mt.paper_number
+            AND t.group_number = mt.group_number
 			AND t.id != mt.id
 			AND t.user_id = #{userId}
 			AND t.marker_score IS NOT NULL

teachcloud-mark/src/main/resources/mapper/MarkUserGroupMapper.xml

@@ -63,6 +63,14 @@
             mug.exam_id = #{examId}
             AND mug.paper_number = #{paperNumber}
             AND mug.group_number = #{groupNumber}
+            <if test="className != null and className != ''">
+                AND EXISTS (select 1 from mark_user_class muc
+                            where mug.exam_id = muc.exam_id
+                              and mug.paper_number = muc.paper_number
+                              and mug.group_number = muc.group_number
+                              and mug.user_id = muc.user_id
+                              and muc.class_name = #{className})
+            </if>
     </select>
     <select id="pageGroupUserByExamIdAndPaperNumberAndGroupNumber"
             resultType="com.qmth.teachcloud.mark.dto.mark.manage.MarkUserGroupProgressDto">

teachcloud-task/src/main/java/com/qmth/teachcloud/task/start/StartRunning.java

@@ -93,7 +93,7 @@ public class StartRunning implements CommandLineRunner {
         Map qualityJobMap = new HashMap();
         qualityJobMap.computeIfAbsent("name", v -> SubjectCalculateJob.class.getName());
         quartzService.deleteJob(JobEnum.UPDATE_MARKER_QUALITY.name(), JobEnum.UPDATE_MARKER_QUALITY_GROUP.name());
-//        quartzService.addJob(SubjectCalculateJob.class, JobEnum.UPDATE_MARKER_QUALITY.name(), JobEnum.UPDATE_MARKER_QUALITY_GROUP.name(), "0 */1 * * * ?", qualityJobMap);
+        quartzService.addJob(SubjectCalculateJob.class, JobEnum.UPDATE_MARKER_QUALITY.name(), JobEnum.UPDATE_MARKER_QUALITY_GROUP.name(), "0 */1 * * * ?", qualityJobMap);
         log.info("增加更新评卷员质量监控指标定时任务 end");