Merge branch 'master' of https://e.coding.net/chuanghaikeji/smartCampus/backend_code

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

@@ -20,4 +20,9 @@ public interface SmartAccessControllerAPI {
     void getPageExport(HttpServletResponse response, String keyWord, Integer gradeId, Integer classId, Integer departmentId, String openType,String resultStatus, String startTime, String endTime);
 
 
+    @GetMapping("/getAccessPage")
+    @ApiOperation(value = "门禁通行汇总", notes = "门禁通行汇总", httpMethod = "GET")
+    CommonResult getAccessPage(@RequestParam Integer currentPage, @RequestParam Integer pageCount,String keyWord,Integer gradeId,Integer classId,String resultStatus,String inOut,String startTime,String endTime);
+
+
 }

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

@@ -13,7 +13,7 @@ public interface SmartVisitorParentsConfigControllerAPI {
 
     @GetMapping(value = "/getClassId")
     @ApiOperation(value = "获取班级所对应的配置", notes = "获取班级所对应的配置", httpMethod = "GET")
-    CommonResult getClassId(@RequestParam Integer page,@RequestParam Integer size, @RequestParam Integer classId,@RequestParam Integer gradeId);
+    CommonResult getClassId(@RequestParam Integer page,@RequestParam Integer size, Integer classId,Integer gradeId);
 
     @PostMapping(value = "/update")
     @ApiOperation(value = "家长访客配置修改", notes = "家长访客配置修改", httpMethod = "POST")

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

@@ -130,5 +130,12 @@ public class SmartAccessController implements SmartAccessControllerAPI {
 
 
     }
+
+    @Override
+    @DESRespondSecret(validated = true)
+    public CommonResult getAccessPage(Integer currentPage, Integer pageCount, String keyWord, Integer gradeId, Integer classId, String resultStatus, String inOut, String startTime, String endTime) {
+        PageUtils<SmartAccessVo> pageUtils=smartAccessService.getAccessPage(currentPage,pageCount,keyWord,gradeId,classId,resultStatus,inOut,startTime,endTime);
+        return CommonResult.ok(pageUtils);
+    }
 }
 

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

@@ -26,4 +26,10 @@ public interface SmartAccessMapper extends BaseMapper<SmartAccess> {
 
     List<SmartAccessVo> getPageExport(@Param("keyWord") String keyWord, @Param("gradeId") Integer gradeId, @Param("classId") Integer classId, @Param("departmentId") Integer departmentId, @Param("openType") String openType, @Param("resultStatus") String resultStatus, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
+    IPage<SmartAccessVo> getAccessPage(Page<SmartAccessVo> page,@Param("keyWord") String keyWord,@Param("gradeId") Integer gradeId, @Param("classId") Integer classId,@Param("resultStatus") String resultStatus,@Param("inOut") String inOut,@Param("startTime") String startTime,@Param("endTime") String endTime);
+
+
+
+
+
 }

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

@@ -24,4 +24,5 @@ public interface SmartAccessService extends IService<SmartAccess> {
 
     List<SmartAccessVo> getPageExport(String keyWord, Integer gradeId, Integer classId, Integer departmentId,String openType,String resultStatus, String startTime, String endTime);
 
+    PageUtils<SmartAccessVo> getAccessPage(Integer currentPage, Integer pageCount, String keyWord, Integer gradeId, Integer classId, String resultStatus, String inOut, String startTime, String endTime);
 }

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

@@ -54,4 +54,13 @@ public class SmartAccessServiceImpl extends ServiceImpl<SmartAccessMapper, Smart
         List<SmartAccessVo> vos = smartAccessMapper.getPageExport(keyWord,gradeId,classId,departmentId,openType,resultStatus,startTime,endTime);
         return vos;
     }
+
+    @Override
+    public PageUtils<SmartAccessVo> getAccessPage(Integer currentPage, Integer pageCount, String keyWord, Integer gradeId, Integer classId, String resultStatus, String inOut, String startTime, String endTime) {
+        Page<SmartAccessVo> page = new Page<>();
+        page.setCurrent(currentPage);
+        page.setSize(pageCount);
+        IPage<SmartAccessVo> datas = smartAccessMapper.getAccessPage(page,keyWord,gradeId,classId,resultStatus,inOut,startTime,endTime);
+        return new PageUtils(datas);
+    }
 }

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

@@ -92,4 +92,48 @@
         </if>
         ORDER BY sa.date_time DESC
     </select>
+
+    <select id="getAccessPage" resultType="com.template.model.vo.SmartAccessVo">
+        SELECT
+        sa.id,
+        sa.name,
+        sa.sn,
+        sa.type,
+        sd.`name` as departmentName,
+        sc.`name` as className,
+        su.card_no as cardNo,
+        sa.image,
+        sa.open_type as openType,
+        sa.date_time as dateTime,
+        sa.in_out as access,
+        sa.result_status as resultStatus
+        FROM
+        `smart_access` sa
+        LEFT JOIN smart_user su on sa.user_id=su.id
+        LEFT JOIN smart_department sd on su.department_id=sd.id
+        LEFT JOIN smart_class sc on su.school_class=sc.id
+        LEFT JOIN smart_grade sg on sc.grade_id=sg.id
+        WHERE sa.deleted = 0
+        <if test="keyWord != null and keyWord != ''">
+            and (sa.name like '%' #{keyWord} '%' or su.card_no like '%' #{keyWord} '%')
+        </if>
+        <if test="gradeId != null and gradeId != ''">
+            and sc.grade_id= #{gradeId}
+        </if>
+        <if test="classId != null and classId != ''">
+            and su.school_class= #{classId}
+        </if>
+        <if test="resultStatus != null and  resultStatus != ''">
+            and sa.result_status= #{resultStatus}
+        </if>
+        <if test="inOut != null and  inOut != ''">
+            and sa.in_out= #{inOut}
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and sa.date_time &gt;= #{startTime} and sa.date_time &lt;= #{endTime}
+        </if>
+
+        ORDER BY sa.date_time DESC
+
+    </select>
 </mapper>