1.0.2,bug修改

paper-library-business/src/main/java/com/qmth/paper/library/business/bean/result/PaperArchivesDetailResult.java

@@ -4,6 +4,8 @@ public class PaperArchivesDetailResult {
 
     private String paperScanTaskDetailId;
 
+    private String scanTaskName;
+
     private String studentName;
 
     private String studentCode;
@@ -33,6 +35,14 @@ public class PaperArchivesDetailResult {
         this.paperScanTaskDetailId = paperScanTaskDetailId;
     }
 
+    public String getScanTaskName() {
+        return scanTaskName;
+    }
+
+    public void setScanTaskName(String scanTaskName) {
+        this.scanTaskName = scanTaskName;
+    }
+
     public String getStudentName() {
         return studentName;
     }

paper-library-business/src/main/java/com/qmth/paper/library/business/mapper/PaperArchivesMapper.java

@@ -25,7 +25,7 @@ public interface PaperArchivesMapper extends BaseMapper<PaperArchives> {
 
     List<SelectResult> queryManagerOrg(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId);
 
-    IPage<PaperArchivesDetailResult> pageDetail(@Param("page") Page<PaperArchivesDetailResult> page, @Param("paperArchivesId") Long paperArchivesId, @Param("belongOrgId") Long belongOrgId, @Param("majorName") String majorName, @Param("clazzName") String clazzName, @Param("courseName") String courseName, @Param("teacherName") String teacherName, @Param("teachClazzName") String teachClazzName, @Param("isBind") Boolean isBind, @Param("param") String param);
+    IPage<PaperArchivesDetailResult> pageDetail(@Param("page") Page<PaperArchivesDetailResult> page, @Param("paperArchivesId") Long paperArchivesId, @Param("paperScanTaskId") Long paperScanTaskId, @Param("belongOrgId") Long belongOrgId, @Param("majorName") String majorName, @Param("clazzName") String clazzName, @Param("courseName") String courseName, @Param("teacherName") String teacherName, @Param("teachClazzName") String teachClazzName, @Param("isBind") Boolean isBind, @Param("param") String param);
 
     List<PaperArchivesDetailResult> pageDetail(@Param("paperArchivesId") Long paperArchivesId, @Param("belongOrgId") Long belongOrgId, @Param("majorName") String majorName, @Param("clazzName") String clazzName, @Param("courseName") String courseName, @Param("teacherName") String teacherName, @Param("teachClazzName") String teachClazzName, @Param("isBind") Boolean isBind, @Param("param") String param);
 

paper-library-business/src/main/java/com/qmth/paper/library/business/service/PaperArchivesService.java

@@ -27,7 +27,7 @@ public interface PaperArchivesService extends IService<PaperArchives> {
 
     List<SelectResult> queryArchives(Long semesterId);
 
-    IPage<PaperArchivesDetailResult> pageDetail(Long paperArchivesId, Long belongOrgId, String majorName, String clazzName, String courseName, String teacherName, String teachClazzName, Boolean isBind, String param, Integer pageNumber, Integer pageSize);
+    IPage<PaperArchivesDetailResult> pageDetail(Long paperArchivesId, Long paperScanTaskId, Long belongOrgId, String majorName, String clazzName, String courseName, String teacherName, String teachClazzName, Boolean isBind, String param, Integer pageNumber, Integer pageSize);
 
     List<PaperArchivesDetailResult> listDetail(DownLoadPaperParams downLoadPaperParams);
 

paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PaperArchivesServiceImpl.java

@@ -139,8 +139,8 @@ public class PaperArchivesServiceImpl extends ServiceImpl<PaperArchivesMapper, P
     }
 
     @Override
-    public IPage<PaperArchivesDetailResult> pageDetail(Long paperArchivesId, Long belongOrgId, String majorName, String clazzName, String courseName, String teacherName, String teachClazzName, Boolean isBind, String param, Integer pageNumber, Integer pageSize) {
-        IPage<PaperArchivesDetailResult> detailResultIPage = this.baseMapper.pageDetail(new Page<>(pageNumber, pageSize), paperArchivesId, belongOrgId, majorName, clazzName, courseName, teacherName, teachClazzName, isBind, param);
+    public IPage<PaperArchivesDetailResult> pageDetail(Long paperArchivesId, Long paperScanTaskId, Long belongOrgId, String majorName, String clazzName, String courseName, String teacherName, String teachClazzName, Boolean isBind, String param, Integer pageNumber, Integer pageSize) {
+        IPage<PaperArchivesDetailResult> detailResultIPage = this.baseMapper.pageDetail(new Page<>(pageNumber, pageSize), paperArchivesId, paperScanTaskId, belongOrgId, majorName, clazzName, courseName, teacherName, teachClazzName, isBind, param);
         for (PaperArchivesDetailResult record : detailResultIPage.getRecords()) {
             QueryWrapper<PaperLibrary> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().eq(PaperLibrary::getPaperScanTaskDetailId, record.getPaperScanTaskDetailId());

paper-library-business/src/main/resources/mapper/PaperArchivesMapper.xml

@@ -105,16 +105,14 @@
             so.name belongOrgName,
             bs.major_name majorName,
             bs.clazz_name clazzName,
+            pst.scan_task_name scanTaskName,
             pst.course_code courseCode,
             pst.course_name courseName,
             pstd.teacher_name teacherName,
             pstd.teach_clazz_name teachClazzName,
             pst.create_time createTime
         FROM
-            paper_archives pa
-                JOIN
-            paper_scan_task pst ON pa.school_id = pst.school_id
-                AND pa.id = pst.paper_archives_id
+            paper_scan_task pst
                 LEFT JOIN
             paper_scan_task_detail pstd ON pst.id = pstd.paper_scan_task_id
                 LEFT JOIN
@@ -122,8 +120,9 @@
                 LEFT JOIN
             sys_org so ON bs.belong_org_id = so.id
         <where>
-            <if test="paperArchivesId != null">
-                and pa.id = #{paperArchivesId}
+            pst.paper_archives_id = #{paperArchivesId}
+            <if test="paperScanTaskId != null">
+                and pst.id = #{paperScanTaskId}
             </if>
             <if test="belongOrgId != null">
                 and bs.belong_org_id = #{belongOrgId}
@@ -138,7 +137,7 @@
                 and pst.course_name = #{courseName}
             </if>
             <if test="teacherName != null and teacherName != ''">
-                and pstd.teacher_name like concat('%',#{teacherName},'%')
+                and pstd.teacher_name like concat(#{teacherName},'%')
             </if>
             <if test="teachClazzName != null and teachClazzName != ''">
                 and pstd.teach_clazz_name = #{teachClazzName}
@@ -152,9 +151,10 @@
                 </if>
             </if>
             <if test="param != null and param != ''">
-                and (bs.student_name like concat('%',#{param},'%') or bs.student_code like concat('%',#{param},'%'))
+                and (bs.student_name like concat(#{param},'%') or bs.student_code like concat(#{param},'%'))
             </if>
         </where>
+        order by pst.scan_task_name, bs.student_code
     </select>
     <select id="queryManagerUser" resultType="com.qmth.paper.library.business.bean.result.SelectResult">
         SELECT
@@ -184,8 +184,7 @@
         FROM
             paper_archives pa
                 JOIN
-            paper_scan_task pst ON pa.school_id = pst.school_id
-                AND pa.id = pst.paper_archives_id
+            paper_scan_task pst ON pa.id = pst.paper_archives_id
                 LEFT JOIN
             paper_scan_task_detail pstd ON pst.id = pstd.paper_scan_task_id
                 LEFT JOIN

paper-library-business/src/main/resources/mapper/PaperLibraryMapper.xml

@@ -11,6 +11,8 @@
         <result column="user_id" property="userId"/>
         <result column="sequence" property="sequence"/>
         <result column="abnormal" property="abnormal"/>
+        <result column="abnormal" property="wordsResult"/>
+        <result column="words_result" property="wordsResult"/>
         <result column="create_id" property="createId"/>
         <result column="create_time" property="createTime"/>
         <result column="update_id" property="updateId"/>
@@ -172,7 +174,8 @@
             bs.student_name studentName,
             bs.student_code studentCode,
             bs.major_name majorName,
-            bs.clazz_name clazzName
+            bs.clazz_name clazzName,
+            pstd.bind_count bindCount
         FROM
             paper_archives pa
                 LEFT JOIN
@@ -195,18 +198,21 @@
     <select id="pageStudent" resultType="com.qmth.paper.library.business.bean.result.TaskStudentResult">
         SELECT
             pstd.id paperScanTaskDetailId,
+            pst.scan_task_name paperScanTaskName,
+            pst.course_code courseCode,
+            pst.course_name courseName,
             bs.student_name studentName,
             bs.student_code studentCode,
             bs.major_name majorName,
-            bs.clazz_name clazzName
+            bs.clazz_name clazzName,
+            pstd.bind_count bindCount
         FROM
             paper_scan_task_detail pstd
+        LEFT JOIN
+            paper_scan_task pst ON pstd.paper_scan_task_id = pst.id
         LEFT JOIN
             basic_student bs ON pstd.student_id = bs.id
         <where>
-            <if test="schoolId != null">
-                and pstd.school_id = #{schoolId}
-            </if>
             <if test="paperScanTaskId != null">
                 and pstd.paper_scan_task_id = #{paperScanTaskId}
             </if>

paper-library-business/src/main/resources/mapper/PaperScanTaskMapper.xml

@@ -200,7 +200,7 @@
             <if test="scanTaskName != null and scanTaskName != ''">
                 AND pst.scan_task_name like concat(#{scanTaskName}, '%')
             </if>
-            and (pst.check_user_id is null or (pst.check_user_id = #{userId} and pst.progress &lt; 100))
+            and (pst.check_user_id is null or (pst.check_user_id = #{userId} and (pst.scan_count - pst.bind_count - pst.abnormal_count) > 0))
         </where>
         order by pst.check_user_id
     </select>

paper-library/src/main/java/com/qmth/paper/library/api/PaperArchivesController.java

@@ -74,6 +74,7 @@ public class PaperArchivesController {
     @PostMapping("/page_detail")
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
     public Result pageDetail(@ApiParam(value = "档案ID") @RequestParam Long paperArchivesId,
+                             @ApiParam(value = "扫描任务ID") @RequestParam(required = false) Long paperScanTaskId,
                              @ApiParam(value = "学院") @RequestParam(required = false) Long belongOrgId,
                              @ApiParam(value = "专业") @RequestParam(required = false) String majorName,
                              @ApiParam(value = "班级") @RequestParam(required = false) String clazzName,
@@ -84,7 +85,7 @@ public class PaperArchivesController {
                              @ApiParam(value = "模糊查询（姓名/学号）") @RequestParam(required = false) String param,
                              @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                              @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        return ResultUtil.ok(paperArchivesService.pageDetail(paperArchivesId, belongOrgId, majorName, clazzName, courseName, teacherName, teachClazzName, isBind, param, pageNumber, pageSize));
+        return ResultUtil.ok(paperArchivesService.pageDetail(paperArchivesId, paperScanTaskId, belongOrgId, majorName, clazzName, courseName, teacherName, teachClazzName, isBind, param, pageNumber, pageSize));
     }
 
 

sql/1.0.2修改内容.txt

@@ -51,5 +51,5 @@ UPDATE `sys_privilege` SET `name` = '新增' WHERE (`id` = '245');
 
 ---以上已更新
 
-ALTER TABLE paper_scan_task_detail`
+ALTER TABLE `paper_scan_task_detail`
 CHANGE COLUMN `is_bind` `bind_count` INT NULL DEFAULT '0' COMMENT '绑定图片数量' ;