修改分页查询

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsLockCabinet.java

@@ -1,5 +1,6 @@
 package com.ktg.iscs.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModelProperty;
@@ -63,5 +64,8 @@ public class IsLockCabinet extends BaseBean
     @Excel(name = "状态")
     private String status;
 
+    @ApiModelProperty(value = "序列号")
+    @TableField(exist = false)
+    private String serialNumber;
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/mapper/IsLockCabinetMapper.java

@@ -1,10 +1,10 @@
 package com.ktg.iscs.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.mapper.BaseMapperX;
 import com.ktg.iscs.domain.IsLockCabinet;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 锁控机柜Mapper接口
@@ -15,4 +15,6 @@ import com.ktg.iscs.domain.IsLockCabinet;
 @Mapper
 public interface IsLockCabinetMapper extends BaseMapperX<IsLockCabinet> {
 
+    Page<IsLockCabinet> getIsLockCabinetPage(Page<IsLockCabinet> page, @Param(value = "isLockCabinet") IsLockCabinet isLockCabinet);
+
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsLockCabinetServiceImpl.java

@@ -33,14 +33,15 @@ public class IsLockCabinetServiceImpl extends ServiceImpl<IsLockCabinetMapper, I
 
     @Override
     public Page<IsLockCabinet> getIsLockCabinetPage(Page<IsLockCabinet> page, IsLockCabinet isLockCabinet) {
-        Page<IsLockCabinet> result = page(page, Wrappers.<IsLockCabinet>lambdaQuery()
+        /*Page<IsLockCabinet> result = page(page, Wrappers.<IsLockCabinet>lambdaQuery()
                 .like(StringUtils.isNotBlank(isLockCabinet.getCabinetCode()), IsLockCabinet::getCabinetCode, isLockCabinet.getCabinetCode())
                 .like(StringUtils.isNotBlank(isLockCabinet.getCabinetName()), IsLockCabinet::getCabinetName, isLockCabinet.getCabinetName())
                 .eq(StringUtils.isNotBlank(isLockCabinet.getIsOnline()), IsLockCabinet::getIsOnline, isLockCabinet.getIsOnline())
                 .eq(isLockCabinet.getWorkareId() != null, IsLockCabinet::getWorkareId, isLockCabinet.getWorkareId())
                 .eq(isLockCabinet.getWorkstationId() != null, IsLockCabinet::getWorkstationId, isLockCabinet.getWorkstationId())
                 .eq(StringUtils.isNotBlank(isLockCabinet.getStatus()), IsLockCabinet::getStatus, isLockCabinet.getStatus())
-                .orderByDesc(IsLockCabinet::getCabinetId));
+                .orderByDesc(IsLockCabinet::getCabinetId));*/
+        Page<IsLockCabinet> result = isLockCabinetMapper.getIsLockCabinetPage(page, isLockCabinet);
         return result;
     }
 

ktg-iscs/src/main/resources/mapper/IsLockCabinetMapper.xml

@@ -4,4 +4,24 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ktg.iscs.mapper.IsLockCabinetMapper">
 
+    <select id="getIsLockCabinetPage" resultType="com.ktg.iscs.domain.IsLockCabinet">
+        SELECT
+            c.*,
+            h.serial_number
+        FROM
+            is_lock_cabinet c
+                LEFT JOIN is_hardware h ON h.id = c.hardware_id
+        <where>
+            <if test="isLockCabinet.cabinetName != null and isLockCabinet.cabinetName != ''">
+                AND c.cabinet_name like concat('%', #{isLockCabinet.cabinetName}, '%')
+            </if>
+            <if test="isLockCabinet.isOnline != null and isLockCabinet.isOnline != ''">
+                AND c.is_online = #{isLockCabinet.isOnline}
+            </if>
+            <if test="isLockCabinet.status != null and isLockCabinet.status != ''">
+                AND c.status = #{isLockCabinet.status}
+            </if>
+        </where>
+            ORDER BY c.cabinet_id DESC
+    </select>
 </mapper>