:white_check_mark: 修改分页可选每页数量，增加查询未测试廊桥飞机的功能

airport-vue/src/mixins/JeecgListMixin.js

@@ -20,7 +20,7 @@ export const JeecgListMixin = {
       ipagination:{
         current: 1,
         pageSize: 10,
-        pageSizeOptions: ['10', '20', '30'],
+        pageSizeOptions: ['10', '20', '30', '50', '100', '200'],
         showTotal: (total, range) => {
           return range[0] + "-" + range[1] + " 共" + total + "条"
         },

airport-vue/src/views/admin/AdminNotTestAirbridge.vue

@@ -0,0 +1,244 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="日期">
+              <a-date-picker placeholder="请选择日期" @change="dateTimeChange" v-model:value="defaultPickerValue" :defaultPickerValue="defaultPickerValue" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" />
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+
+  </a-card>
+</template>
+
+<script>
+import '@/assets/less/TableExpand.less'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import moment, { Moment } from 'moment';
+
+export default {
+  name: 'AdminDfdlListList',
+  mixins: [JeecgListMixin],
+  components: {
+  },
+  data() {
+    return {
+      description: '计划列表管理页面',
+      defaultPickerValue: moment(),
+      queryParam: {
+        dateTime: moment().format('YYYY-MM-DD')
+      },
+      // 表头
+      columns: [
+        {
+          title: '#',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function(t, r, index) {
+            return parseInt(index) + 1
+          }
+        },
+        /*{
+          title: '航班唯一id',
+          align: 'center',
+          dataIndex: 'flid'
+        },
+        {
+          title: '关联航班唯一id',
+          align: 'center',
+          dataIndex: 'afid'
+        },
+        {
+          title: '航班唯一编号',
+          align: 'center',
+          dataIndex: 'ffid'
+        },
+        {
+          title: '航空公司二字码',
+          align: 'center',
+          dataIndex: 'awcd'
+        },
+        {
+          title: '航班号',
+          align: 'center',
+          dataIndex: 'flno'
+        },*/
+        {
+          title: '飞机号',
+          align: 'center',
+          dataIndex: 'cfno'
+        },
+        /*{
+          title: '航班执行日期；进港航班的计划降落时间里面的日期，出港航班的计划起飞时间里面的日期',
+          align: 'center',
+          dataIndex: 'fexd'
+        },
+        {
+          title: '航班进出标志；A-进港；D-出港',
+          align: 'center',
+          dataIndex: 'flio'
+        },
+        {
+          title: '航班任务；W/Z（正班）',
+          align: 'center',
+          dataIndex: 'fltk'
+        },
+        {
+          title: '航班属性；2403 国内，2401 国际，2404 混合，2402 地区
+          ',
+          align: 'center',
+          dataIndex: 'fatt'
+        },
+        {
+          title: '对应机位表admin_aircraft_position.aircraft_position_num',
+          align: 'center',
+          dataIndex: 'positionCode'
+        },
+        {
+          title: '预计开始使用时间',
+          align: 'center',
+          dataIndex: 'estr'
+        },
+        {
+          title: '预计结束使用时间',
+          align: 'center',
+          dataIndex: 'eend'
+        },
+        {
+          title: '实际开始使用时间',
+          align: 'center',
+          dataIndex: 'rstr'
+        },
+        {
+          title: '实际结束使用时间',
+          align: 'center',
+          dataIndex: 'rend'
+        },
+        {
+          title: '是否到达（业务自定义）；0：未到达，1：到达',
+          align: 'center',
+          dataIndex: 'arrival'
+        },
+        {
+          title: '实际到达时间',
+          align: 'center',
+          dataIndex: 'frlt'
+        },
+        {
+          title: '是否本站起飞；0：未起飞，1：起飞',
+          align: 'center',
+          dataIndex: 'depe'
+        },
+        {
+          title: '实际起飞时间',
+          align: 'center',
+          dataIndex: 'frtt'
+        },
+        {
+          title: '预计起飞时间',
+          align: 'center',
+          dataIndex: 'fett'
+        },
+        {
+          title: '预计到达时间',
+          align: 'center',
+          dataIndex: 'felt'
+        },
+        {
+          title: '计划起飞时间',
+          align: 'center',
+          dataIndex: 'fptt'
+        },
+        {
+          title: '计划降落时间',
+          align: 'center',
+          dataIndex: 'fplt'
+        },
+        {
+          title: '是否删除（业务自定义）：0：未删除，1：删除',
+          align: 'center',
+          dataIndex: 'del'
+        },
+        {
+          title: '航班延误标志位，0：正常，1：延误',
+          align: 'center',
+          dataIndex: 'dlye'
+        },
+        {
+          title: '航班返航标志位，0：正常，1：返航',
+          align: 'center',
+          dataIndex: 'rtne'
+        },
+        {
+          title: '航班取消标志位，0：正常，1：取消',
+          align: 'center',
+          dataIndex: 'cane'
+        },
+        {
+          title: '航班滑回标志位，0：正常，1：滑回',
+          align: 'center',
+          dataIndex: 'bake'
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align: 'center',
+          scopedSlots: { customRender: 'action' }
+        }*/
+      ],
+      url: {
+        list: '/admin_dfdl_list/adminDfdlList/queryNotTestAirbridgeList',
+/*        delete: '/admin_dfdl_list/adminDfdlList/delete',
+        deleteBatch: '/admin_dfdl_list/adminDfdlList/deleteBatch',
+        exportXlsUrl: 'admin_dfdl_list/adminDfdlList/exportXls',
+        importExcelUrl: 'admin_dfdl_list/adminDfdlList/importExcel'*/
+      }
+    }
+  },
+  computed: {
+    importExcelUrl: function() {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+    }
+  },
+  methods: {
+    dateTimeChange(date,dateString) {
+      this.queryParam.dateTime = dateString;
+    }
+  }
+}
+</script>
+<style scoped>
+@import '~@assets/less/common.less';
+</style>

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_dfdl_list/controller/AdminDfdlListController.java

@@ -8,6 +8,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.google.common.base.Strings;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -164,4 +166,28 @@ public class AdminDfdlListController extends JeecgController<AdminDfdlList, IAdm
       return super.importExcel(request, response, AdminDfdlList.class);
   }
 
+	 /**
+	  * 分页列表查询
+	  *
+	  * @param adminDfdlList
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 @AutoLog(value = "计划列表-分页列表查询")
+	 @ApiOperation(value="计划列表-分页列表查询", notes="计划列表-分页列表查询")
+	 @GetMapping(value = "/queryNotTestAirbridgeList")
+	 public Result<?> queryNotTestAirbridgeList(
+									@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									HttpServletRequest req,String dateTime) {
+		 Page<AdminDfdlList> page = new Page<AdminDfdlList>(pageNo, pageSize);
+		 if (Strings.isNullOrEmpty(dateTime)) {
+			 return Result.error("时间不能为空");
+		 }
+		 IPage<AdminDfdlList> pageList = adminDfdlListService.queryNotTestAirbridgeList(page, dateTime);
+		 return Result.OK(pageList);
+	 }
+
 }

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_dfdl_list/mapper/AdminDfdlListMapper.java

@@ -3,7 +3,8 @@ package org.jeecg.modules.admin_dfdl_list.mapper;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.admin_dfdl_list.entity.AdminDfdlList;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -17,4 +18,5 @@ public interface AdminDfdlListMapper extends BaseMapper<AdminDfdlList> {
 
     List<AdminDfdlList> queryPermitAirplaneByDate(Date now);
     List<AdminDfdlList> queryTakeoffAirplaneByDate(Date now);
+    IPage<AdminDfdlList> queryNotTestAirbridgeList(Page<AdminDfdlList> page, String createTime);
 }

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_dfdl_list/mapper/xml/AdminDfdlListMapper.xml

@@ -118,4 +118,25 @@
         AND #{date,jdbcType=DATE} date_format(IFNULL(IFNULL(IFNULL(rend, eend),frtt), DATE_ADD(CURDATE(), INTERVAL 1 DAY)), '%Y-%m-%d')
             AND depe = 1
     </select>
+    <select id="queryNotTestAirbridgeList" parameterType="string" resultType="org.jeecg.modules.admin_dfdl_list.entity.AdminDfdlList">
+        <![CDATA[
+        select cfno
+        from admin_dfdl_list
+        where create_time >= DATE_ADD(str_to_date(concat(#{createTime},' 20:00:00.000'), '%Y-%m-%d %H:%i:%s.%f'), INTERVAL -1 DAY)
+          and create_time <= str_to_date(concat(#{createTime},' 20:00:00.000'), '%Y-%m-%d %H:%i:%s.%f')
+          and (flno not in (select aircraft_num
+                            from admin_airbridge_test
+                            where create_time >= str_to_date(concat(#{createTime},' 20:00:00.000'), '%Y-%m-%d %H:%i:%s.%f')
+                              and create_time <= str_to_date(concat(#{createTime},' 23:59:59.999'), '%Y-%m-%d %H:%i:%s.%f')
+                              and aircraft_num is not null)
+            or CONCAT(awcd,'-',flno) not in (select flight_num
+                                             from admin_airbridge_test
+                                             where create_time >= str_to_date(concat(#{createTime},' 20:00:00.000'), '%Y-%m-%d %H:%i:%s.%f')
+                                               and create_time <= str_to_date(concat(#{createTime},' 23:59:59.999'), '%Y-%m-%d %H:%i:%s.%f')
+                                               and aircraft_num is not null))
+          and cane = 0
+          and del = 0
+        group by cfno
+        ]]>
+    </select>
 </mapper>

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_dfdl_list/service/IAdminDfdlListService.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.admin_dfdl_list.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.admin_dfdl_list.entity.AdminDfdlList;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -27,4 +29,12 @@ public interface IAdminDfdlListService extends IService<AdminDfdlList> {
      * @return
      */
     List<AdminDfdlList> queryTakeoffAirplaneByDate(Date now);
+
+    /**
+     * 查询没有廊桥测试的飞机
+     * @param page
+     * @param String dateTime
+     * @return
+     */
+    IPage<AdminDfdlList> queryNotTestAirbridgeList(Page<AdminDfdlList> page, String dateTime);
 }

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_dfdl_list/service/impl/AdminDfdlListServiceImpl.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.admin_dfdl_list.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.admin_dfdl_list.entity.AdminDfdlList;
 import org.jeecg.modules.admin_dfdl_list.mapper.AdminDfdlListMapper;
 import org.jeecg.modules.admin_dfdl_list.service.IAdminDfdlListService;
@@ -38,4 +40,9 @@ public class AdminDfdlListServiceImpl extends ServiceImpl<AdminDfdlListMapper, A
         }
         return adminDfdlListMapper.queryTakeoffAirplaneByDate(now);
     }
+
+    @Override
+    public IPage<AdminDfdlList> queryNotTestAirbridgeList(Page<AdminDfdlList> page, String dateTime) {
+        return adminDfdlListMapper.queryNotTestAirbridgeList(page, dateTime);
+    }
 }

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

@@ -1062,6 +1062,19 @@ public class APIController {
             return result;
         }
     }
+    /**
+     *  岗位记录编辑
+     *
+     * @param adminPostRecord
+     * @return
+     */
+    @AutoLog(value = "小程序-岗位记录-编辑")
+    @ApiOperation(value="小程序-岗位记录-编辑", notes="小程序-岗位记录-编辑")
+    @RequestMapping(value = "/editAdminPostRecord", method = {RequestMethod.PUT,RequestMethod.POST})
+    public Result<String> editAdminPostRecord(@RequestBody AdminPostRecord adminPostRecord) {
+        adminPostRecordService.updateById(adminPostRecord);
+        return Result.OK("编辑成功!");
+    }
 
     @AutoLog(value = "小程序-查询岗位记录", operateType = CommonConstant.OPERATE_TYPE_1)
     @ApiOperation(value = "提交岗位列表", notes = "提交岗位记录")
@@ -1203,6 +1216,20 @@ public class APIController {
         }
     }
 
+    /**
+     *  廊桥测试编辑
+     *
+     * @param adminAirbridgeTest
+     * @return
+     */
+    @AutoLog(value = "小程序-廊桥测试-编辑")
+    @ApiOperation(value="小程序-廊桥测试-编辑", notes="小程序-廊桥测试-编辑")
+    @RequestMapping(value = "/editAdminAirbridgeTest", method = {RequestMethod.PUT,RequestMethod.POST})
+    public Result<String> editAdminAirbridgeTest(@RequestBody AdminAirbridgeTest adminAirbridgeTest) {
+        adminAirbridgeTestService.updateById(adminAirbridgeTest);
+        return Result.OK("编辑成功!");
+    }
+
     @AutoLog(value = "小程序-查询廊桥测试记录", operateType = CommonConstant.OPERATE_TYPE_1)
     @ApiOperation(value = "廊桥测试列表", notes = "廊桥测试记录")
     @PostMapping(value = "/adminAirbridgeTestList")