添加判断是否绑定房间锁的接口，修改移动端换课流程申请页面接口

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

@@ -40,4 +40,8 @@ public interface HouseLockControllerAPI {
     CommonResult binding(@RequestBody BingingDto bingingDto);
 
 
+    @GetMapping("/ifBinging")
+    @ApiOperation(value = "判断房间是否绑定", notes = "判断房间是否绑定", httpMethod = "GET")
+    CommonResult ifBinging(String houseNumberId);
+
 }

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

@@ -2,9 +2,7 @@ package com.template.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.api.ApplicationProcedureControllerAPI;
 import com.template.model.dto.AppletApprovalProcessDto;
 import com.template.model.dto.ApplicationProcedureDto;
@@ -364,16 +362,13 @@ public class ApplicationProcedureController implements ApplicationProcedureContr
         AdminMenu byId = adminMenuService.getById(adminMenuId);
         Integer parentId = byId.getParentId();
 
-        IPage<ApplicationProcedure> pageList=null;
+        PageUtils<ApplicationProcedureVo> pageList=null;
         //审批一次，角色等级不为0
         if ("1".equals(approverType)) {
             if (parentId!=0) {
                 return CommonResult.ok("无审批权限");
             }else {
-                LambdaQueryWrapper<ApplicationProcedure> wrapper=new LambdaQueryWrapper<>();
-                wrapper.eq(ObjectUtils.isNotEmpty(status),ApplicationProcedure::getStatus,status)
-                        .between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedure::getSubmissionTime,startTime,endTime);
-                pageList=applicationProcedureService.page(new Page<>(page,size),wrapper);
+                pageList=applicationProcedureService.appletList(startTime,endTime,status,page,size);
                 return CommonResult.ok(pageList);
             }
 
@@ -381,27 +376,16 @@ public class ApplicationProcedureController implements ApplicationProcedureContr
 
         if (parentId==0) {
 
-            LambdaQueryWrapper<ApplicationProcedure> wrapper=new LambdaQueryWrapper<>();
 //            全部则是没有待审批的全部
             if (ObjectUtils.isEmpty(status)) {
-                ArrayList<String> strings = new ArrayList<>();
-                strings.add("0");
-                strings.add("2");
-                strings.add("3");
-                wrapper.in(ApplicationProcedure::getStatus,strings);
-            }else {
-                wrapper.eq(ApplicationProcedure::getStatus,status);
+                status="0,2,3";
             }
-
-            wrapper.between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedure::getSubmissionTime,startTime,endTime);
-            pageList=applicationProcedureService.page(new Page<>(page,size),wrapper);
+            pageList=applicationProcedureService.appletParentList(startTime,endTime,status,page,size);
             return CommonResult.ok(pageList);
 
         }
-        LambdaQueryWrapper<ApplicationProcedure> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(ObjectUtils.isNotEmpty(status),ApplicationProcedure::getStatus,status)
-                .between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedure::getSubmissionTime,startTime,endTime);
-        pageList=applicationProcedureService.page(new Page<>(page,size),wrapper);
+
+
         return CommonResult.ok(pageList);
 
     }

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

@@ -341,6 +341,24 @@ public class HouseLockController implements HouseLockControllerAPI {
         return CommonResult.fail();
     }
 
+    @Override
+    public CommonResult ifBinging(String houseNumberId) {
+        LambdaQueryWrapper<HouseLock> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(HouseLock::getHouseNumberId,houseNumberId);
+        HouseLock houseLock = houseLockService.getOne(wrapper);
+        Integer status =0;
+        if (ObjectUtils.isNotEmpty(houseLock)) {
+            String equipmentType = houseLock.getEquipmentType();
+            if (ObjectUtils.isNotEmpty(equipmentType)) {
+                status=1;
+            }
+        }
+        HashMap<Object, Object> map = new HashMap<>();
+        map.put("binging",status);
+
+        return CommonResult.ok(map);
+    }
+
 
 }
 

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

@@ -20,12 +20,17 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface ApplicationProcedureMapper extends BaseMapper<ApplicationProcedure> {
 
-    IPage<ApplicationProcedureVo> pageList(Page<ApplicationProcedureVo> pageVo, @Param("submissionStartTime") String submissionStartTime,@Param("submissionEndTime") String submissionEndTime,@Param("examineAndApproveStartTime") String examineAndApproveStartTime,@Param("examineAndApproveEndTime") String examineAndApproveEndTime,@Param("type") String type,@Param("department") String department,@Param("key") String key);
+    IPage<ApplicationProcedureVo> pageList(Page<ApplicationProcedureVo> pageVo, @Param("submissionStartTime") String submissionStartTime, @Param("submissionEndTime") String submissionEndTime, @Param("examineAndApproveStartTime") String examineAndApproveStartTime, @Param("examineAndApproveEndTime") String examineAndApproveEndTime, @Param("type") String type, @Param("department") String department, @Param("key") String key);
 
 
-    IPage<ApplicationProcedureVo> parentPageList(Page<ApplicationProcedureVo> pageVo, @Param("submissionStartTime") String submissionStartTime,@Param("submissionEndTime") String submissionEndTime,@Param("examineAndApproveStartTime") String examineAndApproveStartTime,@Param("examineAndApproveEndTime") String examineAndApproveEndTime,@Param("type") String type,@Param("department") String department,@Param("key") String key);
+    IPage<ApplicationProcedureVo> parentPageList(Page<ApplicationProcedureVo> pageVo, @Param("submissionStartTime") String submissionStartTime, @Param("submissionEndTime") String submissionEndTime, @Param("examineAndApproveStartTime") String examineAndApproveStartTime, @Param("examineAndApproveEndTime") String examineAndApproveEndTime, @Param("type") String type, @Param("department") String department, @Param("key") String key);
 
-    Page<ApplicationProcedureRecordVo> appletRecordPage(Page<ApplicationProcedureRecordVo> recordVoPage,@Param("userId") Integer userId,@Param("startTime")  String startTime,@Param("endTime")  String endTime,@Param("status")  String status);
+    Page<ApplicationProcedureRecordVo> appletRecordPage(Page<ApplicationProcedureRecordVo> recordVoPage, @Param("userId") Integer userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("status") String status);
 
     ApplicationProcedureVo appletDetail(@Param("id") Integer id);
+
+    Page<ApplicationProcedureVo> appletList(Page<ApplicationProcedureVo> voPage, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("status") String status);
+
+    Page<ApplicationProcedureVo> appletParentList(Page<ApplicationProcedureVo> voPage, @Param("startTime")String startTime, @Param("endTime") String endTime, @Param("status") String status);
+
 }

src/main/java/com/template/model/vo/houseLockListVo.java

@@ -1,5 +1,6 @@
 package com.template.model.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
@@ -8,6 +9,25 @@ public class houseLockListVo {
     private String houseId;
     private String houseNumberId;
     private String roomNumber;
+
+    @ApiModelProperty(value = "设备型号")
     private String equipmentType;
 
+    @ApiModelProperty(value = "网络类型 固定WiFi")
+    private String networkType;
+
+    @ApiModelProperty(value = "wifiMAC")
+    private String wifiMac;
+
+    @ApiModelProperty(value = "绑定时间")
+    private String bindingTime;
+
+    @ApiModelProperty(value = "电量")
+    private String electricQuantity;
+
+    @ApiModelProperty(value = "网络状态  设备在线时网络也在线 (0，离线；1，在线)")
+    private String networkState;
+
+    @ApiModelProperty(value = "设备状态  设备在线时网络也在线 (0，离线；1，在线)")
+    private String equipmentState;
 }

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

@@ -24,4 +24,8 @@ public interface ApplicationProcedureService extends IService<ApplicationProcedu
     PageUtils<ApplicationProcedureRecordVo> appletRecordPage( Integer userId, String startTime, String endTime, String status, int page, int size);
 
     ApplicationProcedureVo appletDetail(Integer id);
+
+    PageUtils<ApplicationProcedureVo> appletList(String startTime, String endTime, String status, int page, int size);
+
+    PageUtils<ApplicationProcedureVo> appletParentList(String startTime, String endTime, String status, int page, int size);
 }

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

@@ -53,5 +53,19 @@ public class ApplicationProcedureServiceImpl extends ServiceImpl<ApplicationProc
         return applicationProcedureMapper.appletDetail(id);
     }
 
+    @Override
+    public PageUtils<ApplicationProcedureVo> appletList(String startTime, String endTime, String status, int page, int size) {
+        Page<ApplicationProcedureVo> voPage = new Page<>(page, size);
+        Page<ApplicationProcedureVo> result= applicationProcedureMapper.appletList(voPage,startTime,endTime,status);
+        return new PageUtils(result);
+    }
+
+    @Override
+    public PageUtils<ApplicationProcedureVo> appletParentList(String startTime, String endTime, String status, int page, int size) {
+        Page<ApplicationProcedureVo> voPage = new Page<>(page, size);
+        Page<ApplicationProcedureVo> result= applicationProcedureMapper.appletParentList(voPage,startTime,endTime,status);
+        return new PageUtils(result);
+    }
+
 
 }

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

@@ -215,4 +215,76 @@
             ap.deleted=0
             and ap.id=#{id}
     </select>
+
+    <select id="appletList" resultType="com.template.model.vo.ApplicationProcedureVo">
+        SELECT
+            ap.id,
+            ap.users_id as usersId,
+            ap.start_time as startTime,
+            ap.end_time as endTime,
+            ap.department,
+            ap.change_users_id as changeUsersId,
+            ap.reason_application as reasonApplication,
+            ap.submission_time as submissionTime,
+            ap.status,
+            ap.approver_id as approverId,
+            ap.examine_and_approve_time as examineAndApproveTime,
+            ap.examine_and_approve_remark as examineAndApproveRemark,
+            ap.secondary_approver_id as secondaryApproverId,
+            ap.secondary_examine_and_approve_time as secondaryExamineAndApproveTime,
+            ap.secondary_examine_and_approve_remark as secondaryExamineAndApproveRemark,
+            u.user_name as changeUsersName,
+            a.name as approverName,
+            a2.name as secondaryApproverName
+        FROM
+            `application_procedure` ap
+                LEFT JOIN users u on u.id=ap.change_users_id
+                LEFT JOIN admin a on a.id=ap.approver_id
+                LEFT JOIN admin a2 on a2.id=ap.secondary_approver_id
+        where
+            ap.deleted=0
+        <if test="startTime != null and startTime != ''  and  endTime != null and startTime != '' ">
+            AND ap.submission_time>=#{startTime} and #{endTime}>=ap.submission_time
+        </if>
+        <if test="status != null and status != ''">
+            AND ap.`status`=#{status}
+        </if>
+        ORDER BY ap.submission_time DESC
+    </select>
+
+    <select id="appletParentList" resultType="com.template.model.vo.ApplicationProcedureVo">
+        SELECT
+        ap.id,
+        ap.users_id as usersId,
+        ap.start_time as startTime,
+        ap.end_time as endTime,
+        ap.department,
+        ap.change_users_id as changeUsersId,
+        ap.reason_application as reasonApplication,
+        ap.submission_time as submissionTime,
+        ap.status,
+        ap.approver_id as approverId,
+        ap.examine_and_approve_time as examineAndApproveTime,
+        ap.examine_and_approve_remark as examineAndApproveRemark,
+        ap.secondary_approver_id as secondaryApproverId,
+        ap.secondary_examine_and_approve_time as secondaryExamineAndApproveTime,
+        ap.secondary_examine_and_approve_remark as secondaryExamineAndApproveRemark,
+        u.user_name as changeUsersName,
+        a.name as approverName,
+        a2.name as secondaryApproverName
+        FROM
+        `application_procedure` ap
+        LEFT JOIN users u on u.id=ap.change_users_id
+        LEFT JOIN admin a on a.id=ap.approver_id
+        LEFT JOIN admin a2 on a2.id=ap.secondary_approver_id
+        where
+        ap.deleted=0
+        <if test="startTime != null and startTime != ''  and  endTime != null and startTime != '' ">
+            AND ap.submission_time>=#{startTime} and #{endTime}>=ap.submission_time
+        </if>
+        <if test="status != null and status != ''">
+            AND FIND_IN_SET(ap.status,#{type})
+        </if>
+        ORDER BY ap.submission_time DESC
+    </select>
 </mapper>

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

@@ -90,7 +90,13 @@
         hn.house_id AS houseId,
         hn.id AS houseNumberId,
         hn.room_number AS roomNumber,
-        hl.equipment_type AS equipmentType
+        hl.equipment_type AS equipmentType,
+        hl.network_type as networkType,
+        hl.wifi_mac as wifiMac,
+        hl.binding_time as bindingTime,
+        hl.electric_quantity as electricQuantity,
+        hl.network_state as networkState,
+        hl.equipment_state as equipmentState
         FROM
         `house_number` hn
         LEFT JOIN house_lock hl ON hl.house_number_id = hn.id and hl.deleted=0