:ambulance: 修改删除不了安检的问题

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_aircraft_position/controller/AdminAircraftPositionController.java

@@ -136,7 +136,7 @@ public class AdminAircraftPositionController extends JeecgController<AdminAircra
 		//删安检
 		LambdaQueryWrapper<AdminSecurityCheck> queryWrapper3 =
 				new LambdaQueryWrapper<>();
-		queryWrapper3.eq( AdminSecurityCheck::getFlightAfid, byId.getFlightAfid() );
+		queryWrapper3.eq( AdminSecurityCheck::getAircraftPositionNum, byId.getAircraftPositionNum() );
 		List<AdminSecurityCheck> list = adminSecurityCheckService.list( queryWrapper3 );
 		if (list.size() != 0) {
 			List<String> ids = list.stream()
@@ -164,7 +164,7 @@ public class AdminAircraftPositionController extends JeecgController<AdminAircra
 			//删安检
 			LambdaQueryWrapper<AdminSecurityCheck> queryWrapper3 =
 					new LambdaQueryWrapper<>();
-			queryWrapper3.eq( AdminSecurityCheck::getFlightAfid, byId.getFlightAfid() );
+			queryWrapper3.eq( AdminSecurityCheck::getAircraftPositionNum, byId.getAircraftPositionNum()  );
 			List<AdminSecurityCheck> list = adminSecurityCheckService.list( queryWrapper3 );
 			if (list.size() != 0) {
 				List<String> ids2 = list.stream()

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_aircraft_position/entity/AdminAircraftPosition.java

@@ -103,4 +103,29 @@ public class AdminAircraftPosition implements Serializable {
 
     @ApiModelProperty(value = "是否能到岗 1和null可以到岗 2不可以到岗 ")
     private Integer isAttendance;
+
+    @Excel(name = "预计开始占用时间", width = 15)
+    @ApiModelProperty(value = "预计开始占用时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date estr;
+
+    @Excel(name = "预计结束占用时间", width = 15)
+    @ApiModelProperty(value = "预计结束占用时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date eend;
+
+    @Excel(name = "实际开始占用时间", width = 15)
+    @ApiModelProperty(value = "预计结束占用时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date rstr;
+
+    @Excel(name = "实际结束占用时间", width = 15)
+    @ApiModelProperty(value = "预计结束占用时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date rend;
+
 }

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_aircraft_position/mapper/xml/AdminAircraftPositionMapper.xml

@@ -4,6 +4,7 @@
 
     <update id="dept">
         UPDATE admin_aircraft_position SET aircraft_num = NULL,type = '空置',drop_time = NULL,flight_afid = NULL,
+        estr = null, eend = null, rstr=null, rend=null,
         flight_num = NULL,flight_sole = NULL WHERE
          id = #{id}
     </update>