:white_check_mark: 岗位记录，列表增加到岗时间、离岗时间字段，字段保持和导出报表一致，增加到岗时间区间筛选（精确到日）和航班号筛选；记得，导出的记录根据筛选条件来

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

@@ -16,7 +16,7 @@
           </a-col>
           <a-col :xl="4" :lg="5" :md="6" :sm="24">
             <a-form-item label="航班号">
-              <a-input allow-clear placeholder="请输入航班号" v-model="queryParam.flightNum"></a-input>
+              <a-input allow-clear placeholder="请输入航班号" v-model="queryParam.sFlightNum"></a-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">

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

@@ -4,14 +4,29 @@
     <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-col :xl="4" :lg="5" :md="6" :sm="24">
             <a-form-item label="机位">
-              <a-input placeholder="请输入机位" v-model="queryParam.ssaircraftPositionNum"></a-input>
+              <a-input allow-clear placeholder="请输入机位" v-model="queryParam.ssaircraftPositionNum"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="4" :lg="5" :md="6" :sm="24">
             <a-form-item label="提交人">
-              <a-input placeholder="请输入提交人" v-model="queryParam.sssubmitter"></a-input>
+              <a-input allow-clear placeholder="请输入提交人" v-model="queryParam.sssubmitter"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="4" :lg="5" :md="6" :sm="24">
+            <a-form-item label="航班号">
+              <a-input allow-clear placeholder="请输入航班号" v-model="queryParam.sFlightNum"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="到岗时间">
+              <a-range-picker
+                format="YYYY-MM-DD"
+                :placeholder="['开始时间', '结束时间']"
+                @change="onCreateDateRangeChange"
+                @ok="onCreateDateRangeOk"
+              ></a-range-picker>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -165,38 +180,51 @@
             dataIndex: 'submitter'
           },
           {
-            title:'测试状态',
+            title:'岗位情况',
             align:"center",
             dataIndex: 'testType_dictText'
           },
           // {
-          //   title:'测试内容',
+          //   title:'异常情况记录',
           //   align:"center",
           //   dataIndex: 'testContent'
           // },
           {
-            title:'测试拍照图片',
+            title:'图片',
             align:"center",
             dataIndex: 'testPic',
+            width:150,
             scopedSlots: {customRender: 'imgSlot'}
           },
           {
             title:'电子签名',
             align:"center",
+            width:150,
             dataIndex: 'signaturePic',
             scopedSlots: {customRender: 'imgSlot'}
           },
           {
             title:'备注',
             align:"center",
+            width:150,
             dataIndex: 'remark'
           },
           {
+            title:'到岗时间',
+            align:"center",
+            dataIndex: 'createTime'
+          },
+          {
+            title:'离岗时间',
+            align:"center",
+            dataIndex: 'leaveTime'
+          },
+          {
             title: '操作',
             dataIndex: 'action',
             align:"center",
             fixed:"right",
-            width:147,
+            width:60,
             scopedSlots: { customRender: 'action' }
           }
         ],
@@ -234,7 +262,15 @@
         fieldList.push({type:'string',value:'testPic',text:'测试拍照图片',dictCode:''})
         fieldList.push({type:'string',value:'signaturePic',text:'电子签名',dictCode:''})
         fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
+        fieldList.push({type:'string',value:'createTime',text:'到岗时间',dictCode:''})
+        fieldList.push({type:'string',value:'leaveTime',text:'离岗时间',dictCode:''})
         this.superFieldList = fieldList
+      },
+      onCreateDateRangeChange(value, dateString) {
+        this.queryParam.sCDateTime = dateString[0];
+        this.queryParam.eCDateTime = dateString[1];
+      },
+      onCreateDateRangeOk(value) {
       }
     }
   }

airport-vue/src/views/admin/modules/AdminPostRecordForm.vue

@@ -24,7 +24,7 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="测试状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="testType">
+            <a-form-model-item label="岗位情况" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="testType">
               <j-dict-select-tag type="list" v-model="model.testType" dictCode="testtype"/>
             </a-form-model-item>
           </a-col>
@@ -55,7 +55,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="离岗时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="createTime">
-              <j-date  v-model="model.updateTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+              <j-date  v-model="model.leaveTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
             </a-form-model-item>
           </a-col>
         </a-row>

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_airbridge_test/controller/AdminAirbridgeTestController.java

@@ -73,7 +73,7 @@ public class AdminAirbridgeTestController extends JeecgController<AdminAirbridge
 	public Result<IPage<AdminAirbridgeTest>> queryPageList(AdminAirbridgeTest adminAirbridgeTest,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req, String ssaircraftPositionNum, String sssubmitter, String sCDateTime,  String eCDateTime) {
+								   HttpServletRequest req, String ssaircraftPositionNum, String sssubmitter, String sCDateTime,  String eCDateTime, String sFlightNum) {
 		QueryWrapper<AdminAirbridgeTest> queryWrapper = QueryGenerator.initQueryWrapper(adminAirbridgeTest, req.getParameterMap());
 		if (ssaircraftPositionNum != null) {
 			queryWrapper.like( "aircraft_position_num", ssaircraftPositionNum );
@@ -87,6 +87,9 @@ public class AdminAirbridgeTestController extends JeecgController<AdminAirbridge
 		if (!Strings.isNullOrEmpty(eCDateTime)) {
 			queryWrapper.le("create_time",eCDateTime + " 23:59:59");
 		}
+		if (!Strings.isNullOrEmpty(sFlightNum)) {
+			queryWrapper.like("flight_num",sFlightNum);
+		}
 		Page<AdminAirbridgeTest> page = new Page<AdminAirbridgeTest>(pageNo, pageSize);
 		IPage<AdminAirbridgeTest> pageList = adminAirbridgeTestService.page(page, queryWrapper);
 		return Result.OK(pageList);
@@ -167,7 +170,7 @@ public class AdminAirbridgeTestController extends JeecgController<AdminAirbridge
 
 
 	@RequestMapping(value = "/exportXls")
-	public ModelAndView exportXls(HttpServletRequest request, AdminAirbridgeTest adminAirbridgeTest, String ssaircraftPositionNum, String sssubmitter, String sCDateTime,  String eCDateTime) {
+	public ModelAndView exportXls(HttpServletRequest request, AdminAirbridgeTest adminAirbridgeTest, String ssaircraftPositionNum, String sssubmitter, String sCDateTime,  String eCDateTime, String sFlightNum) {
 		String title = "廊桥测试";
 		// Step.1 组装查询条件
 		QueryWrapper<AdminAirbridgeTest> queryWrapper = QueryGenerator.initQueryWrapper(adminAirbridgeTest, request.getParameterMap());
@@ -178,7 +181,9 @@ public class AdminAirbridgeTestController extends JeecgController<AdminAirbridge
 			queryWrapper.like( "submitter", sssubmitter );
 		}
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-
+		if (!Strings.isNullOrEmpty(sFlightNum)) {
+			queryWrapper.like("flight_num",sFlightNum);
+		}
 		if (!Strings.isNullOrEmpty(sCDateTime)) {
 			queryWrapper.ge("create_time",sCDateTime + " 00:00:00");
 		}

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_post_record/controller/AdminPostRecordController.java

@@ -10,6 +10,7 @@ import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.google.common.base.Strings;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
@@ -73,7 +74,7 @@ public class AdminPostRecordController extends JeecgController<AdminPostRecord,
 	public Result<IPage<AdminPostRecord>> queryPageList(AdminPostRecord adminPostRecord,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req, String ssaircraftPositionNum, String sssubmitter) {
+								   HttpServletRequest req, String ssaircraftPositionNum, String sssubmitter, String sCDateTime,  String eCDateTime, String sFlightNum) {
 		QueryWrapper<AdminPostRecord> queryWrapper = QueryGenerator.initQueryWrapper(adminPostRecord, req.getParameterMap());
 		if (ssaircraftPositionNum != null) {
 			queryWrapper.like( "aircraft_position_num", ssaircraftPositionNum );
@@ -81,6 +82,15 @@ public class AdminPostRecordController extends JeecgController<AdminPostRecord,
 		if (sssubmitter != null) {
 			queryWrapper.like( "submitter", sssubmitter );
 		}
+		if (!Strings.isNullOrEmpty(sFlightNum)) {
+			queryWrapper.like("flight_num",sFlightNum);
+		}
+		if (!Strings.isNullOrEmpty(sCDateTime)) {
+			queryWrapper.ge("create_time",sCDateTime + " 00:00:00");
+		}
+		if (!Strings.isNullOrEmpty(eCDateTime)) {
+			queryWrapper.le("create_time",eCDateTime + " 23:59:59");
+		}
 		Page<AdminPostRecord> page = new Page<AdminPostRecord>(pageNo, pageSize);
 		IPage<AdminPostRecord> pageList = adminPostRecordService.page(page, queryWrapper);
 		return Result.OK(pageList);
@@ -161,7 +171,7 @@ public class AdminPostRecordController extends JeecgController<AdminPostRecord,
 
 	 @RequestMapping(value = "/exportXls")
 	 public ModelAndView exportXls(HttpServletRequest request, AdminPostRecord adminPostRecord, String ssaircraftPositionNum,
-								   String sssubmitter) {
+								   String sssubmitter, String sFlightNum, String sCDateTime,  String eCDateTime) {
 		 String title = "岗位记录";
 		 // Step.1 组装查询条件
 		 QueryWrapper<AdminPostRecord> queryWrapper = QueryGenerator.initQueryWrapper(adminPostRecord, request.getParameterMap());
@@ -171,6 +181,15 @@ public class AdminPostRecordController extends JeecgController<AdminPostRecord,
 		 if (sssubmitter != null) {
 			 queryWrapper.like( "submitter", sssubmitter );
 		 }
+		 if (!Strings.isNullOrEmpty(sFlightNum)) {
+			 queryWrapper.like("flight_num",sFlightNum);
+		 }
+		 if (!Strings.isNullOrEmpty(sCDateTime)) {
+			 queryWrapper.ge("create_time",sCDateTime + " 00:00:00");
+		 }
+		 if (!Strings.isNullOrEmpty(eCDateTime)) {
+			 queryWrapper.le("create_time",eCDateTime + " 23:59:59");
+		 }
 		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
 		 // Step.2 获取导出数据

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_post_record/entity/AdminPostRecord.java

@@ -83,7 +83,7 @@ public class AdminPostRecord implements Serializable {
     @ApiModelProperty(value = "备注")
     private String remark;
 	/**创建时间*/
-    @ApiModelProperty(value = "创建时间")
+    @ApiModelProperty(value = "到岗时间")
     @Excel(name = "到岗时间", width = 25, exportFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")