查询条件接口

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

@@ -23,9 +23,6 @@ public class DictionaryResult implements Serializable {
     @ApiModelProperty(value = "编号")
     private String code;
 
-    @ApiModelProperty(value = "当前使用的（学期...）")
-    private Boolean inUsed;
-
     public Long getId() {
         return id;
     }
@@ -49,12 +46,4 @@ public class DictionaryResult implements Serializable {
     public void setCode(String code) {
         this.code = code;
     }
-
-    public Boolean getInUsed() {
-        return inUsed;
-    }
-
-    public void setInUsed(Boolean inUsed) {
-        this.inUsed = inUsed;
-    }
 }

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

@@ -4,6 +4,7 @@ import com.qmth.paper.library.business.entity.PaperLibrary;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 数据检查
@@ -22,8 +23,8 @@ public class PaperLibraryResult extends PaperLibrary implements Serializable {
     @ApiModelProperty(value = "绑定图片数量")
     private int bindCount;
 
-    @ApiModelProperty(value = "图片访问地址")
-    private String fileUrl;
+    @ApiModelProperty(value = "图片访问地址（解析后地址）")
+    private List<String> fileUrls;
 
     @ApiModelProperty(value = "扫描任务名称")
     private String paperScanTaskName;
@@ -60,12 +61,12 @@ public class PaperLibraryResult extends PaperLibrary implements Serializable {
         this.bindCount = bindCount;
     }
 
-    public String getFileUrl() {
-        return fileUrl;
+    public List<String> getFileUrls() {
+        return fileUrls;
     }
 
-    public void setFileUrl(String fileUrl) {
-        this.fileUrl = fileUrl;
+    public void setFileUrls(List<String> fileUrls) {
+        this.fileUrls = fileUrls;
     }
 
     public String getPaperScanTaskName() {

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

@@ -21,5 +21,5 @@ public interface PaperArchivesMapper extends BaseMapper<PaperArchives> {
 
     PaperArchives selectByArchivesName(@Param("schoolId") Long schoolId, @Param("archivesName") String archivesName);
 
-    List<SelectResult> queryManagerOrgs(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId);
+    List<SelectResult> queryManagerOrg(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId);
 }

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

@@ -16,5 +16,5 @@ public interface PaperArchivesTypeMapper extends BaseMapper<PaperArchivesType> {
 
     PaperArchivesType selectByArchivesType(@Param("schoolId") Long schoolId, @Param("name") String name);
 
-    List<SelectResult> queryData(Long schoolId);
+    List<SelectResult> queryArchivesType(@Param("schoolId") Long schoolId);
 }

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

@@ -64,5 +64,7 @@ public interface PaperScanTaskMapper extends BaseMapper<PaperScanTask> {
     List<BindDetailResult> findBindDetailByScanTaskId(@Param("schoolId") Long schoolId,
                                                       @Param("paperScanTaskId") Long paperScanTaskId);
 
-    List<SelectResult> listCourseName(@Param("paperArchivesId") Long paperArchivesId, @Param("semesterId") Long semesterId);
+    List<SelectResult> queryCourse(@Param("paperArchivesId") Long paperArchivesId, @Param("semesterId") Long semesterId);
+
+    List<SelectResult> queryDataTeachClazz(@Param("paperArchivesId") Long paperArchivesId, @Param("courseName") String courseName);
 }

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

@@ -21,5 +21,7 @@ public interface PaperArchivesService extends IService<PaperArchives> {
 
     boolean delete(Long id);
 
-    List<SelectResult> queryManagerOrgs(Long semesterId);
+    List<SelectResult> queryManagerOrg(Long semesterId);
+
+    List<SelectResult> queryArchives(Long semesterId);
 }

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

@@ -20,5 +20,5 @@ public interface PaperArchivesTypeService extends IService<PaperArchivesType> {
 
     boolean delete(Long id);
 
-    List<SelectResult> queryData();
+    List<SelectResult> queryArchivesType();
 }

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

@@ -83,4 +83,6 @@ public interface PaperLibraryCommonService {
     public String saveTaskAttachment(ByteArrayOutputStream fos, boolean oss) throws IOException;
 
     String saveLibraryFile(UploadFileEnum uploadFileEnum, MultipartFile... files);
+
+    String preViewPath(String path, String uploadType, Boolean isExpire);
 }

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

@@ -22,6 +22,8 @@ public interface PaperLibraryService extends IService<PaperLibrary> {
 
     boolean bind(Long paperLibraryId, Long paperScanTaskDetailId);
 
+    List<String> listStudentPicture(Long paperScanTaskDetailId);
+
     int countBindData(Long paperScanTaskId);
 
     List<PaperLibraryResult> toBindPaper();

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

@@ -95,5 +95,7 @@ public interface PaperScanTaskService extends IService<PaperScanTask> {
 
     List<PaperScanTask> listByPaperArchivesId(Long id);
 
-    List<SelectResult> listCourseName(Long paperArchivesId, Long semesterId);
+    List<SelectResult> queryCourse(Long paperArchivesId, Long semesterId);
+
+    List<SelectResult> queryDataTeachClazz(Long paperArchivesId, String courseName);
 }

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

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -69,9 +70,28 @@ public class PaperArchivesServiceImpl extends ServiceImpl<PaperArchivesMapper, P
     }
 
     @Override
-    public List<SelectResult> queryManagerOrgs(Long semesterId) {
+    public List<SelectResult> queryManagerOrg(Long semesterId) {
         Long schoolId = SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId()));
-        return this.baseMapper.queryManagerOrgs(schoolId, semesterId);
+        return this.baseMapper.queryManagerOrg(schoolId, semesterId);
+    }
+
+    @Override
+    public List<SelectResult> queryArchives(Long semesterId) {
+        Long schoolId = SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId()));
+        QueryWrapper<PaperArchives> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(PaperArchives::getSchoolId, schoolId);
+        if(semesterId != null ){
+            queryWrapper.lambda().eq(PaperArchives::getSemesterId, semesterId);
+        }
+        List<PaperArchives> paperArchivesList = this.list(queryWrapper);
+        List<SelectResult> selectResultList = paperArchivesList.stream().map(m->{
+            SelectResult result = new SelectResult();
+            result.setId(m.getId());
+            result.setCode(m.getArchivesCode());
+            result.setName(m.getArchivesName());
+            return result;
+        }).collect(Collectors.toList());
+        return selectResultList;
     }
 
 }

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

@@ -73,8 +73,8 @@ public class PaperArchivesTypeServiceImpl extends ServiceImpl<PaperArchivesTypeM
     }
 
     @Override
-    public List<SelectResult> queryData() {
+    public List<SelectResult> queryArchivesType() {
         Long schoolId = SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId()));
-        return this.baseMapper.queryData(schoolId);
+        return this.baseMapper.queryArchivesType(schoolId);
     }
 }

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

@@ -24,6 +24,7 @@ import com.qmth.paper.library.common.util.RedisUtil;
 import com.qmth.paper.library.common.util.ResultUtil;
 import com.qmth.paper.library.common.util.ServletUtil;
 import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -394,4 +395,30 @@ public class PaperLibraryCommonServiceImpl implements PaperLibraryCommonService
         return JSON.toJSONString(objects);
     }
 
+    @Override
+    public String preViewPath(String path, String uploadType, Boolean isExpire) {
+        if (StringUtils.isBlank(path)) {
+            return null;
+        }
+        String pathUrl;
+        // 本地文件
+        if (Objects.equals(uploadType, SystemConstant.LOCAL)) {
+            String hostUrl = SystemConstant.getLocalFileHost(dictionaryConfig.fssLocalFileDomain().getServer());
+            path = SystemConstant.getLocalFilePath(hostUrl, path);
+            if (path.startsWith("/")) {
+                pathUrl = hostUrl + path;
+            } else {
+                pathUrl = hostUrl + File.separator + path;
+            }
+        } else {
+            if (isExpire) {
+                pathUrl = fileStoreUtil.getPrivateUrl(path, fileStoreUtil.getUploadEnumByPath(path).getFssType());
+            } else {
+                pathUrl = fileStoreUtil.getPrivateUrl(path, fileStoreUtil.getUploadEnumByPath(path).getFssType());
+            }
+
+        }
+        return pathUrl;
+    }
+
 }

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

@@ -1,5 +1,8 @@
 package com.qmth.paper.library.business.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,6 +11,7 @@ import com.qmth.paper.library.business.bean.result.PaperLibraryResult;
 import com.qmth.paper.library.business.entity.PaperLibrary;
 import com.qmth.paper.library.business.entity.PaperScanTaskDetail;
 import com.qmth.paper.library.business.mapper.PaperLibraryMapper;
+import com.qmth.paper.library.business.service.PaperLibraryCommonService;
 import com.qmth.paper.library.business.service.PaperLibraryService;
 import com.qmth.paper.library.business.service.PaperScanTaskDetailService;
 import com.qmth.paper.library.common.contant.SystemConstant;
@@ -16,6 +20,7 @@ import com.qmth.paper.library.common.enums.ExceptionResultEnum;
 import com.qmth.paper.library.common.lock.LockService;
 import com.qmth.paper.library.common.lock.LockType;
 import com.qmth.paper.library.common.util.ServletUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -34,6 +39,9 @@ public class PaperLibraryServiceImpl extends ServiceImpl<PaperLibraryMapper, Pap
     @Resource
     PaperScanTaskDetailService paperScanTaskDetailService;
 
+    @Resource
+    PaperLibraryCommonService paperLibraryCommonService;
+
     @Resource
     LockService lockService;
 
@@ -69,6 +77,28 @@ public class PaperLibraryServiceImpl extends ServiceImpl<PaperLibraryMapper, Pap
         return this.update(updateWrapper);
     }
 
+    @Override
+    public List<String> listStudentPicture(Long paperScanTaskDetailId) {
+        Long schoolId = SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId()));
+        QueryWrapper<PaperLibrary> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(PaperLibrary::getSchoolId, schoolId)
+                .eq(PaperLibrary::getPaperScanTaskDetailId, paperScanTaskDetailId)
+                .orderByAsc(PaperLibrary::getSequence);
+        List<PaperLibrary> paperLibraryList = this.list(queryWrapper);
+        List<String> fileUrls = new ArrayList<>();
+        for (PaperLibrary paperLibrary : paperLibraryList) {
+            String fileUrl = paperLibrary.getPath();
+            if (StringUtils.isBlank(fileUrl)) {
+                throw ExceptionResultEnum.ERROR.exception("未找到图片路径");
+            }
+            List<JSONObject> objectList = JSON.parseArray(fileUrl, JSONObject.class);
+            for (JSONObject jsonObject : objectList) {
+                fileUrls.add(paperLibraryCommonService.preViewPath(jsonObject.getString(SystemConstant.PATH), jsonObject.getString(SystemConstant.UPLOAD_TYPE), false));
+            }
+        }
+        return fileUrls;
+    }
+
     @Override
     public List<PaperLibraryResult> toBindPaper() {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
@@ -85,8 +115,16 @@ public class PaperLibraryServiceImpl extends ServiceImpl<PaperLibraryMapper, Pap
             for (PaperLibrary paperLibrary : waitPaperLibraryList) {
                 PaperLibraryResult paperLibraryResult = new PaperLibraryResult();
                 BeanUtils.copyProperties(paperLibrary, paperLibraryResult);
-                // todo 图片地址
-                paperLibraryResult.setFileUrl("");
+                String fileUrl = paperLibrary.getPath();
+                if (StringUtils.isBlank(fileUrl)) {
+                    throw ExceptionResultEnum.ERROR.exception("未找到图片路径");
+                }
+                List<JSONObject> objectList = JSON.parseArray(fileUrl, JSONObject.class);
+                List<String> fileUrls = new ArrayList<>();
+                for (JSONObject jsonObject : objectList) {
+                    fileUrls.add(paperLibraryCommonService.preViewPath(jsonObject.getString(SystemConstant.PATH), jsonObject.getString(SystemConstant.UPLOAD_TYPE), false));
+                }
+                paperLibraryResult.setFileUrls(fileUrls);
                 paperLibraryResultList.add(paperLibraryResult);
             }
         }

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

@@ -243,7 +243,12 @@ public class PaperScanTaskServiceImpl extends ServiceImpl<PaperScanTaskMapper, P
     }
 
     @Override
-    public List<SelectResult> listCourseName(Long paperArchivesId, Long semesterId) {
-        return this.baseMapper.listCourseName(paperArchivesId, semesterId);
+    public List<SelectResult> queryCourse(Long paperArchivesId, Long semesterId) {
+        return this.baseMapper.queryCourse(paperArchivesId, semesterId);
+    }
+
+    @Override
+    public List<SelectResult> queryDataTeachClazz(Long paperArchivesId, String courseName) {
+        return this.baseMapper.queryDataTeachClazz(paperArchivesId, courseName);
     }
 }

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

@@ -73,7 +73,7 @@
             and archives_name = #{archivesName}
         </where>
     </select>
-    <select id="queryManagerOrgs" resultType="com.qmth.paper.library.business.bean.result.SelectResult">
+    <select id="queryManagerOrg" resultType="com.qmth.paper.library.business.bean.result.SelectResult">
         SELECT
             distinct pa.manager_id id, so.name
         FROM

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

@@ -24,7 +24,7 @@
             and name = #{name}
         </where>
     </select>
-    <select id="queryData" resultType="com.qmth.paper.library.business.bean.result.SelectResult">
-        select id, name from paper_archives_type
+    <select id="queryArchivesType" resultType="com.qmth.paper.library.business.bean.result.SelectResult">
+        select id, name from paper_archives_type order by create_time
     </select>
 </mapper>

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

@@ -51,6 +51,7 @@
             pst.scan_task_name paperScanTaskName,
             pst.course_name courseName,
             pst.create_time createTime,
+            pl.paper_scan_task_detail_id paperScanTaskDetailId,
             pl.bind_count bindCount
         FROM
             (SELECT

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

@@ -108,7 +108,7 @@
                 LEFT JOIN
             sys_user su ON pl.user_id = su.id
     </select>
-    <select id="listCourseName" resultType="com.qmth.paper.library.business.bean.result.SelectResult">
+    <select id="queryCourse" resultType="com.qmth.paper.library.business.bean.result.SelectResult">
         SELECT
             pst.course_name id, pst.course_name name
         FROM
@@ -125,4 +125,18 @@
             </if>
         </where>
     </select>
+    <select id="queryDataTeachClazz" resultType="com.qmth.paper.library.business.bean.result.SelectResult">
+        SELECT
+            pst.teach_clazz_name id, pst.teach_clazz_name name
+        FROM
+            paper_scan_task pst
+        <where>
+            <if test="paperArchivesId != null">
+                and pst.paper_archives_id = #{paperArchivesId}
+            </if>
+            <if test="courseName != null and courseName != ''">
+                and pst.course_name = #{courseName}
+            </if>
+        </where>
+    </select>
 </mapper>

paper-library-common/src/main/java/com/qmth/paper/library/common/bean/params/BasicSemesterParams.java

@@ -29,18 +29,6 @@ public class BasicSemesterParams implements Serializable {
     @DBVerify(value = "学期名称", required = true, min = 1, max = 50)
     private String semesterName;
 
-//    @ApiModelProperty(value = "学期开始时间")
-//    @NotNull(message = "请选择学期开始时间")
-//    @Range(min = 1L, message = "请选择学期开始时间")
-//    @DBVerify(value = "学期开始时间", required = true, min = 1)
-//    private Long startTime;
-//
-//    @ApiModelProperty(value = "学期结束时间")
-//    @NotNull(message = "请选择学期结束时间")
-//    @Range(min = 1L, message = "请选择学期结束时间")
-//    @DBVerify(value = "学期结束时间", required = true, min = 1)
-//    private Long endTime;
-
     @ApiModelProperty(value = "启用/禁用，ture：启用，false：禁用，默认启用")
     Boolean enable = true;
 
@@ -57,8 +45,6 @@ public class BasicSemesterParams implements Serializable {
     public BasicSemesterParams(Long id, String semesterName) {
         this.id = id;
         this.semesterName = semesterName;
-//        this.startTime = startTime;
-//        this.endTime = endTime;
     }
 
     /**
@@ -66,8 +52,6 @@ public class BasicSemesterParams implements Serializable {
      */
     public void validParams() {
         Optional.ofNullable(this.getSemesterName()).orElseThrow(() -> ExceptionResultEnum.PARAMS_ERROR.exception("学期名称为空"));
-//        Optional.ofNullable(this.getStartTime()).orElseThrow(() -> ExceptionResultEnum.PARAMS_ERROR.exception("学期开始时间为空"));
-//        Optional.ofNullable(this.getEndTime()).orElseThrow(() -> ExceptionResultEnum.PARAMS_ERROR.exception("学期结束时间为空"));
     }
 
     public Boolean getEnable() {
@@ -94,19 +78,4 @@ public class BasicSemesterParams implements Serializable {
         this.semesterName = semesterName;
     }
 
-//    public Long getStartTime() {
-//        return startTime;
-//    }
-//
-//    public void setStartTime(Long startTime) {
-//        this.startTime = startTime;
-//    }
-//
-//    public Long getEndTime() {
-//        return endTime;
-//    }
-//
-//    public void setEndTime(Long endTime) {
-//        this.endTime = endTime;
-//    }
 }

paper-library-common/src/main/java/com/qmth/paper/library/common/entity/BasicSemester.java

@@ -31,22 +31,9 @@ public class BasicSemester extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "学期编码")
     private String code;
 
-    @ApiModelProperty(value = "开始日期")
-    private Long startTime;
-
-    @ApiModelProperty(value = "结束日期")
-    private Long endTime;
-
-    @ApiModelProperty(value = "机构id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long orgId;
-
     @ApiModelProperty(value = "是否启用，0：停用，1：启用")
     private Boolean enable;
 
-    @ApiModelProperty(value = "是否当前使用学期，0：否，1：是")
-    private Boolean inUsed;
-
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
@@ -75,30 +62,6 @@ public class BasicSemester extends BaseEntity implements Serializable {
         this.code = code;
     }
 
-    public Long getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Long startTime) {
-        this.startTime = startTime;
-    }
-
-    public Long getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Long endTime) {
-        this.endTime = endTime;
-    }
-
-    public Long getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
-    }
-
     public Boolean getEnable() {
         return enable;
     }
@@ -106,12 +69,4 @@ public class BasicSemester extends BaseEntity implements Serializable {
     public void setEnable(Boolean enable) {
         this.enable = enable;
     }
-
-    public Boolean getInUsed() {
-        return inUsed;
-    }
-
-    public void setInUsed(Boolean inUsed) {
-        this.inUsed = inUsed;
-    }
 }

paper-library-common/src/main/java/com/qmth/paper/library/common/service/BasicSemesterService.java

@@ -46,7 +46,7 @@ public interface BasicSemesterService extends IService<BasicSemester> {
      * @return 学期id
      * @throws IllegalAccessException 异常
      */
-    Long saveBasicSemesterCommon(BasicSemesterParams basicSemesterParams, Long schoolId, Long orgId, boolean openApi) throws IllegalAccessException;
+    Long saveBasicSemesterCommon(BasicSemesterParams basicSemesterParams, Long schoolId, boolean openApi) throws IllegalAccessException;
 
     /**
      * 学期删除
@@ -58,18 +58,7 @@ public interface BasicSemesterService extends IService<BasicSemester> {
 
     /**
      * 查询学期
-     *
-     * @param schoolId
-     * @param inUsed
-     * @return
      */
-    List<BasicSemester> list(Long schoolId, Boolean inUsed);
+    List<BasicSemester> querySemester();
 
-    /**
-     * 设置当前使用学期
-     *
-     * @param id
-     * @return
-     */
-    boolean setInUsed(Long id);
 }

paper-library-common/src/main/java/com/qmth/paper/library/common/service/impl/BasicSemesterServiceImpl.java

@@ -46,7 +46,7 @@ public class BasicSemesterServiceImpl extends ServiceImpl<BasicSemesterMapper, B
     @Override
     public Long saveBasicSemester(BasicSemesterParams basicSemesterParams) throws IllegalAccessException {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        return basicSemesterService.saveBasicSemesterCommon(basicSemesterParams, sysUser.getSchoolId(), sysUser.getOrgId(),false);
+        return basicSemesterService.saveBasicSemesterCommon(basicSemesterParams, sysUser.getSchoolId(),false);
     }
 
     /**
@@ -60,12 +60,10 @@ public class BasicSemesterServiceImpl extends ServiceImpl<BasicSemesterMapper, B
      */
     @Override
     @Transactional
-    public Long saveBasicSemesterCommon(BasicSemesterParams basicSemesterParams, Long schoolId, Long orgId,boolean openApi) throws IllegalAccessException {
+    public Long saveBasicSemesterCommon(BasicSemesterParams basicSemesterParams, Long schoolId, boolean openApi) throws IllegalAccessException {
         SystemConstant.verifyDBFields(basicSemesterParams, basicSemesterParams.getClass());
         Long id = basicSemesterParams.getId();
         String semesterName = basicSemesterParams.getSemesterName();
-//        Long startTime = basicSemesterParams.getStartTime();
-//        Long endTime = basicSemesterParams.getEndTime();
 
         // 校验学期唯一性
         BasicSemester checkName = this.getOne(new QueryWrapper<BasicSemester>().lambda()
@@ -98,13 +96,6 @@ public class BasicSemesterServiceImpl extends ServiceImpl<BasicSemesterMapper, B
             basicSemester.setName(semesterName);
             basicSemester.setSchoolId(schoolId);
             basicSemester.setCode(null);
-            basicSemester.setOrgId(orgId);
-
-            QueryWrapper<BasicSemester> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().eq(BasicSemester::getSchoolId, schoolId);
-            List<BasicSemester> basicSemesters = this.list(queryWrapper);
-
-            basicSemester.setInUsed(basicSemesters == null || basicSemesters.size() == 0);
             this.save(basicSemester);
         }
         return id;
@@ -124,33 +115,11 @@ public class BasicSemesterServiceImpl extends ServiceImpl<BasicSemesterMapper, B
     }
 
     @Override
-    public List<BasicSemester> list(Long schoolId, Boolean inUsed) {
+    public List<BasicSemester> querySemester() {
+        Long schoolId = SystemConstant.convertIdToLong(ServletUtil.getRequestHeaderSchoolId().toString());
         QueryWrapper<BasicSemester> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(BasicSemester::getSchoolId, schoolId).eq(BasicSemester::getEnable, true);
-        if (Objects.nonNull(inUsed)) {
-            queryWrapper.lambda().eq(BasicSemester::getInUsed, inUsed);
-        }
         return this.list(queryWrapper);
     }
 
-    @Transactional
-    @Override
-    public boolean setInUsed(Long id) {
-        BasicSemester semester = this.getById(id);
-        // 只能设置一个当前使用学期
-        if (!semester.getInUsed()) {
-            QueryWrapper<BasicSemester> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().eq(BasicSemester::getSchoolId, semester.getSchoolId());
-            List<BasicSemester> list = this.list(queryWrapper);
-            if (!CollectionUtils.isEmpty(list)) {
-                list = list.stream().map(m -> {
-                    m.setInUsed(false);
-                    return m;
-                }).collect(Collectors.toList());
-                this.updateBatchById(list);
-            }
-        }
-        semester.setInUsed(!semester.getInUsed());
-        return this.updateById(semester);
-    }
 }

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

@@ -42,19 +42,6 @@ public class BasicSemesterController {
         return ResultUtil.ok(basicSemesterService.basicSemesterPage(schoolId,pageNumber,pageSize));
     }
 
-    /**
-     * 模糊查询
-     * @param inUsed 1:只查询当前使用的学期  0：只查询不是当前使用的学期  null:查询所有
-     * @return
-     */
-    @ApiOperation(value = "学期模糊查询")
-    @RequestMapping(value = "/list", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
-    public Result list(@RequestParam(value = "inUsed", required = false) Boolean inUsed) {
-        Long schoolId = SystemConstant.convertIdToLong(ServletUtil.getRequestHeaderSchoolId().toString());
-        return ResultUtil.ok(basicSemesterService.list(schoolId, inUsed));
-    }
-
     @ApiOperation(value = "学期管理-新增/编辑")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = EditResult.class)})
@@ -72,15 +59,4 @@ public class BasicSemesterController {
         return ResultUtil.ok(basicSemesterService.deleteBasicSemesterById(SystemConstant.convertIdToLong(id)));
     }
 
-    /**
-     * 设置为当前使用学期
-     * @param id
-     * @return
-     */
-    @ApiOperation(value = "学期管理-设置为当前使用学期")
-    @RequestMapping(value = "/set_in_used", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = EditResult.class)})
-    public Result saveBasicSemester(@RequestParam("id") Long id) {
-        return ResultUtil.ok(basicSemesterService.setInUsed(id));
-    }
 }

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

@@ -0,0 +1,105 @@
+package com.qmth.paper.library.api;
+
+
+import com.qmth.boot.api.annotation.Aac;
+import com.qmth.boot.api.annotation.BOOL;
+import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.paper.library.business.bean.result.EditResult;
+import com.qmth.paper.library.business.bean.result.SelectResult;
+import com.qmth.paper.library.business.service.PaperArchivesService;
+import com.qmth.paper.library.business.service.PaperArchivesTypeService;
+import com.qmth.paper.library.business.service.PaperScanTaskService;
+import com.qmth.paper.library.common.entity.BasicSemester;
+import com.qmth.paper.library.common.service.BasicSemesterService;
+import com.qmth.paper.library.common.util.Result;
+import com.qmth.paper.library.common.util.ResultUtil;
+import io.swagger.annotations.*;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 查询 前端控制器
+ * </p>
+ */
+@Api(tags = "查询条件Controller")
+@RestController
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.common}")
+@Validated
+@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
+public class ConditionController {
+
+    @Resource
+    PaperArchivesService paperArchivesService;
+
+    @Resource
+    BasicSemesterService basicSemesterService;
+
+    @Resource
+    PaperArchivesTypeService paperArchivesTypeService;
+
+    @Resource
+    PaperScanTaskService paperScanTaskService;
+
+    @ApiOperation(value = "查询条件-学期")
+    @PostMapping("/semester/query")
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
+    public Result querySemester() {
+        List<BasicSemester> semesters = basicSemesterService.querySemester();
+        List<SelectResult> resultList = semesters.stream().map(m -> {
+            SelectResult result = new SelectResult();
+            result.setId(m.getId());
+            result.setCode(m.getCode());
+            result.setName(m.getName());
+            return result;
+        }).collect(Collectors.toList());
+        return ResultUtil.ok(resultList);
+    }
+
+    @ApiOperation(value = "查询条件-档案")
+    @PostMapping("/archives/query")
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
+    public Result queryArchives(@ApiParam(value = "学期ID") @RequestParam(required = false) Long semesterId) {
+        return ResultUtil.ok(paperArchivesService.queryArchives(semesterId));
+    }
+
+    @ApiOperation(value = "查询条件-档案管理部门")
+    @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));
+    }
+
+    @ApiOperation(value = "查询条件-档案类型")
+    @PostMapping("/archives_type/query")
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
+    public Result queryArchivesType() {
+        return ResultUtil.ok(paperArchivesTypeService.queryArchivesType());
+    }
+
+    @ApiOperation(value = "查询条件-课程")
+    @PostMapping("/course/query")
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = EditResult.class)})
+    public Result queryCourse(@ApiParam(value = "档案id") @RequestParam Long paperArchivesId,
+                              @ApiParam(value = "学期id") @RequestParam Long semesterId) {
+        List<SelectResult> courseList = paperScanTaskService.queryCourse(paperArchivesId, semesterId);
+        return ResultUtil.ok(courseList);
+    }
+
+    @ApiOperation(value = "查询条件-教学班")
+    @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) {
+        List<SelectResult> teachClazzList = paperScanTaskService.queryDataTeachClazz(paperArchivesId, courseName);
+        return ResultUtil.ok(teachClazzList);
+    }
+
+}

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

@@ -65,11 +65,4 @@ public class PaperArchivesController {
         return ResultUtil.ok(paperArchivesService.delete(id));
     }
 
-    @ApiOperation(value = "档案管理部门查询")
-    @PostMapping("/_manager_orgs/query")
-    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
-    public Result queryManagerOrgs(@RequestParam(value = "semesterId", required = false) Long semesterId) {
-        return ResultUtil.ok(paperArchivesService.queryManagerOrgs(semesterId));
-    }
-
 }

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

@@ -42,12 +42,6 @@ public class PaperArchivesTypeController {
         return ResultUtil.ok(paperArchivesTypeService.pageData(pageNumber, pageSize));
     }
 
-    @ApiOperation(value = "查询-不分页")
-    @PostMapping("/query")
-    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
-    public Result query() {
-        return ResultUtil.ok(paperArchivesTypeService.queryData());
-    }
 
     @ApiOperation(value = "新增")
     @PostMapping("/save")

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

@@ -66,11 +66,18 @@ public class PaperLibraryController {
         return ResultUtil.ok(paperLibraryService.countBindData(paperScanTaskId));
     }
 
+    @ApiOperation(value = "查询考生图片集合")
+    @PostMapping("/list_student_picture")
+    @ApiResponses({@ApiResponse(code = 200, message = "确定成功", response = Result.class)})
+    public Result listStudentPicture(@ApiParam(value = "扫描任务详情ID（任务+考生）") @RequestParam Long paperScanTaskDetailId) {
+        return ResultUtil.ok(paperLibraryService.listStudentPicture(paperScanTaskDetailId));
+    }
+
     @ApiOperation(value = "绑定")
     @PostMapping("/bind")
     @ApiResponses({@ApiResponse(code = 200, message = "绑定成功", response = EditResult.class)})
-    public Result save(@RequestParam Long paperLibraryId,
-                       @RequestParam Long paperScanTaskDetailId) {
+    public Result save(@ApiParam(value = "扫描图片ID") @RequestParam Long paperLibraryId,
+                       @ApiParam(value = "扫描任务详情ID（任务+考生）") @RequestParam Long paperScanTaskDetailId) {
         return ResultUtil.ok(paperLibraryService.bind(paperLibraryId, paperScanTaskDetailId));
     }
 

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

@@ -143,13 +143,4 @@ public class PaperScanTaskController {
         return ResultUtil.ok();
     }
 
-    @ApiOperation(value = "课程列表")
-    @PostMapping("/list_course")
-    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = EditResult.class)})
-    public Result listCourseName(@ApiParam(value = "档案id") @RequestParam Long paperArchivesId,
-                                     @ApiParam(value = "学期id") @RequestParam Long semesterId) {
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        List<SelectResult> courseList = paperScanTaskService.listCourseName(paperArchivesId, semesterId);
-        return ResultUtil.ok();
-    }
 }

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

@@ -435,14 +435,12 @@ public class SysController {
                 List<BasicSemester> basicSemesterList = basicSemesterService.list(new QueryWrapper<BasicSemester>()
                         .lambda()
                         .eq(BasicSemester::getSchoolId, schoolId)
-                        .eq(BasicSemester::getEnable, true)
-                        .orderByDesc(BasicSemester::getInUsed));
+                        .eq(BasicSemester::getEnable, true));
                 dictionaryResultList = basicSemesterList.stream().map(e -> {
                     DictionaryResult dictionaryResult = new DictionaryResult();
                     dictionaryResult.setId(e.getId());
                     dictionaryResult.setCode(e.getCode());
                     dictionaryResult.setName(e.getName());
-                    dictionaryResult.setInUsed(e.getInUsed());
                     return dictionaryResult;
                 }).collect(Collectors.toList());
                 break;