功能优化

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

@@ -0,0 +1,114 @@
+package com.qmth.paper.library.business.bean.result;
+
+public class PaperArchivesDetailResult {
+
+    private String paperScanTaskDetailId;
+
+    private String studentName;
+
+    private String studentCode;
+
+    private String belongOrgName;
+
+    private String majorName;
+
+    private String clazzName;
+
+    private String courseName;
+
+    private String teacherName;
+
+    private String teachClazzName;
+
+    private Long createTime;
+
+    private Integer bindCount;
+
+    public String getPaperScanTaskDetailId() {
+        return paperScanTaskDetailId;
+    }
+
+    public void setPaperScanTaskDetailId(String paperScanTaskDetailId) {
+        this.paperScanTaskDetailId = paperScanTaskDetailId;
+    }
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
+    public String getStudentCode() {
+        return studentCode;
+    }
+
+    public void setStudentCode(String studentCode) {
+        this.studentCode = studentCode;
+    }
+
+    public String getBelongOrgName() {
+        return belongOrgName;
+    }
+
+    public void setBelongOrgName(String belongOrgName) {
+        this.belongOrgName = belongOrgName;
+    }
+
+    public String getMajorName() {
+        return majorName;
+    }
+
+    public void setMajorName(String majorName) {
+        this.majorName = majorName;
+    }
+
+    public String getClazzName() {
+        return clazzName;
+    }
+
+    public void setClazzName(String clazzName) {
+        this.clazzName = clazzName;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
+    public String getTeachClazzName() {
+        return teachClazzName;
+    }
+
+    public void setTeachClazzName(String teachClazzName) {
+        this.teachClazzName = teachClazzName;
+    }
+
+    public Long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getBindCount() {
+        return bindCount;
+    }
+
+    public void setBindCount(Integer bindCount) {
+        this.bindCount = bindCount;
+    }
+}

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

@@ -15,7 +15,7 @@ public class SelectResult implements Serializable {
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "id")
-    private Long id;
+    private String id;
 
     @ApiModelProperty(value = "code")
     private String code;
@@ -23,11 +23,11 @@ public class SelectResult implements Serializable {
     @ApiModelProperty(value = "name")
     private String name;
 
-    public Long getId() {
+    public String getId() {
         return id;
     }
 
-    public void setId(Long id) {
+    public void setId(String id) {
         this.id = id;
     }
 

paper-library-business/src/main/java/com/qmth/paper/library/business/entity/PaperScanTaskDetail.java

@@ -35,6 +35,9 @@ public class PaperScanTaskDetail extends BaseEntity implements Serializable {
     @TableField("student_id")
     private Long studentId;
 
+    @ApiModelProperty(value = "是否绑定图片")
+    @TableField("is_bind")
+    private Boolean isBind;
 
     public Long getSchoolId() {
         return schoolId;
@@ -59,4 +62,12 @@ public class PaperScanTaskDetail extends BaseEntity implements Serializable {
     public void setStudentId(Long studentId) {
         this.studentId = studentId;
     }
+
+    public Boolean getBind() {
+        return isBind;
+    }
+
+    public void setBind(Boolean bind) {
+        isBind = bind;
+    }
 }

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

@@ -3,6 +3,7 @@ package com.qmth.paper.library.business.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qmth.paper.library.business.bean.result.PaperArchivesDetailResult;
 import com.qmth.paper.library.business.bean.result.PaperArchivesResult;
 import com.qmth.paper.library.business.bean.result.SelectResult;
 import com.qmth.paper.library.business.entity.PaperArchives;
@@ -17,9 +18,11 @@ import java.util.List;
  */
 public interface PaperArchivesMapper extends BaseMapper<PaperArchives> {
 
-    IPage<PaperArchivesResult> pageData(@Param("page") Page<PaperArchivesResult> page, @Param("semesterId") Long semesterId, @Param("managerOrgId") Long managerOrgId, @Param("archivesTypeId") Long archivesTypeId, @Param("archivesName") String archivesName);
+    IPage<PaperArchivesResult> pageData(@Param("page") Page<PaperArchivesResult> page, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("managerOrgId") Long managerOrgId, @Param("archivesTypeId") Long archivesTypeId, @Param("archivesName") String archivesName);
 
     PaperArchives selectByArchivesName(@Param("schoolId") Long schoolId, @Param("archivesName") String archivesName);
 
     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);
 }

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

@@ -2,6 +2,7 @@ package com.qmth.paper.library.business.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.paper.library.business.bean.result.PaperArchivesDetailResult;
 import com.qmth.paper.library.business.bean.result.PaperArchivesResult;
 import com.qmth.paper.library.business.bean.result.SelectResult;
 import com.qmth.paper.library.business.entity.PaperArchives;
@@ -24,4 +25,6 @@ public interface PaperArchivesService extends IService<PaperArchives> {
     List<SelectResult> queryManagerOrg(Long semesterId);
 
     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);
 }

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

@@ -98,4 +98,6 @@ public interface PaperScanTaskService extends IService<PaperScanTask> {
     List<SelectResult> queryCourse(Long paperArchivesId, Long semesterId);
 
     List<SelectResult> queryDataTeachClazz(Long paperArchivesId, String courseName);
+
+    List<SelectResult> queryScanTask(Long paperArchivesId);
 }

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

@@ -92,6 +92,16 @@ public class ClientServiceImpl implements ClientService {
     public boolean bindUser(Long paperScanTaskId, Long userId) {
         try {
             lockService.waitlock(LockType.BIND_SCAN_USER, paperScanTaskId);
+            PaperScanTask paperScanTask = paperScanTaskService.getById(paperScanTaskId);
+            if (paperScanTask == null) {
+                throw ExceptionResultEnum.ERROR.exception("扫描任务不存在");
+            }
+
+            // 扫描任务是否被其它人扫描
+            if (paperScanTask.getScanUserId() != null) {
+                throw ExceptionResultEnum.ERROR.exception("其它扫描员已开始扫描");
+            }
+
             if (userId == null) {
                 SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
                 userId = sysUser.getId();
@@ -101,7 +111,7 @@ public class ClientServiceImpl implements ClientService {
             updateWrapper.lambda().set(PaperScanTask::getScanUserId, userId).eq(PaperScanTask::getId, paperScanTaskId);
             return paperScanTaskService.update(updateWrapper);
         } catch (Exception e) {
-            throw ExceptionResultEnum.ERROR.exception("绑定扫描员错误：" + e.getMessage());
+            throw ExceptionResultEnum.ERROR.exception("扫描任务错误：" + e.getMessage());
         } finally {
             lockService.unlock(LockType.BIND_SCAN_USER, paperScanTaskId);
         }

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

@@ -4,12 +4,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.paper.library.business.bean.result.PaperArchivesDetailResult;
 import com.qmth.paper.library.business.bean.result.PaperArchivesResult;
 import com.qmth.paper.library.business.bean.result.SelectResult;
 import com.qmth.paper.library.business.entity.PaperArchives;
+import com.qmth.paper.library.business.entity.PaperLibrary;
 import com.qmth.paper.library.business.entity.PaperScanTask;
 import com.qmth.paper.library.business.mapper.PaperArchivesMapper;
 import com.qmth.paper.library.business.service.PaperArchivesService;
+import com.qmth.paper.library.business.service.PaperLibraryService;
 import com.qmth.paper.library.business.service.PaperScanTaskService;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.SysUser;
@@ -32,9 +35,13 @@ public class PaperArchivesServiceImpl extends ServiceImpl<PaperArchivesMapper, P
     @Resource
     PaperScanTaskService paperScanTaskService;
 
+    @Resource
+    PaperLibraryService paperLibraryService;
+
     @Override
     public IPage<PaperArchivesResult> pageData(Long semesterId, Long managerOrgId, Long archivesTypeId, String archivesName, Integer pageNumber, Integer pageSize) {
-        return this.baseMapper.pageData(new Page<>(pageNumber, pageSize), semesterId, managerOrgId, archivesTypeId, archivesName);
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        return this.baseMapper.pageData(new Page<>(pageNumber, pageSize), schoolId, semesterId, managerOrgId, archivesTypeId, archivesName);
     }
 
     @Override
@@ -42,17 +49,36 @@ public class PaperArchivesServiceImpl extends ServiceImpl<PaperArchivesMapper, P
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
 
-        PaperArchives archives = this.baseMapper.selectByArchivesName(schoolId, paperArchives.getArchivesName());
-        if (archives != null) {
-            throw ExceptionResultEnum.ERROR.exception("档案名称已存在");
+        // 新增
+        if (paperArchives.getId() == null) {
+            PaperArchives archives = this.baseMapper.selectByArchivesName(schoolId, paperArchives.getArchivesName());
+            if (archives != null) {
+                throw ExceptionResultEnum.ERROR.exception("档案名称已存在");
+            }
+            paperArchives.setId(SystemConstant.getDbUuid());
+            paperArchives.setSchoolId(schoolId);
+            // 档案编号（时间戳）
+            paperArchives.setArchivesCode(String.valueOf(System.currentTimeMillis()));
+            paperArchives.setCreateId(sysUser.getId());
+            paperArchives.setCreateTime(System.currentTimeMillis());
+            return this.save(paperArchives);
+        } else {
+            PaperArchives archives = this.baseMapper.selectByArchivesName(schoolId, paperArchives.getArchivesName());
+            if (archives != null && !archives.getId().equals(paperArchives.getId())) {
+                throw ExceptionResultEnum.ERROR.exception("档案名称已存在");
+            }
+            PaperArchives oldPaperArchives = this.getById(paperArchives.getId());
+            // 档案编号（时间戳）
+            oldPaperArchives.setArchivesName(paperArchives.getArchivesName());
+            oldPaperArchives.setArchivesTypeId(paperArchives.getArchivesTypeId());
+            oldPaperArchives.setSemesterId(paperArchives.getSemesterId());
+            oldPaperArchives.setManagerId(paperArchives.getManagerId());
+            oldPaperArchives.setManagerOrgId(paperArchives.getManagerOrgId());
+            oldPaperArchives.setWarningTime(paperArchives.getWarningTime());
+            paperArchives.setUpdateId(sysUser.getId());
+            paperArchives.setUpdateTime(System.currentTimeMillis());
+            return this.updateById(paperArchives);
         }
-        paperArchives.setId(SystemConstant.getDbUuid());
-        paperArchives.setSchoolId(schoolId);
-        // 档案编号（时间戳）
-        paperArchives.setArchivesCode(String.valueOf(System.currentTimeMillis()));
-        paperArchives.setCreateId(sysUser.getId());
-        paperArchives.setCreateTime(System.currentTimeMillis());
-        return this.save(paperArchives);
     }
 
     @Override
@@ -80,18 +106,29 @@ public class PaperArchivesServiceImpl extends ServiceImpl<PaperArchivesMapper, P
         Long schoolId = SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId()));
         QueryWrapper<PaperArchives> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(PaperArchives::getSchoolId, schoolId);
-        if(semesterId != null ){
+        if (semesterId != null) {
             queryWrapper.lambda().eq(PaperArchives::getSemesterId, semesterId);
         }
         List<PaperArchives> paperArchivesList = this.list(queryWrapper);
-        List<SelectResult> selectResultList = paperArchivesList.stream().map(m->{
+        return paperArchivesList.stream().map(m -> {
             SelectResult result = new SelectResult();
-            result.setId(m.getId());
+            result.setId(String.valueOf(m.getId()));
             result.setCode(m.getArchivesCode());
             result.setName(m.getArchivesName());
             return result;
         }).collect(Collectors.toList());
-        return selectResultList;
+    }
+
+    @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);
+        for (PaperArchivesDetailResult record : detailResultIPage.getRecords()) {
+            QueryWrapper<PaperLibrary> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(PaperLibrary::getPaperScanTaskDetailId, record.getPaperScanTaskDetailId());
+            int count = paperLibraryService.count(queryWrapper);
+            record.setBindCount(count);
+        }
+        return detailResultIPage;
     }
 
 }

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

@@ -23,6 +23,7 @@ import com.qmth.paper.library.common.util.ServletUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -65,12 +66,24 @@ public class PaperLibraryServiceImpl extends ServiceImpl<PaperLibraryMapper, Pap
         return this.baseMapper.countBindData(paperScanTaskId);
     }
 
+    @Transactional
     @Override
     public boolean bind(Long paperLibraryId, Long paperScanTaskDetailId) {
         PaperScanTaskDetail paperScanTaskDetail = paperScanTaskDetailService.getById(paperScanTaskDetailId);
         if (paperScanTaskDetail == null) {
             throw ExceptionResultEnum.ERROR.exception("绑定对象有误，任务下无该考生，请刷新数据再试");
         }
+        PaperLibrary paperLibrary = this.getById(paperLibraryId);
+        if (paperLibrary == null) {
+            throw ExceptionResultEnum.ERROR.exception("绑定对象有误，图片已删除，请刷新数据再试");
+        }
+
+        // 更新已绑定状态
+        if (!paperScanTaskDetail.getBind()) {
+            paperScanTaskDetail.setBind(true);
+            paperScanTaskDetailService.updateById(paperScanTaskDetail);
+        }
+
         UpdateWrapper<PaperLibrary> updateWrapper = new UpdateWrapper<>();
         updateWrapper.lambda().set(PaperLibrary::getPaperScanTaskDetailId, paperScanTaskDetailId)
                 .eq(PaperLibrary::getId, paperLibraryId);

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

@@ -145,7 +145,7 @@ public class PaperScanTaskServiceImpl extends ServiceImpl<PaperScanTaskMapper, P
         this.removeByIds(idList);
 
         // 删除扫描详情
-        paperScanTaskDetailService.remove(new QueryWrapper<PaperScanTaskDetail>().lambda().in(PaperScanTaskDetail::getPaperScanTaskId,idList));
+        paperScanTaskDetailService.remove(new QueryWrapper<PaperScanTaskDetail>().lambda().in(PaperScanTaskDetail::getPaperScanTaskId, idList));
     }
 
     @Override
@@ -267,4 +267,17 @@ public class PaperScanTaskServiceImpl extends ServiceImpl<PaperScanTaskMapper, P
     public List<SelectResult> queryDataTeachClazz(Long paperArchivesId, String courseName) {
         return this.baseMapper.queryDataTeachClazz(paperArchivesId, courseName);
     }
+
+    @Override
+    public List<SelectResult> queryScanTask(Long paperArchivesId) {
+        QueryWrapper<PaperScanTask> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(PaperScanTask::getPaperArchivesId, paperArchivesId);
+        List<PaperScanTask> paperScanTaskList = this.list(queryWrapper);
+        return paperScanTaskList.stream().map(m -> {
+            SelectResult result = new SelectResult();
+            result.setId(String.valueOf(m.getId()));
+            result.setName(m.getScanTaskName());
+            return result;
+        }).collect(Collectors.toList());
+    }
 }

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

@@ -52,13 +52,16 @@
                 LEFT JOIN
             sys_user su ON pa.manager_id = su.id
         <where>
-            <if test="semesterId != null and semesterId != ''">
+            <if test="schoolId != null">
+                and pa.school_id = #{schoolId}
+            </if>
+            <if test="semesterId != null ">
                 and pa.semester_id = #{semesterId}
             </if>
-            <if test="managerOrgId != null and managerOrgId != ''">
+            <if test="managerOrgId != null ">
                 and pa.manager_org_id = #{managerOrgId}
             </if>
-            <if test="archivesTypeId != null and archivesTypeId != ''">
+            <if test="archivesTypeId != null">
                 and pa.archives_type_id = #{archivesTypeId}
             </if>
             <if test="archivesName != null and archivesName != ''">
@@ -88,4 +91,57 @@
             </if>
         </where>
     </select>
+    <select id="pageDetail" resultType="com.qmth.paper.library.business.bean.result.PaperArchivesDetailResult">
+        SELECT
+            pstd.id paperScanTaskDetailId,
+            bs.student_name studentName,
+            bs.student_code studentCode,
+            so.name belongOrgName,
+            bs.major_name majorName,
+            bs.clazz_name clazzName,
+            pst.course_name courseName,
+            pst.teacher_name teacherName,
+            pst.teach_clazz_name teachClazzName,
+            pst.create_time createTime
+        FROM
+            paper_archives pa
+                LEFT JOIN
+            paper_scan_task pst ON pa.school_id = pst.school_id
+                AND pa.id = pst.paper_archives_id
+                LEFT JOIN
+            paper_scan_task_detail pstd ON pst.id = pstd.paper_scan_task_id
+                LEFT JOIN
+            basic_student bs ON pstd.student_id = bs.id
+                LEFT JOIN
+            sys_org so ON bs.belong_org_id = so.id
+        <where>
+            <if test="paperArchivesId != null">
+                and pa.id = #{paperArchivesId}
+            </if>
+            <if test="belongOrgId != null">
+                and bs.belong_org_id = #{belongOrgId}
+            </if>
+            <if test="majorName != null and majorName != ''">
+                and bs.major_name = #{majorName}
+            </if>
+            <if test="clazzName != null and clazzName != ''">
+                and bs.clazz_name = #{clazzName}
+            </if>
+            <if test="courseName != null and courseName != ''">
+                and pst.course_name = #{courseName}
+            </if>
+            <if test="teacherName != null and teacherName != ''">
+                and pst.teacher_name like concat('%',#{teacherName},'%')
+            </if>
+            <if test="teacherName != null and teacherName != ''">
+                and pst.teacher_name = #{teacherName}
+            </if>
+            <if test="isBind != null">
+                and pstd.is_bind = #{isBind}
+            </if>
+            <if test="param != null and param != ''">
+                and (bs.bs.student_name like concat('%',#{param},'%') or bs.student_code like concat('%',#{param},'%'))
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -103,7 +103,7 @@ public class ClientController {
         return ResultUtil.ok(clientService.pageScanTask(paperArchivesId, courseName, teachClazzName, isMine, pageNumber, pageSize));
     }
 
-    @ApiOperation(value = "绑定扫描员")
+    @ApiOperation(value = "（开始扫描）绑定扫描员")
     @PostMapping("/bind/user")
     @ApiResponses({@ApiResponse(code = 200, message = "绑定成功", response = Result.class)})
     public Result page(@ApiParam(value = "扫描任务ID") Long paperScanTaskId,
@@ -114,11 +114,11 @@ public class ClientController {
     @ApiOperation(value = "上传图片")
     @PostMapping("/picture/upload")
     @ApiResponses({@ApiResponse(code = 200, message = "保存图片成功", response = Result.class)})
-    public Result pictureUpload(@ApiParam(value = "上传文件", required = true) @RequestParam Long paperScanTaskId,
-                                @ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile frontFile,
-                                @ApiParam(value = "上传文件类型", required = true) @RequestParam String frontMd5,
-                                @ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile versoFile,
-                                @ApiParam(value = "上传文件类型", required = true) @RequestParam String versoMd5) {
+    public Result pictureUpload(@ApiParam(value = "扫描任务ID", required = true) @RequestParam Long paperScanTaskId,
+                                @ApiParam(value = "正面图片", required = true) @RequestParam MultipartFile frontFile,
+                                @ApiParam(value = "正面图片md5", required = true) @RequestParam String frontMd5,
+                                @ApiParam(value = "背面图片", required = true) @RequestParam MultipartFile versoFile,
+                                @ApiParam(value = "背面图片md5", required = true) @RequestParam String versoMd5) {
         return ResultUtil.ok(clientService.pictureUpload(paperScanTaskId, frontFile, frontMd5, versoFile, versoMd5));
     }
 

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

@@ -55,7 +55,7 @@ public class ConditionController {
         List<BasicSemester> semesters = basicSemesterService.querySemester();
         List<SelectResult> resultList = semesters.stream().map(m -> {
             SelectResult result = new SelectResult();
-            result.setId(m.getId());
+            result.setId(String.valueOf(m.getId()));
             result.setCode(m.getCode());
             result.setName(m.getName());
             return result;
@@ -71,7 +71,7 @@ public class ConditionController {
     }
 
     @ApiOperation(value = "查询条件-档案管理部门")
-    @PostMapping("/_manager_org/query")
+    @PostMapping("/manager_org/query")
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
     public Result queryManagerOrg(@RequestParam(value = "semesterId", required = false) Long semesterId) {
         return ResultUtil.ok(paperArchivesService.queryManagerOrg(semesterId));
@@ -97,9 +97,17 @@ public class ConditionController {
     @PostMapping("/teach_clazz/query")
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = EditResult.class)})
     public Result queryTeachClazz(@ApiParam(value = "档案id") @RequestParam Long paperArchivesId,
-                                  @ApiParam(value = "课程id") @RequestParam String courseName) {
+                                  @ApiParam(value = "课程") @RequestParam String courseName) {
         List<SelectResult> teachClazzList = paperScanTaskService.queryDataTeachClazz(paperArchivesId, courseName);
         return ResultUtil.ok(teachClazzList);
     }
 
+    @ApiOperation(value = "查询条件-扫描任务")
+    @PostMapping("/scan_task/query")
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = EditResult.class)})
+    public Result queryScanTask(@ApiParam(value = "档案id") @RequestParam Long paperArchivesId) {
+        List<SelectResult> scanTaskList = paperScanTaskService.queryScanTask(paperArchivesId);
+        return ResultUtil.ok(scanTaskList);
+    }
+
 }

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

@@ -10,7 +10,6 @@ import com.qmth.paper.library.business.service.PaperArchivesService;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.util.Result;
 import com.qmth.paper.library.common.util.ResultUtil;
-import com.qmth.paper.library.common.util.ServletUtil;
 import io.swagger.annotations.*;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
@@ -47,7 +46,7 @@ public class PaperArchivesController {
         return ResultUtil.ok(paperArchivesService.pageData(semesterId, managerOrgId, archivesTypeId, archivesName, pageNumber, pageSize));
     }
 
-    @ApiOperation(value = "新增")
+    @ApiOperation(value = "新增/编辑")
     @PostMapping("/save")
     @ApiResponses({@ApiResponse(code = 200, message = "新增成功", response = EditResult.class)})
     public Result save(@Valid @RequestBody PaperArchives paperArchives, BindingResult bindingResult) {
@@ -57,6 +56,23 @@ public class PaperArchivesController {
         return ResultUtil.ok(paperArchivesService.saveData(paperArchives));
     }
 
+    @ApiOperation(value = "查看详情")
+    @PostMapping("/page_detail")
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
+    public Result pageDetail(@ApiParam(value = "档案ID") @RequestParam Long paperArchivesId,
+                             @ApiParam(value = "学院") @RequestParam(required = false) Long belongOrgId,
+                             @ApiParam(value = "专业") @RequestParam(required = false) String majorName,
+                             @ApiParam(value = "班级") @RequestParam(required = false) String clazzName,
+                             @ApiParam(value = "课程") @RequestParam(required = false) String courseName,
+                             @ApiParam(value = "任课老师") @RequestParam(required = false) String teacherName,
+                             @ApiParam(value = "教学班") @RequestParam(required = false) String teachClazzName,
+                             @ApiParam(value = "是否绑定") @RequestParam(required = false) Boolean isBind,
+                             @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));
+    }
+
 
     @ApiOperation(value = "删除")
     @PostMapping("/delete")

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

@@ -43,7 +43,7 @@ public class PaperArchivesTypeController {
     }
 
 
-    @ApiOperation(value = "新增")
+    @ApiOperation(value = "新增/编辑")
     @PostMapping("/save")
     @ApiResponses({@ApiResponse(code = 200, message = "保存/更新成功", response = EditResult.class)})
     public Result save(@Valid @RequestBody PaperArchivesType paperArchivesType, BindingResult bindingResult) {