feat: 架次关联机号

als-modules/agile-assurance/src/main/java/org/eco/als/controller/SortieController.java

@@ -51,13 +51,22 @@ public class SortieController extends BaseController {
         return CommonResult.success(sortieService.selectPage(sortieBo));
     }
 
+    /**
+     * 查询架次列表下拉框
+     */
+    @SaCheckPermission("als:sortie:list")
+    @GetMapping("/select")
+    public CommonResult<List<SortieVo>> select(SortieBo sortieBo) {
+        return CommonResult.success(sortieService.selectList(sortieBo));
+    }
+
     /**
      * 导出架次列表
      */
     @SaCheckPermission("als:sortie:export")
     @Log(title = "架次", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public CommonResult<Void> export(HttpServletResponse response, SortieBo sortieBo) {
+    public CommonResult<Void> export(SortieBo sortieBo) {
         LoginUser loginUser = LoginHelper.getLoginUser();
         List<SortieVo> list = sortieService.selectList(sortieBo);
         sortieService.asyncExport(list, "架次", loginUser);

als-modules/agile-assurance/src/main/java/org/eco/als/domain/Sortie.java

@@ -35,9 +35,9 @@ public class Sortie extends BaseEntity {
     private String sortieNo;
 
     /**
-     * 机号
+     * 机号Id
      */
-    private String aircraftNo;
+    private Long aircraftId;
 
     /**
      * 飞行日期

als-modules/agile-assurance/src/main/java/org/eco/als/domain/bo/SortieBo.java

@@ -35,8 +35,8 @@ public class SortieBo extends BaseEntity {
     /**
      * 机号
      */
-    @NotBlank(message = "机号不能为空")
-    private String aircraftNo;
+    @NotNull(message = "机号不能为空")
+    private Long aircraftId;
 
     /**
      * 飞行日期

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/SortieVo.java

@@ -45,8 +45,14 @@ public class SortieVo extends BaseEntity implements Serializable {
      * 机号
      */
     @ExcelProperty(value = "机号")
+    @FieldMapper(type = MapperConstant.AIRCRAFT_ID_TO_NO, mapper = "aircraftId")
     private String aircraftNo;
 
+    /**
+     * 机号Id
+     */
+    private Long aircraftId;
+
     /**
      * 飞行日期
      */

als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/SortieServiceImpl.java

@@ -59,8 +59,8 @@ public class SortieServiceImpl extends BaseServiceImpl<SortieMapper, Sortie> imp
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(SORTIE.SORTIE_NO.eq
             (sortieBo.getSortieNo()));
-        queryWrapper.and(SORTIE.AIRCRAFT_NO.eq
-            (sortieBo.getAircraftNo()));
+        queryWrapper.and(SORTIE.AIRCRAFT_ID.eq
+            (sortieBo.getAircraftId()));
         queryWrapper.and(SORTIE.FLIGHT_DATE.eq
             (sortieBo.getFlightDate()));
 
@@ -141,8 +141,7 @@ public class SortieServiceImpl extends BaseServiceImpl<SortieMapper, Sortie> imp
     public boolean update(SortieBo sortieBo) {
         Sortie sortie = MapstructUtils.convert(sortieBo, Sortie.class);
         if (ObjectUtil.isNotNull(sortie) && ObjectUtil.isNotNull(sortie.getId())) {
-            boolean updated = this.updateById(sortie);
-            return updated;
+            return this.updateById(sortie);
         }
         return false;
     }