:sparkles: 查询安检信息时按照机场顺序排序

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_security_check/mapper/AdminSecurityCheckMapper.java

@@ -2,9 +2,12 @@ package org.jeecg.modules.admin_security_check.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.admin_security_check.entity.AdminSecurityCheck;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.api.entity.SecurityCheckListTO;
 
 /**
  * @Description: 安检
@@ -14,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface AdminSecurityCheckMapper extends BaseMapper<AdminSecurityCheck> {
 
+    IPage<AdminSecurityCheck> pageList(Page<AdminSecurityCheck> page, SecurityCheckListTO securityCheckListTO);
 }

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_security_check/mapper/xml/AdminSecurityCheckMapper.xml

@@ -2,4 +2,33 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.admin_security_check.mapper.AdminSecurityCheckMapper">
 
+    <select id="pageList" parameterType="org.jeecg.modules.api.entity.SecurityCheckListTO"
+            resultType="org.jeecg.modules.admin_security_check.entity.AdminSecurityCheck">
+        select sc.id,
+        sc.order_num,
+        sc.aircraft_num,
+        sc.aircraft_position_num,
+        sc.drop_time,
+        sc.flight_num,
+        sc.type,
+        sc.create_by,
+        sc.create_time,
+        sc.update_by,
+        sc.update_time,
+        sc.flight_sole,
+        sc.flight_afid,
+        ap.sort
+        from admin_security_check sc
+        left join admin_aircraft_position ap on sc.aircraft_position_num = ap.aircraft_position_num
+        <where >
+            <if test="securityCheckListTO.searchContent != null and securityCheckListTO.searchContent != '' and securityCheckListTO.searchContent !='null'">
+                and (sc.aircraft_num like CONCAT('%',#{securityCheckListTO.searchContent},'%') or
+                sc.aircraft_position_num like CONCAT('%',#{securityCheckListTO.searchContent},'%'))
+            </if>
+            <if test="securityCheckListTO.type != null and securityCheckListTO.type != '' and securityCheckListTO.type !='null'">
+                and sc.type = #{securityCheckListTO.type,jdbcType=VARCHAR}
+            </if>
+        </where>
+        order by ap.sort asc
+    </select>
 </mapper>

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_security_check/service/IAdminSecurityCheckService.java

@@ -1,7 +1,11 @@
 package org.jeecg.modules.admin_security_check.service;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.admin_security_check.entity.AdminSecurityCheck;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.api.entity.SecurityCheckListTO;
 
 /**
  * @Description: 安检
@@ -10,5 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @Version: V1.0
  */
 public interface IAdminSecurityCheckService extends IService<AdminSecurityCheck> {
-
+    IPage<AdminSecurityCheck> pageList(Page<AdminSecurityCheck> page, SecurityCheckListTO securityCheckListTO);
 }

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_security_check/service/impl/AdminSecurityCheckServiceImpl.java

@@ -1,8 +1,12 @@
 package org.jeecg.modules.admin_security_check.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.admin_security_check.entity.AdminSecurityCheck;
 import org.jeecg.modules.admin_security_check.mapper.AdminSecurityCheckMapper;
 import org.jeecg.modules.admin_security_check.service.IAdminSecurityCheckService;
+import org.jeecg.modules.api.entity.SecurityCheckListTO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,4 +20,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class AdminSecurityCheckServiceImpl extends ServiceImpl<AdminSecurityCheckMapper, AdminSecurityCheck> implements IAdminSecurityCheckService {
 
+    @Autowired
+    AdminSecurityCheckMapper adminSecurityCheckMapper;
+    @Override
+    public IPage<AdminSecurityCheck> pageList(Page<AdminSecurityCheck> page, SecurityCheckListTO securityCheckListTO) {
+        return adminSecurityCheckMapper.pageList(page, securityCheckListTO);
+    }
 }

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller/APIController.java

@@ -1617,23 +1617,15 @@ public class APIController {
 //                baseCommonService.addLog( "用户校验失败，用户不存在！", CommonConstant.LOG_TYPE_1, null );
 //                return result;
 //            }
-            QueryWrapper<AdminSecurityCheck> queryWrapper = new QueryWrapper<>();
-            if (!securityCheckListTO.getSearchContent().equals("")) {
-                queryWrapper.like("aircraft_num", securityCheckListTO.getSearchContent()).or().like("aircraft_position_num",
-                        securityCheckListTO.getSearchContent());
-            }
-            if (!securityCheckListTO.getType().equals("")) {
-                queryWrapper.eq("type", securityCheckListTO.getType());
-            }
-            queryWrapper.orderByDesc("create_time");
             Page<AdminSecurityCheck> page = new Page<AdminSecurityCheck>(pageNo, pageSize);
-            IPage<AdminSecurityCheck> postRecordPage = adminSecurityCheckService.page(page, queryWrapper);
+            IPage<AdminSecurityCheck> postRecordPage = adminSecurityCheckService.pageList(page, securityCheckListTO);
 
             result.setMessage("获取安检列表成功");
             result.setResult(postRecordPage);
             result.setCode(200);
             return result;
         } catch (Exception e) {
+            e.printStackTrace();
             result.setMessage("获取安检列表失败");
             result.setResult(null);
             result.setCode(0);