任务 3488 BUG 2193

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FirefightersContractController.java

@@ -163,7 +163,13 @@ public class FirefightersContractController extends BaseController {
                         firefightersContractQueryWrapper.eq(name, fileValue);
                     } else if (type.equals(String.class)) {
                         String fileValue = (String) field.get(firefightersContract);
-                        firefightersContractQueryWrapper.eq(name, fileValue);
+                        /* BUG 2193 合同名称模糊匹配 start*/
+                        if ("name".equals(name)) {
+                            firefightersContractQueryWrapper.like(name, fileValue);
+                        } else {
+                            firefightersContractQueryWrapper.eq(name, fileValue);
+                        }
+                        /* BUG 2193 合同名称模糊匹配 end*/
                     }else if (type.equals(Date.class)) {
                     	Date fileValue = (Date) field.get(firefightersContract);
                         firefightersContractQueryWrapper.eq(name, fileValue);

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AircraftController.java

@@ -210,6 +210,10 @@ public class AircraftController extends BaseController {
                 map1.put("aircraftModel", map.get("aircraftType"));
                 map1.put("dynamicFlightId", map.get("dynamicFlightId"));
                 map1.put("landingTime", map.get("sta"));
+                /* 任务 3488 根据航班号查询航班信息回填  增加跑道,机位字段 start*/
+                map1.put("runway", map.get("runway"));
+                map1.put("stand", map.get("stand"));
+                /* 任务 3488 根据航班号查询航班信息回填 end*/
 //    	          map1.put("fuelQuantity", map.get(""));
                 map1.put("passengerCapacity", map.get("psgNumTotal"));
             }