:white_check_mark:订单恢复时按照飞机号恢复，修复离岗时间没有的问题，订单编号增加毫秒

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_order/service/impl/AdminOrderServiceImpl.java

@@ -97,14 +97,15 @@ public class AdminOrderServiceImpl extends ServiceImpl<AdminOrderMapper, AdminOr
         Result<Boolean> result = Result.OK();
         // 在同步锁中再次确认订单存在，防止更改订单时飞机刚好起飞
         QueryWrapper<AdminAircraftPosition> adminAircaftQueryWarpper = new QueryWrapper<AdminAircraftPosition>();
-        adminAircaftQueryWarpper.eq("aircraft_position_num", adminOrder.getAircraftPositionNum())
+        adminAircaftQueryWarpper
+                //.eq("aircraft_position_num", adminOrder.getAircraftPositionNum())
                 .eq("aircraft_num", adminOrder.getAircraftNum())
-                .eq("drop_time", adminOrder.getDropTime())
-                .eq("flight_num", adminOrder.getFlightNum())
+                //.eq("drop_time", adminOrder.getDropTime())
+                //.eq("flight_num", adminOrder.getFlightNum())
         ;
         AdminAircraftPosition adminAircraftPosition = adminAircraftPositionService.getOne(adminAircaftQueryWarpper);
         if (adminAircraftPosition == null || Strings.isNullOrEmpty(adminAircraftPosition.getAircraftNum())) {
-            result.setMessage(String.format("飞机[%s]已起飞,无法恢复订单", adminOrder.getAircraftNum()));
+            result.setMessage(String.format("飞机[%s]离开机位,无法恢复订单", adminOrder.getAircraftNum()));
             return result;
         }
 

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

@@ -1049,11 +1049,11 @@ public class APIController {
             } else {
                 adminPostRecord.setTestType("正常");
             }*/
-            if (adminPostRecord.getBeonDutyorNot() != null && adminPostRecord.getBeonDutyorNot().equals(2)) {
+            //if (adminPostRecord.getBeonDutyorNot() != null && adminPostRecord.getBeonDutyorNot().equals(2)) {
                 // 添加离岗时间
                 //adminPostRecord.setLeaveTime(new Date());
-                adminPostRecordLambdaUpdateWrapper.set(AdminPostRecord::getLeaveTime,new Date());
-            }
+                //adminPostRecordLambdaUpdateWrapper.set(AdminPostRecord::getLeaveTime,new Date());
+            //}
             // 离岗以机位上的数据为准
             if (!Strings.isNullOrEmpty(one1.getAircraftPositionId())) {
                 AdminAircraftPosition byId1 = adminAircraftPositionService.getById(one1.getAircraftPositionId());
@@ -1066,7 +1066,7 @@ public class APIController {
             adminPostRecordLambdaUpdateWrapper.set(AdminPostRecord::getTestType,adminPostRecord.getTestType());
             adminPostRecordLambdaUpdateWrapper.set(AdminPostRecord::getTestContent,adminPostRecord.getTestContent());
             adminPostRecordLambdaUpdateWrapper.set(AdminPostRecord::getTestPic,adminPostRecord.getTestPic());
-            adminPostRecordLambdaUpdateWrapper.set(AdminPostRecord::getLeaveTime,adminPostRecord.getLeaveTime());
+            adminPostRecordLambdaUpdateWrapper.set(AdminPostRecord::getLeaveTime,new Date());
             adminPostRecordLambdaUpdateWrapper.set(AdminPostRecord::getRemark,adminPostRecord.getRemark());
             adminPostRecordLambdaUpdateWrapper.set(AdminPostRecord::getSignaturePic,adminPostRecord.getSignaturePic());
             adminPostRecordService.update(adminPostRecordLambdaUpdateWrapper);
@@ -1388,7 +1388,7 @@ public class APIController {
             }
             //需要验证配置 图片是否必传  前端验证就可以了  必要时后端也要验证
 //            创建安检还有订单
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSSSSS");
             String orderNum = initiateHandoverTO.getAircraftPositionNum() + sdf.format(new Date());
             //设置降落时间
             checkDropTime(initiateHandoverTO);
@@ -1584,17 +1584,22 @@ public class APIController {
             result.setMessage("订单不存在");
             return result;
         }
+        if ("起飞结束".equals(adminOrder.getOverBy()) && "系统".equals(adminOrder.getOverById())) {
+            result.setMessage("飞机已经起飞无法恢复");
+            return result;
+        }
 
         QueryWrapper<AdminAircraftPosition> adminAircaftQueryWarpper = new QueryWrapper<AdminAircraftPosition>();
-        adminAircaftQueryWarpper.eq("aircraft_position_num", adminOrder.getAircraftPositionNum())
+        adminAircaftQueryWarpper
+                //.eq("aircraft_position_num", adminOrder.getAircraftPositionNum())
                 .eq("aircraft_num", adminOrder.getAircraftNum())
                 //.eq("drop_time", adminOrder.getDropTime())
-                .eq("flight_sole", adminOrder.getFlightSole())
-                .eq("flight_num", adminOrder.getFlightNum())
+                //.eq("flight_sole", adminOrder.getFlightSole())
+                //.eq("flight_num", adminOrder.getFlightNum())
         ;
         AdminAircraftPosition adminAircraftPosition = adminAircraftPositionService.getOne(adminAircaftQueryWarpper);
         if (adminAircraftPosition == null || Strings.isNullOrEmpty(adminAircraftPosition.getAircraftNum())) {
-            result.setMessage(String.format("飞机[%s]信息变动,无法恢复订单", adminOrder.getAircraftNum()));
+            result.setMessage(String.format("飞机[%s]离开机位,无法恢复订单", adminOrder.getAircraftNum()));
             return result;
         }
 
@@ -1952,13 +1957,15 @@ public class APIController {
 //                return result;
 //            }
             QueryWrapper<AdminOrder> queryWrapper = new QueryWrapper<>();
-            if (!orderListTO.getSearchContent().equals("")) {
-                queryWrapper.like("order_num", orderListTO.getSearchContent()).or().like("flight_num",
-                        orderListTO.getSearchContent());
-            }
             if (!orderListTO.getType().equals("")) {
                 queryWrapper.eq("type", orderListTO.getType());
             }
+            if (!orderListTO.getSearchContent().equals("")) {
+                queryWrapper.like("order_num", orderListTO.getSearchContent()).or().like("flight_num",
+                                orderListTO.getSearchContent())
+                        .or().like("aircraft_num",
+                                orderListTO.getSearchContent());
+            }
             queryWrapper.orderByDesc("create_time");
 //            List<AdminOrder> list = adminOrderService.list( queryWrapper );
             Page<AdminOrder> page = new Page<AdminOrder>(pageNo, pageSize);

airport/jeecg-boot-module-system/src/main/resources/logback-spring.xml

@@ -71,7 +71,7 @@
 		<appender-ref ref="STDOUT" />
 		<appender-ref ref="FILE" />
 		<appender-ref ref="HTML" />
-		<appender-ref ref="FILE_HTML" />
+<!--		<appender-ref ref="FILE_HTML" />-->
 	</root>
 
 </configuration>