Bläddra i källkod

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

Twelve615 1 år sedan
förälder
incheckning
0c25480c12

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

@@ -89,6 +89,14 @@ public class AdminSecurityCheck implements Serializable {
     @ApiModelProperty(value = "关联航班ID(起飞用)")
     private String flightAfid;
 
+    @ApiModelProperty(value = "部门")
+    @TableField(exist = false)
+    private String department;
+
+    @ApiModelProperty(value = "部门编码")
+    @TableField(exist = false)
+    private String departmentId;
+
     @ApiModelProperty(value = "转到的部门")
     @TableField(exist = false)
     private String toDepartment;

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

@@ -19,10 +19,12 @@
         sc.flight_afid,
         ap.sort,
         aoe.to_department,
-        aoe.to_department_id
+        aoe.to_department_id,
+        aoe.department,
+        aoe.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
+        left join (select a.order_id,a.department, a.department_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

+ 2 - 2
airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/ImfMqListener.java

@@ -46,9 +46,9 @@ import java.util.Date;
  * @Description:
  * @date 2023/7/17 11:57
  */
-@Profile("prod")
+//@Profile("prod")
 @Slf4j
-@RabbitComponent(value = "ImfMqListener")
+//@RabbitComponent(value = "ImfMqListener")
 public class ImfMqListener extends BaseRabbiMqHandler<Object> {
 
     public ImfMqListener() {