增加部分模糊查询接口

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

@@ -30,8 +30,8 @@ public class PaperArchivesType extends BaseEntity implements Serializable {
      * 类型名称
      */
     @NotBlank(message = "类型名称必填")
-    @TableField("archives_type_name")
-    private String archivesTypeName;
+    @TableField("name")
+    private String name;
 
     public Long getSchoolId() {
         return schoolId;
@@ -41,11 +41,11 @@ public class PaperArchivesType extends BaseEntity implements Serializable {
         this.schoolId = schoolId;
     }
 
-    public String getArchivesTypeName() {
-        return archivesTypeName;
+    public String getName() {
+        return name;
     }
 
-    public void setArchivesTypeName(String archivesTypeName) {
-        this.archivesTypeName = archivesTypeName;
+    public void setName(String name) {
+        this.name = name;
     }
 }

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

@@ -1,9 +1,12 @@
 package com.qmth.paper.library.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.paper.library.business.bean.result.SelectResult;
 import com.qmth.paper.library.business.entity.PaperArchivesType;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 档案类型表 Mapper 接口
@@ -12,4 +15,6 @@ import org.apache.ibatis.annotations.Param;
 public interface PaperArchivesTypeMapper extends BaseMapper<PaperArchivesType> {
 
     PaperArchivesType selectByArchivesType(@Param("schoolId") Long schoolId, @Param("archivesTypeName") String archivesTypeName);
+
+    List<SelectResult> queryData(Long schoolId);
 }

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

@@ -2,8 +2,11 @@ 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.SelectResult;
 import com.qmth.paper.library.business.entity.PaperArchivesType;
 
+import java.util.List;
+
 /**
  * <p>
  * 档案管理表 服务类
@@ -16,4 +19,6 @@ public interface PaperArchivesTypeService extends IService<PaperArchivesType> {
     boolean saveData(PaperArchivesType paperArchivesType);
 
     boolean delete(Long id);
+
+    List<SelectResult> queryData();
 }

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

@@ -9,6 +9,5 @@ import com.qmth.paper.library.business.entity.PaperScanTaskDetail;
  * </p>
  */
 public interface PaperScanTaskDetailService extends IService<PaperScanTaskDetail> {
-    void importPaperScanTaskDetail();
 
 }

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

@@ -4,6 +4,7 @@ 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.SelectResult;
 import com.qmth.paper.library.business.entity.PaperArchivesType;
 import com.qmth.paper.library.business.mapper.PaperArchivesTypeMapper;
 import com.qmth.paper.library.business.service.PaperArchivesTypeService;
@@ -13,6 +14,8 @@ import com.qmth.paper.library.common.enums.ExceptionResultEnum;
 import com.qmth.paper.library.common.util.ServletUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 档案类型表 服务实现类
@@ -33,7 +36,7 @@ public class PaperArchivesTypeServiceImpl extends ServiceImpl<PaperArchivesTypeM
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
 
-        PaperArchivesType archivesType = this.baseMapper.selectByArchivesType(schoolId, paperArchivesType.getArchivesTypeName());
+        PaperArchivesType archivesType = this.baseMapper.selectByArchivesType(schoolId, paperArchivesType.getName());
 
         // 新增
         if (paperArchivesType.getId() == null) {
@@ -53,7 +56,7 @@ public class PaperArchivesTypeServiceImpl extends ServiceImpl<PaperArchivesTypeM
             } else if (!paperArchivesType.getId().equals(archivesType.getId())) {
                 throw ExceptionResultEnum.ERROR.exception("类型名称已存在");
             }
-            archivesType.setArchivesTypeName(paperArchivesType.getArchivesTypeName());
+            archivesType.setName(paperArchivesType.getName());
             archivesType.setUpdateId(sysUser.getId());
             archivesType.setUpdateTime(System.currentTimeMillis());
             return this.updateById(archivesType);
@@ -68,4 +71,10 @@ public class PaperArchivesTypeServiceImpl extends ServiceImpl<PaperArchivesTypeM
         }
         return this.removeById(id);
     }
+
+    @Override
+    public List<SelectResult> queryData() {
+        Long schoolId = SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId()));
+        return this.baseMapper.queryData(schoolId);
+    }
 }

paper-library-business/src/main/java/com/qmth/paper/library/business/templete/execute/AsyncPaperScanTaskImportService.java

@@ -14,6 +14,7 @@ import com.qmth.paper.library.common.util.Result;
 import com.qmth.paper.library.common.util.ResultUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,6 +28,7 @@ import java.util.StringJoiner;
  * @Author: CaoZixuan
  * @Date: 2022-09-29
  */
+@Service
 public class AsyncPaperScanTaskImportService extends AsyncImportTaskTemplete {
 
     private final static Logger log = LoggerFactory.getLogger(AsyncPaperScanTaskImportService.class);

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

@@ -75,7 +75,7 @@
     </select>
     <select id="queryManagerOrgs" resultType="com.qmth.paper.library.business.bean.result.SelectResult">
         SELECT
-            pa.manager_id id, so.name
+            distinct pa.manager_id id, so.name
         FROM
             paper_archives pa
                 LEFT JOIN

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

@@ -5,7 +5,7 @@
     <resultMap id="BaseResultMap" type="com.qmth.paper.library.business.entity.PaperArchivesType">
         <result column="id" property="id"/>
         <result column="school_id" property="schoolId"/>
-        <result column="archives_type_name" property="archivesTypeName"/>
+        <result column="name" property="name"/>
         <result column="create_id" property="createId"/>
         <result column="create_time" property="createTime"/>
         <result column="update_id" property="updateId"/>
@@ -14,7 +14,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-       select id, school_id, archives_type_name, create_id, create_time, update_id, update_time from paper_archives_type
+       select id, school_id, name, create_id, create_time, update_id, update_time from paper_archives_type
     </sql>
 
     <select id="selectByArchivesType" resultMap="BaseResultMap">
@@ -24,4 +24,7 @@
             and archives_type = #{archivesTypeName}
         </where>
     </select>
+    <select id="queryData" resultType="com.qmth.paper.library.business.bean.result.SelectResult">
+        select id, name from paper_archives_type
+    </select>
 </mapper>

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

@@ -66,7 +66,7 @@ public class PaperArchivesController {
     }
 
     @ApiOperation(value = "档案管理部门查询")
-    @PostMapping("/query_manager_orgs")
+    @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,6 +42,13 @@ 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")
     @ApiResponses({@ApiResponse(code = 200, message = "保存/更新成功", response = EditResult.class)})