:white_check_mark: 安检列表增加上次交出/接收选择的部门，完善部分逻辑

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_order/entity/AdminOrder.java

@@ -65,6 +65,9 @@ public class AdminOrder implements Serializable {
 	@Excel(name = "节点图片", width = 15)
     @ApiModelProperty(value = "节点图片")
     private String pic;
+    /**创建人*/
+    @ApiModelProperty(value = "创建人编码")
+    private String createById;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
@@ -88,6 +91,9 @@ public class AdminOrder implements Serializable {
     @ApiModelProperty(value = "关联航班ID（起飞用）")
     private String flightAfid;
 
+    @ApiModelProperty(value = "发起结束的人编码")
+    private String overById;
+
     @ApiModelProperty(value = "发起结束的人")
     private String overBy;
 }

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_order/entity/AdminOrderExamine.java

@@ -65,6 +65,10 @@ public class AdminOrderExamine implements Serializable {
 	@Excel(name = "电子签名", width = 15)
     @ApiModelProperty(value = "电子签名")
     private String signaturePic;
+    /**部门*/
+    @Excel(name = "部门编码", width = 15)
+    @ApiModelProperty(value = "部门编码")
+    private String departmentId;
 	/**部门*/
 	@Excel(name = "部门", width = 15)
     @ApiModelProperty(value = "部门")
@@ -79,6 +83,10 @@ public class AdminOrderExamine implements Serializable {
     @ApiModelProperty(value = "交出/接受方 部门")
     @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
     private String toDepartment;
+    /**部门编码*/
+    @Excel(name = "交出/接受方 部门编码", width = 15)
+    @ApiModelProperty(value = "交出/接受方 部门编码")
+    private String toDepartmentId;
     @Excel(name = "是交出还是接收", width = 15)
     @ApiModelProperty(value = "是交出还是接收")
     private String jiaochuOrJieshou;
@@ -88,6 +96,10 @@ public class AdminOrderExamine implements Serializable {
 	@Excel(name = "第几阶段", width = 15)
     @ApiModelProperty(value = "第几阶段")
     private String stage;
+    /**创建人*/
+    @Excel(name = "创建人编码", width = 15)
+    @ApiModelProperty(value = "创建人编码")
+    private String createRenId;
 	/**创建人*/
 	@Excel(name = "创建人", width = 15)
     @ApiModelProperty(value = "创建人")

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_security_check/entity/AdminSecurityCheck.java

@@ -65,6 +65,9 @@ public class AdminSecurityCheck implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    /**创建人*/
+    @ApiModelProperty(value = "创建人编码")
+    private String createById;
 	/**创建时间*/
     @ApiModelProperty(value = "创建时间")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -84,4 +87,10 @@ public class AdminSecurityCheck implements Serializable {
 
     @ApiModelProperty(value = "关联航班ID（起飞用）")
     private String flightAfid;
+
+    @ApiModelProperty(value = "转到的部门")
+    private String toDepartment;
+
+    @ApiModelProperty(value = "转到的部门编码")
+    private String toDepartmentId;
 }

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

@@ -17,9 +17,12 @@
         sc.update_time,
         sc.flight_sole,
         sc.flight_afid,
-        ap.sort
+        ap.sort,
+        aoe.to_department,
+        aoe.to_department_id
         from admin_security_check sc
         left join admin_aircraft_position ap on sc.aircraft_position_num = ap.aircraft_position_num
+        left join (select a.order_id ,a.to_department,a.to_department_id from admin_order_examine a join (select order_id, MAX(create_time) max_time from admin_order_examine group by order_id) b on a.order_id = b.order_id and a.create_time = b.max_time) aoe on sc.id = aoe.order_id
         <where >
             <if test="securityCheckListTO.searchContent != null and securityCheckListTO.searchContent != '' and securityCheckListTO.searchContent !='null'">
                 and (sc.aircraft_num like CONCAT('%',#{securityCheckListTO.searchContent},'%') or

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

@@ -1319,6 +1319,7 @@ public class APIController {
             adminSecurityCheck.setFlightAfid(initiateHandoverTO.getFlightAfid());
             adminSecurityCheck.setType("待交出");
             adminSecurityCheck.setCreateBy(name);
+            adminSecurityCheck.setCreateById(one.getId());
             adminSecurityCheck.setUpdateTime(new Date());
             adminSecurityCheckService.save(adminSecurityCheck);
 
@@ -1332,6 +1333,7 @@ public class APIController {
             adminOrder.setFlightSole(initiateHandoverTO.getFlightSole());
             adminOrder.setFlightAfid(initiateHandoverTO.getFlightAfid());
             adminOrder.setType("待交出");
+            adminOrder.setCreateById(one.getId());
             adminOrder.setCreateBy(name);
             adminOrderService.save(adminOrder);
 
@@ -1389,6 +1391,7 @@ public class APIController {
             byId1.setType("交接结束");
             byId1.setQifeiTime(new Date());
             byId1.setOverBy(one.getName());
+            byId1.setOverById(one.getId());
             adminOrderService.updateById(byId1);
 
             result.setMessage("手动结束订单成功");
@@ -1663,6 +1666,8 @@ public class APIController {
                 baseCommonService.addLog("用户校验失败，用户不存在！", CommonConstant.LOG_TYPE_1, null);
                 return result;
             }
+            adminOrderExamine.setCreateRenId(one.getId());
+            adminOrderExamine.setCreateRen(one.getName());
             AdminOrder byId = adminOrderService.getById(adminOrderExamine.getOrderId());
             if (byId != null && byId.getType().equals("交接结束")) {
                 result.setMessage("交接结束不可提交");
@@ -1681,17 +1686,17 @@ public class APIController {
                 adminOrder.setId(adminOrderExamine.getOrderId());
                 adminOrder.setType("待接收");
 ////                这里要判断订单里的飞机号航班号是否为空  为空的话
-//                adminOrder.setAircraftNum( adminOrderExamine.getAircraftNum() );
-//                adminOrder.setAircraftPositionNum( adminOrderExamine.getAircraftPositionNum() );
-//                adminOrder.setFlightNum( adminOrderExamine.getFlightNum() );
+                adminOrder.setAircraftNum( adminOrderExamine.getAircraftNum() );
+                adminOrder.setAircraftPositionNum( adminOrderExamine.getAircraftPositionNum() );
+                adminOrder.setFlightNum( adminOrderExamine.getFlightNum() );
                 adminOrderService.updateById(adminOrder);
 
                 AdminSecurityCheck adminSecurityCheck = new AdminSecurityCheck();
                 adminSecurityCheck.setId(adminOrderExamine.getOrderId());
                 adminSecurityCheck.setType("待接收");
-//                adminSecurityCheck.setAircraftNum( adminOrderExamine.getAircraftNum() );
-//                adminSecurityCheck.setAircraftPositionNum( adminOrderExamine.getAircraftPositionNum() );
-//                adminSecurityCheck.setFlightNum( adminOrderExamine.getFlightNum() );
+                adminSecurityCheck.setAircraftNum( adminOrderExamine.getAircraftNum() );
+                adminSecurityCheck.setAircraftPositionNum( adminOrderExamine.getAircraftPositionNum() );
+                adminSecurityCheck.setFlightNum( adminOrderExamine.getFlightNum() );
                 adminSecurityCheckService.updateById(adminSecurityCheck);
                 result.setMessage("交出成功");
                 result.setResult("交出成功");
@@ -1700,9 +1705,9 @@ public class APIController {
                 AdminOrder adminOrder = new AdminOrder();
                 adminOrder.setId(adminOrderExamine.getOrderId());
                 adminOrder.setType("待交出");
-//                adminOrder.setAircraftNum( adminOrderExamine.getAircraftNum() );
-//                adminOrder.setAircraftPositionNum( adminOrderExamine.getAircraftPositionNum() );
-//                adminOrder.setFlightNum( adminOrderExamine.getFlightNum() );
+                adminOrder.setAircraftNum( adminOrderExamine.getAircraftNum() );
+                adminOrder.setAircraftPositionNum( adminOrderExamine.getAircraftPositionNum() );
+                adminOrder.setFlightNum( adminOrderExamine.getFlightNum() );
                 adminOrder.setType("待交出");
                 adminOrder.setType("待交出");
                 adminOrderService.updateById(adminOrder);
@@ -1710,9 +1715,9 @@ public class APIController {
                 AdminSecurityCheck adminSecurityCheck = new AdminSecurityCheck();
                 adminSecurityCheck.setId(adminOrderExamine.getOrderId());
                 adminSecurityCheck.setType("待交出");
-//                adminSecurityCheck.setAircraftNum( adminOrderExamine.getAircraftNum() );
-//                adminSecurityCheck.setAircraftPositionNum( adminOrderExamine.getAircraftPositionNum() );
-//                adminSecurityCheck.setFlightNum( adminOrderExamine.getFlightNum() );
+                adminSecurityCheck.setAircraftNum( adminOrderExamine.getAircraftNum() );
+                adminSecurityCheck.setAircraftPositionNum( adminOrderExamine.getAircraftPositionNum() );
+                adminSecurityCheck.setFlightNum( adminOrderExamine.getFlightNum() );
                 adminSecurityCheckService.updateById(adminSecurityCheck);
                 result.setMessage("接收成功");
                 result.setResult("接收成功");