代码更新

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

@@ -82,10 +82,10 @@ public interface SmartAttendanceControllerAPI {
      */
     @GetMapping(value = "/askForLeavePage")
     @ApiOperation(value = "请假管理", notes = "请假管理", httpMethod = "GET")
-    CommonResult askForLeavePage(@RequestParam int currentPage, @RequestParam int pageCount,String name,String cardNo,String startTime,String endTime,Integer ifVerification,String classId);
+    CommonResult askForLeavePage(@RequestParam int currentPage, @RequestParam int pageCount,String name,String cardNo,String startTime,String endTime,String ifVerification,String classId);
 
     @GetMapping(value = "/queryPage")
     @ApiOperation(value = "学生考勤纪律", notes = "学生考勤纪律", httpMethod = "GET")
-    CommonResult queryPage(@RequestParam int currentPage, @RequestParam int pageCount,Integer gradeId,Integer classId,Integer status,String studentNo ,String name,String startTime,String endTime);
+    CommonResult queryPage(@RequestParam int currentPage, @RequestParam int pageCount,Integer gradeId,Integer classId,String status,String studentNo ,String name,String startTime,String endTime);
 
 }

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

@@ -363,7 +363,7 @@ public class SmartAttendanceController implements SmartAttendanceControllerAPI {
 
     @Override
     @DESRespondSecret(validated = true)
-    public CommonResult askForLeavePage(int currentPage, int pageCount, String name, String cardNo, String startTime, String endTime,Integer ifVerification,String classId) {
+    public CommonResult askForLeavePage(int currentPage, int pageCount, String name, String cardNo, String startTime, String endTime,String ifVerification,String classId) {
         PageUtils<AskForLeaveVo> result=smartAttendanceService.askForLeavePage(currentPage,pageCount,name,cardNo,startTime,endTime,ifVerification,classId);
         return CommonResult.ok(result);
 
@@ -371,7 +371,7 @@ public class SmartAttendanceController implements SmartAttendanceControllerAPI {
 
     @Override
     @DESRespondSecret(validated = true)
-    public CommonResult queryPage(int currentPage, int pageCount, Integer gradeId, Integer classId, Integer status, String studentNo, String name, String startTime, String endTime) {
+    public CommonResult queryPage(int currentPage, int pageCount, Integer gradeId, Integer classId, String status, String studentNo, String name, String startTime, String endTime) {
         PageUtils<SmartAttendanceVo> result= smartAttendanceService.queryPage(currentPage,pageCount,gradeId,classId,status,studentNo,name,startTime,endTime);
         return CommonResult.ok(result);
     }

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

@@ -24,7 +24,7 @@ public interface SmartAttendanceMapper extends BaseMapper<SmartAttendance> {
 
     List<Integer> getGroup();
 
-    IPage<AskForLeaveVo> askForLeavePage(Page<AskForLeaveVo> page, @Param("name") String name,@Param("cardNo") String cardNo,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("ifVerification")Integer ifVerification,@Param("classId")String classId);
+    IPage<AskForLeaveVo> askForLeavePage(Page<AskForLeaveVo> page, @Param("name") String name,@Param("cardNo") String cardNo,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("ifVerification")String ifVerification,@Param("classId")String classId);
 
-    IPage<SmartAttendanceVo> queryPage(Page<SmartAttendanceVo> page,@Param("gradeId") Integer gradeId,@Param("classId") Integer classId,@Param("status") Integer status,@Param("studentNo") String studentNo,@Param("name") String name,@Param("startTime") String startTime,@Param("endTime") String endTime);
+    IPage<SmartAttendanceVo> queryPage(Page<SmartAttendanceVo> page,@Param("gradeId") Integer gradeId,@Param("classId") Integer classId,@Param("status") String status,@Param("studentNo") String studentNo,@Param("name") String name,@Param("startTime") String startTime,@Param("endTime") String endTime);
 }

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

@@ -33,9 +33,9 @@ public interface SmartAttendanceService extends IService<SmartAttendance> {
 
     List<SmartAttendance> track(String startTime, String endTime, int userId);
 
-    PageUtils<AskForLeaveVo> askForLeavePage(int currentPage, int pageCount,String name, String cardNo, String startTime, String endTime,Integer ifVerification,String classId);
+    PageUtils<AskForLeaveVo> askForLeavePage(int currentPage, int pageCount,String name, String cardNo, String startTime, String endTime,String ifVerification,String classId);
 
-    PageUtils<SmartAttendanceVo> queryPage(int currentPage, int pageCount, Integer gradeId, Integer classId, Integer status, String studentNo, String name, String startTime, String endTime);
+    PageUtils<SmartAttendanceVo> queryPage(int currentPage, int pageCount, Integer gradeId, Integer classId, String status, String studentNo, String name, String startTime, String endTime);
 
     List<SmartAttendance> duplicatesList(Date startTime, Date endTime, Date initiateTime);
 }

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

@@ -102,14 +102,14 @@ public class SmartAttendanceServiceImpl extends ServiceImpl<SmartAttendanceMappe
     }
 
     @Override
-    public PageUtils<AskForLeaveVo> askForLeavePage(int currentPage, int pageCount,String name, String cardNo, String startTime, String endTime,Integer ifVerification,String classId) {
+    public PageUtils<AskForLeaveVo> askForLeavePage(int currentPage, int pageCount,String name, String cardNo, String startTime, String endTime,String ifVerification,String classId) {
         Page<AskForLeaveVo> page = new Page<>(currentPage,pageCount);
         IPage<AskForLeaveVo> datas = smartAttendanceMapper.askForLeavePage(page, name,cardNo,startTime,endTime,ifVerification,classId);
         return new PageUtils(datas);
     }
 
     @Override
-    public PageUtils<SmartAttendanceVo> queryPage(int currentPage, int pageCount, Integer gradeId, Integer classId, Integer status, String studentNo, String name, String startTime, String endTime) {
+    public PageUtils<SmartAttendanceVo> queryPage(int currentPage, int pageCount, Integer gradeId, Integer classId, String status, String studentNo, String name, String startTime, String endTime) {
         Page<SmartAttendanceVo> page = new Page<>(currentPage,pageCount);
         IPage<SmartAttendanceVo> datas = smartAttendanceMapper.queryPage(page,gradeId,classId,status,studentNo,name,startTime,endTime);
         return new PageUtils(datas);

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

@@ -3,29 +3,26 @@
 <mapper namespace="com.template.mapper.SmartAttendanceMapper">
 
     <select id="getGroup" resultType="java.lang.Integer">
-        SELECT
-            `status`
-        FROM
-            `smart_attendance`
-        GROUP BY
-            `status`
+        SELECT `status`
+        FROM `smart_attendance`
+        GROUP BY `status`
     </select>
 
     <select id="askForLeavePage" resultType="com.template.model.vo.AskForLeaveVo">
         SELECT
-            sa.id,
-            su.head_image as image,
-            sa.xw_user_name,
-            sc.name as className,
-            su.card_no,
-            sa.start_time,
-            sa.end_time,
-            sa.reason,
-            sa.if_verification,
-            sa.initiate_time
+        sa.id,
+        su.head_image as image,
+        sa.xw_user_name as xwUserName,
+        sc.name as className,
+        su.card_no as cardNo,
+        sa.start_time as startTime,
+        sa.end_time as endTime,
+        sa.reason,
+        sa.if_verification as ifVerification,
+        sa.initiate_time as initiateTime
         FROM
-            `smart_attendance` sa
-                LEFT JOIN smart_user su ON su.id = sa.user_id
+        `smart_attendance` sa
+        LEFT JOIN smart_user su ON su.id = sa.user_id
         LEFT JOIN smart_class sc ON sc.id = sa.class_id
         WHERE
         sa.`status` = 6
@@ -50,20 +47,20 @@
 
     <select id="queryPage" resultType="com.template.model.vo.SmartAttendanceVo">
         SELECT
-            sa.id,
-            sa.xw_user_name as name,
-            sc.`name` as className,
-            sg.`name` as gradeName,
-            su.card_no as cardNo,
-            su.head_image as headImage,
-            sa.attend_time as attendTime,
-            sa.initiate_time as initiateTime,
-            sa.`status`
+        sa.id,
+        sa.xw_user_name as name,
+        sc.`name` as className,
+        sg.`name` as gradeName,
+        su.card_no as cardNo,
+        su.head_image as headImage,
+        sa.attend_time as attendTime,
+        sa.initiate_time as initiateTime,
+        sa.`status`
         FROM
-            `smart_attendance` sa
-                LEFT JOIN smart_class sc on sa.class_id=sc.id
-                LEFT JOIN smart_grade sg on sc.grade_id=sg.id
-                LEFT JOIN smart_user su on sa.user_id=su.id
+        `smart_attendance` sa
+        LEFT JOIN smart_class sc on sa.class_id=sc.id
+        LEFT JOIN smart_grade sg on sc.grade_id=sg.id
+        LEFT JOIN smart_user su on sa.user_id=su.id
         where sa.deleted = 0
         <if test="gradeId != null and gradeId != ''">
             and sc.grade_id=#{gradeId}