测试bug修改

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

@@ -69,7 +69,7 @@ public class PaperScanTask extends BaseEntity implements Serializable {
     /**
      * 已扫描数量
      */
-    @TableField("scan_count")
+    @TableField(value = "scan_count", updateStrategy = FieldStrategy.IGNORED)
     private Integer scanCount;
 
     public Long getSchoolId() {

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

@@ -5,14 +5,17 @@ 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.PaperArchives;
 import com.qmth.paper.library.business.entity.PaperArchivesType;
 import com.qmth.paper.library.business.mapper.PaperArchivesTypeMapper;
+import com.qmth.paper.library.business.service.PaperArchivesService;
 import com.qmth.paper.library.business.service.PaperArchivesTypeService;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.enums.ExceptionResultEnum;
 import com.qmth.paper.library.common.util.ServletUtil;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -23,6 +26,9 @@ import java.util.List;
 @Service
 public class PaperArchivesTypeServiceImpl extends ServiceImpl<PaperArchivesTypeMapper, PaperArchivesType> implements PaperArchivesTypeService {
 
+    @Resource
+    PaperArchivesService paperArchivesService;
+
     @Override
     public IPage<PaperArchivesType> pageData(Integer pageNumber, Integer pageSize) {
         QueryWrapper<PaperArchivesType> queryWrapper = new QueryWrapper<>();
@@ -68,6 +74,15 @@ public class PaperArchivesTypeServiceImpl extends ServiceImpl<PaperArchivesTypeM
         if (paperArchivesType == null) {
             throw ExceptionResultEnum.ERROR.exception("数据有误");
         }
+        // 已使用不能删除
+        QueryWrapper<PaperArchives> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(PaperArchives::getSchoolId, paperArchivesType.getSchoolId())
+                .eq(PaperArchives::getArchivesTypeId, id);
+        int count = paperArchivesService.count(queryWrapper);
+        if(count != 0){
+            throw ExceptionResultEnum.ERROR.exception("档案类型已使用，不能删除");
+        }
+
         return this.removeById(id);
     }
 

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

@@ -133,14 +133,14 @@
             <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 test="teachClazzName != null and teachClazzName != ''">
+                and pst.teach_clazz_name = #{teachClazzName}
             </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},'%'))
+                and (bs.student_name like concat('%',#{param},'%') or bs.student_code like concat('%',#{param},'%'))
             </if>
         </where>
     </select>

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

@@ -135,7 +135,7 @@
                 and pa.school_id = #{schoolId}
             </if>
             <if test="studentCode != null and studentCode != ''">
-                and bs.student_code like  concat(#{studentCode}, '%')
+                and bs.student_code like  concat('%', #{studentCode}, '%')
             </if>
         </where>
     </select>

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

@@ -111,7 +111,7 @@
     </select>
     <select id="queryCourse" resultType="com.qmth.paper.library.business.bean.result.SelectResult">
         SELECT
-            pst.course_name id, pst.course_name name
+            distinct pst.course_name id, pst.course_name name
         FROM
             paper_scan_task pst
                 LEFT JOIN
@@ -129,7 +129,7 @@
     </select>
     <select id="queryDataTeachClazz" resultType="com.qmth.paper.library.business.bean.result.SelectResult">
         SELECT
-            pst.teach_clazz_name id, pst.teach_clazz_name name
+            distinct pst.teach_clazz_name id, pst.teach_clazz_name name
         FROM
             paper_scan_task pst
         <where>

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

@@ -1,17 +1,19 @@
 package com.qmth.paper.library.api;
 
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.paper.library.business.bean.result.EditResult;
+import com.qmth.paper.library.business.service.PaperLibraryCommonService;
 import com.qmth.paper.library.business.templete.execute.AsyncStudentDataImportService;
 import com.qmth.paper.library.common.bean.params.BasicStudentParams;
-import com.qmth.paper.library.business.bean.result.EditResult;
+import com.qmth.paper.library.common.contant.SystemConstant;
+import com.qmth.paper.library.common.entity.SysUser;
 import com.qmth.paper.library.common.entity.TBTask;
 import com.qmth.paper.library.common.enums.ExceptionResultEnum;
 import com.qmth.paper.library.common.enums.TaskTypeEnum;
 import com.qmth.paper.library.common.service.BasicStudentService;
-import com.qmth.paper.library.business.service.PaperLibraryCommonService;
-import com.qmth.paper.library.common.contant.SystemConstant;
-import com.qmth.paper.library.common.entity.SysUser;
 import com.qmth.paper.library.common.util.Result;
 import com.qmth.paper.library.common.util.ResultUtil;
 import com.qmth.paper.library.common.util.ServletUtil;
@@ -25,8 +27,8 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * <p>
@@ -74,8 +76,9 @@ public class BasicStudentController {
     @ApiOperation(value = "学生基本信息管理-批量删除（物理）")
     @RequestMapping(value = "/delete_batch", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = EditResult.class)})
-    public Result deleteBasicStudent(@ApiParam(value = "选择的要删除的学生id集合", required = true) @RequestParam List<String> idList) {
-        return ResultUtil.ok(basicStudentService.removeBasicStudentBatch(idList.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList())));
+    public Result deleteBasicStudent(@RequestBody String data) {
+        JSONObject object = JSON.parseObject(data, JSONObject.class);
+        return ResultUtil.ok(basicStudentService.removeBasicStudentBatch(JSON.parseArray(object.getString("ids"), Long.class)));
     }
 
     @ApiOperation(value = "学生基本信息管理-根据条件删除（物理）")

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

@@ -1,5 +1,7 @@
 package com.qmth.paper.library.api;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.paper.library.business.bean.params.PaperScanTaskParam;
 import com.qmth.paper.library.business.bean.result.EditResult;
@@ -73,9 +75,10 @@ public class PaperScanTaskController {
     @ApiOperation(value = "扫描任务管理-批量删除（物理）")
     @RequestMapping(value = "/delete_batch", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = EditResult.class)})
-    public Result deletePaperScanTask(@ApiParam(value = "选择的要删除的扫描任务id集合", required = true) @RequestParam List<String> idList) {
+    public Result deletePaperScanTask(@RequestBody String data) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        paperScanTaskService.deletePaperScanTaskByIdList(idList.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList()), sysUser);
+        JSONObject object = JSON.parseObject(data, JSONObject.class);
+        paperScanTaskService.deletePaperScanTaskByIdList(JSON.parseArray(object.getString("ids"), Long.class), sysUser);
         return ResultUtil.ok();
     }
 

sql/paper-library-1.0.0.sql

@@ -395,6 +395,8 @@ INSERT INTO `sys_privilege` VALUES (32, '查询', 'Select', 'BUTTON', 9, 1, 'AUT
 INSERT INTO `sys_privilege` VALUES (33, '查询', 'Select', 'BUTTON', 20, 1, 'AUTH', '23,24,25,26', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (34, '根据扫描任务ID查询学生', '/api/admin/paper/library/page_student', 'URL', 20, 7, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (35, 'ocr识别', '/api/admin/paper/library/ocr', 'URL', 20, 8, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (36, '所有任务考生信息', 'AllData', 'BUTTON', 20, 3, 'AUTH', '37', 1, 0, 1);
+INSERT INTO `sys_privilege` VALUES (37, '所有任务考生信息', '/api/admin/paper/library/list_by_student_code', 'URL', 20, 9, 'AUTH', NULL, '1', '1', '1');
 INSERT INTO `sys_privilege` VALUES (49, '查询条件-档案管理员', '/api/admin/common/manager_user/query', 'URL', 149, 10, 'SYS', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (50, '查询条件-学期', '/api/admin/common/semester/query', 'URL', 149, 8, 'SYS', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (51, '查询条件-档案', '/api/admin/common/archives/query', 'URL', 149, 8, 'SYS', NULL, 1, 1, 1);
@@ -1025,6 +1027,7 @@ INSERT INTO `t_school_privilege` VALUES (1580099104851685399, 295137670185615360
 INSERT INTO `t_school_privilege` VALUES (1580099104851685400, 295137670185615360, 556);
 INSERT INTO `t_school_privilege` VALUES (1580487393517547546, 295137670185615360, 32);
 INSERT INTO `t_school_privilege` VALUES (1580487393584656405, 295137670185615360, 33);
+INSERT INTO `t_school_privilege` VALUES (1580487393584656406, 295137670185615360, 36);
 
 
 DROP TABLE IF EXISTS `sys_setting`;