查获模块

airport-admin/src/main/java/com/sundot/airport/web/controller/item/ItemSeizureItemsController.java

@@ -138,7 +138,9 @@ public class ItemSeizureItemsController extends BaseController {
             } else {
                 if (sysDept.getDeptType().equals(DeptTypeEnum.STATION.getCode())) {
                     itemSeizureParam.setInspectStationId(sysDept.getDeptId());
-                } else if (sysDept.getDeptType().equals(DeptTypeEnum.DEPARTMENT.getCode())) {
+                } else if (sysDept.getDeptType().equals(DeptTypeEnum.BRIGADE.getCode())) {
+                    itemSeizureParam.setInspectBrigadeId(sysDept.getDeptId());
+                } else if (sysDept.getDeptType().equals(DeptTypeEnum.MANAGER.getCode())) {
                     itemSeizureParam.setInspectDepartmentId(sysDept.getDeptId());
                 } else if (sysDept.getDeptType().equals(DeptTypeEnum.TEAMS.getCode())) {
                     itemSeizureParam.setInspectTeamId(sysDept.getDeptId());
@@ -205,7 +207,9 @@ public class ItemSeizureItemsController extends BaseController {
                 } else {
                     if (sysDept.getDeptType().equals(DeptTypeEnum.STATION.getCode())) {
                         itemSeizureParam.setInspectStationId(sysDept.getDeptId());
-                    } else if (sysDept.getDeptType().equals(DeptTypeEnum.DEPARTMENT.getCode())) {
+                    } else if (sysDept.getDeptType().equals(DeptTypeEnum.BRIGADE.getCode())) {
+                        itemSeizureParam.setInspectBrigadeId(sysDept.getDeptId());
+                    } else if (sysDept.getDeptType().equals(DeptTypeEnum.MANAGER.getCode())) {
                         itemSeizureParam.setInspectDepartmentId(sysDept.getDeptId());
                     } else if (sysDept.getDeptType().equals(DeptTypeEnum.TEAMS.getCode())) {
                         itemSeizureParam.setInspectTeamId(sysDept.getDeptId());
@@ -236,7 +240,9 @@ public class ItemSeizureItemsController extends BaseController {
             } else {
                 if (sysDept.getDeptType().equals(DeptTypeEnum.STATION.getCode())) {
                     itemSeizureParam.setInspectStationId(sysDept.getDeptId());
-                } else if (sysDept.getDeptType().equals(DeptTypeEnum.DEPARTMENT.getCode())) {
+                } else if (sysDept.getDeptType().equals(DeptTypeEnum.BRIGADE.getCode())) {
+                    itemSeizureParam.setInspectBrigadeId(sysDept.getDeptId());
+                } else if (sysDept.getDeptType().equals(DeptTypeEnum.MANAGER.getCode())) {
                     itemSeizureParam.setInspectDepartmentId(sysDept.getDeptId());
                 } else if (sysDept.getDeptType().equals(DeptTypeEnum.TEAMS.getCode())) {
                     itemSeizureParam.setInspectTeamId(sysDept.getDeptId());

airport-item/src/main/java/com/sundot/airport/item/domain/ItemSeizureParam.java

@@ -30,6 +30,11 @@ public class ItemSeizureParam {
     private Long inspectStationId;
 
     /**
+     * 查获记录类型:2=本班组查获记录:查获人大队ID
+     */
+    private Long inspectBrigadeId;
+
+    /**
      * 查获记录类型:2=本班组查获记录:查获人科室ID
      */
     private Long inspectDepartmentId;
@@ -85,6 +90,14 @@ public class ItemSeizureParam {
         this.inspectStationId = inspectStationId;
     }
 
+    public Long getInspectBrigadeId() {
+        return inspectBrigadeId;
+    }
+
+    public void setInspectBrigadeId(Long inspectBrigadeId) {
+        this.inspectBrigadeId = inspectBrigadeId;
+    }
+
     public Long getInspectDepartmentId() {
         return inspectDepartmentId;
     }
@@ -139,6 +152,7 @@ public class ItemSeizureParam {
                 "recordType=" + recordType +
                 ", inspectUserId=" + inspectUserId +
                 ", inspectStationId=" + inspectStationId +
+                ", inspectBrigadeId=" + inspectBrigadeId +
                 ", inspectDepartmentId=" + inspectDepartmentId +
                 ", inspectTeamId=" + inspectTeamId +
                 ", timeType=" + timeType +

airport-item/src/main/resources/mapper/item/ItemSeizureItemsMapper.xml

@@ -274,6 +274,7 @@
         where 1 = 1
         <if test="inspectUserId != null">and isr.inspect_user_id = #{inspectUserId}</if>
         <if test="inspectStationId != null">and isr.inspect_station_id = #{inspectStationId}</if>
+        <if test="inspectBrigadeId != null">and isr.inspect_brigade_id = #{inspectBrigadeId}</if>
         <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
         <if test="inspectTeamId != null">and isr.inspect_team_id = #{inspectTeamId}</if>
         <!-- 时间范围 -->
@@ -315,6 +316,7 @@
         where 1 = 1
         <if test="inspectUserId != null">and isr.inspect_user_id = #{inspectUserId}</if>
         <if test="inspectStationId != null">and isr.inspect_station_id = #{inspectStationId}</if>
+        <if test="inspectBrigadeId != null">and isr.inspect_brigade_id = #{inspectBrigadeId}</if>
         <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
         <if test="inspectTeamId != null">and isr.inspect_team_id = #{inspectTeamId}</if>
         <!-- 时间范围 -->
@@ -359,6 +361,7 @@
         where 1 = 1
         <if test="inspectUserId != null">and isr.inspect_user_id = #{inspectUserId}</if>
         <if test="inspectStationId != null">and isr.inspect_station_id = #{inspectStationId}</if>
+        <if test="inspectBrigadeId != null">and isr.inspect_brigade_id = #{inspectBrigadeId}</if>
         <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
         <if test="inspectTeamId != null">and isr.inspect_team_id = #{inspectTeamId}</if>
         <!-- 时间范围 -->