学生复读调整

src/main/java/com/xjrsoft/module/student/controller/BaseStudentInfoController.java

@@ -86,7 +86,7 @@ public class BaseStudentInfoController {
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询详情信息")
-    @SaCheckPermission("room:detail")
+    @SaCheckPermission("basestudentpost:detail")
     @XjrLog(value = "根据id查询详情信息", saveResponseData = true)
     public RT<BaseStudentInfoDetailVo> info(@RequestParam Long id) {
         BaseStudentInfoDetailDto dto = new BaseStudentInfoDetailDto();
@@ -103,7 +103,7 @@ public class BaseStudentInfoController {
 
     @GetMapping(value = "/studentinfoByKeyWord")
     @ApiOperation(value = "根据姓名或者身份证号查询详情信息")
-    @SaCheckPermission("room:detail")
+    @SaCheckPermission("basestudentpost:detail")
     @XjrLog(value = "根据姓名或者身份证号查询详情信息")
     public RT<List<BaseStudentSompleInfoVo>> info(@Valid BaseStudentSimpleInfoDto dto) {
         dto.setArchivesStatus(ArchivesStatusEnum.FB2901.getCode());
@@ -111,9 +111,20 @@ public class BaseStudentInfoController {
         return RT.ok(infos);
     }
 
+    @GetMapping(value = "/studentinfoByKeyWordNotReading")
+    @ApiOperation(value = "根据姓名或者身份证号查询不在读学生详情信息")
+    @SaCheckPermission("basestudentpost:detail")
+    @XjrLog(value = "根据姓名或者身份证号查询不在读学生详情信息")
+    public RT<List<BaseStudentSompleInfoVo>> studentinfoByKeyWordNotReading(@Valid BaseStudentSimpleInfoDto dto) {
+        dto.setFindNewStudent(0);
+        dto.setIsNotReading(1);
+        List<BaseStudentSompleInfoVo> infos = baseStudentSchoolRollService.getInfosByParam(dto);
+        return RT.ok(infos);
+    }
+
     @GetMapping(value = "/getWhitelistInfo")
     @ApiOperation(value = "根据userId查询白名单信息（不传默认查询登录者）")
-    @SaCheckPermission("room:detail")
+    @SaCheckPermission("basestudentpost:detail")
     @XjrLog(value = "根据userId查询白名单信息（不传默认查询登录者）", saveResponseData = true)
     public RT<WhitelistInfoVo> getWhitelistInfo(Long userId) {
         if (userId == null) {

src/main/java/com/xjrsoft/module/student/dto/BaseStudentSimpleInfoDto.java

@@ -31,4 +31,8 @@ public class BaseStudentSimpleInfoDto {
 
     @JsonIgnore
     private Integer findNewStudent = 1;
+
+    @JsonIgnore
+    @ApiModelProperty("是否在读学生（1：是 0：否）")
+    private Integer isNotReading;
 }

src/main/resources/mapper/organization/UserMapper.xml

@@ -54,6 +54,9 @@
         <if test="dto.archivesStatus != null and dto.archivesStatus != ''">
             AND t3.archives_status = #{dto.archivesStatus}
         </if>
+        <if test="dto.isNotReading != null and dto.isNotReading == 1">
+            AND t3.archives_status != 'FB2901'
+        </if>
         <if test="dto.idNumberList != null">
             and t1.credential_number in
             <foreach item="idNumber" index="index" collection="dto.idNumberList" open="(" close=")"