Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/backend_dormitory

src/main/java/com/template/api/WelcomeStudentControllerAPI.java

@@ -30,7 +30,7 @@ public interface WelcomeStudentControllerAPI {
 
     @GetMapping(value = "/queryPageStudents")
     @ApiOperation(value = "学生信息分页数据", notes = "学生信息分页数据", httpMethod = "GET")
-    CommonResult queryPageStudents(@RequestAttribute String userId,@RequestParam int currentPage, @RequestParam int pageCount, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name);
+    CommonResult queryPageStudents(@RequestAttribute String userId,@RequestParam int currentPage, @RequestParam int pageCount, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus);
 
     @GetMapping(value = "/queryStudentDetail")
     @ApiOperation(value = "学生信息明细数据", notes = "学生信息明细数据", httpMethod = "GET")
@@ -54,7 +54,7 @@ public interface WelcomeStudentControllerAPI {
 
     @GetMapping(value = "welcomeStudentExport")
     @ApiOperation(value = "导出学生信息数据", notes = "导出学生信息数据", httpMethod = "GET")
-    void welcomeStudentExport(@RequestAttribute String userId,HttpServletResponse response, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name);
+    void welcomeStudentExport(@RequestAttribute String userId,HttpServletResponse response, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus);
 
 
     @GetMapping(value = "/studentOverview")

src/main/java/com/template/controller/WelcomeStudentController.java

@@ -482,7 +482,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     }
 
     @Override
-    public CommonResult queryPageStudents(String userId, int currentPage, int pageCount, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name) {
+    public CommonResult queryPageStudents(String userId, int currentPage, int pageCount, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus) {
         IPage<StudentPageVo> pages = new Page<>();
         PageUtils<StudentPageVo> result = new PageUtils<>(pages);
         WelcomeAccount wa = welcomeAccountService.getManageById(userId);
@@ -500,7 +500,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                 collegeIds.add(String.valueOf(collegeId));
             }
         }
-        result = welcomeStudentService.queryStudentPageList(currentPage, pageCount, collegeIds, majorId, classstrId, trafficMethod, name);
+        result = welcomeStudentService.queryStudentPageList(currentPage, pageCount, collegeIds, majorId, classstrId, trafficMethod, name,fillStatus);
         return CommonResult.ok(result);
     }
 
@@ -1515,7 +1515,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     }
 
     @Override
-    public void welcomeStudentExport(String userId, HttpServletResponse response, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name) {
+    public void welcomeStudentExport(String userId, HttpServletResponse response, Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus) {
         Workbook workbook = new XSSFWorkbook();
         Sheet sheet = workbook.createSheet("学生信息");
         WelcomeAccount wa = welcomeAccountService.getManageById(userId);
@@ -1534,7 +1534,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
             }
         }
 
-        List<StudentPageVo> result = welcomeStudentService.queryStudentList(collegeIds, majorId, classstrId, trafficMethod, name);
+        List<StudentPageVo> result = welcomeStudentService.queryStudentList(collegeIds, majorId, classstrId, trafficMethod, name,fillStatus);
         //导出
 
         Row headerRow = sheet.createRow(0);

src/main/java/com/template/mapper/WelcomeStudentMapper.java

@@ -19,9 +19,9 @@ import java.util.List;
  */
 @Repository
 public interface WelcomeStudentMapper extends BaseMapper<WelcomeStudent> {
-    IPage<StudentPageVo> queryStudentPageList(IPage<StudentPageVo> page, @Param("collegeIds") List<String> collegeIds,@Param("majorId") Integer majorId,@Param("classstrId") Integer classstrId,@Param("trafficMethod") String trafficMethod ,@Param("name") String name);
+    IPage<StudentPageVo> queryStudentPageList(IPage<StudentPageVo> page, @Param("collegeIds") List<String> collegeIds,@Param("majorId") Integer majorId,@Param("classstrId") Integer classstrId,@Param("trafficMethod") String trafficMethod ,@Param("name") String name,@Param("fillStatus") String fillStatus);
 
-    List<StudentPageVo> queryStudentPageList(@Param("collegeIds") List<String> collegeIds, @Param("majorId") Integer majorId, @Param("classstrId") Integer classstrId, @Param("trafficMethod") String trafficMethod , @Param("name") String name);
+    List<StudentPageVo> queryStudentPageList(@Param("collegeIds") List<String> collegeIds, @Param("majorId") Integer majorId, @Param("classstrId") Integer classstrId, @Param("trafficMethod") String trafficMethod , @Param("name") String name,@Param("fillStatus") String fillStatus);
 
     List<StudentRegisterVo> studentRegister();
 

src/main/java/com/template/services/WelcomeStudentService.java

@@ -31,13 +31,13 @@ public interface WelcomeStudentService extends IService<WelcomeStudent> {
 
     WelcomeStudent getDataByIdcard(String cardId);
 
-    PageUtils<StudentPageVo> queryStudentPageList(int currentPage, int pageCount, List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name);
+    PageUtils<StudentPageVo> queryStudentPageList(int currentPage, int pageCount, List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus);
 
     WelcomeStudent getDataByIdcardOrNum(String admissNum, String cardId);
 
     List<WelcomeStudent> queryStudentByCardId(List<String> cardIds);
 
-    List<StudentPageVo> queryStudentList(List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name);
+    List<StudentPageVo> queryStudentList(List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus);
 
     WelcomeStudent queryStudentInfo(Integer collegeId, Integer majorId, Integer classstrId,String admissNum);
 

src/main/java/com/template/services/impl/WelcomeStudentServiceImpl.java

@@ -79,18 +79,18 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     }
 
     @Override
-    public PageUtils<StudentPageVo> queryStudentPageList(int currentPage, int pageCount, List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name) {
+    public PageUtils<StudentPageVo> queryStudentPageList(int currentPage, int pageCount, List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus) {
         Page<StudentPageVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
-        IPage<StudentPageVo> result = welcomeStudentMapper.queryStudentPageList(page, collegeIds, majorId, classstrId, trafficMethod, name);
+        IPage<StudentPageVo> result = welcomeStudentMapper.queryStudentPageList(page, collegeIds, majorId, classstrId, trafficMethod, name,fillStatus);
         return new PageUtils(result);
     }
 
     @Override
-    public List<StudentPageVo> queryStudentList( List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name) {
+    public List<StudentPageVo> queryStudentList( List<String> collegeIds, Integer majorId, Integer classstrId, String trafficMethod, String name,String fillStatus) {
 
-        List<StudentPageVo> result = welcomeStudentMapper.queryStudentPageList(collegeIds, majorId, classstrId, trafficMethod, name);
+        List<StudentPageVo> result = welcomeStudentMapper.queryStudentPageList(collegeIds, majorId, classstrId, trafficMethod, name,fillStatus);
         return result;
     }
 

src/main/resources/mapper/template/WelcomeStudentMapper.xml

@@ -45,6 +45,9 @@
         <if test="name != null and name != ''">
             and ws.name like '%' #{name} '%'
         </if>
+        <if test="fillStatus != null and fillStatus != ''">
+            and ws.fill_status = #{fillStatus}
+        </if>
         and ws.iden_type != 2
         order by ws.update_time desc
     </select>