查获记录表

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

@@ -69,6 +69,9 @@ public class ItemSeizureRecordController extends BaseController {
             case STATION:
                 itemSeizureRecord.setInspectStationId(dataPermission.getValue());
                 break;
+            case BRIGADE:
+                itemSeizureRecord.setInspectBrigadeId(dataPermission.getValue());
+                break;
             case DEPARTMENT:
                 itemSeizureRecord.setInspectDepartmentId(dataPermission.getValue());
                 break;
@@ -80,7 +83,7 @@ public class ItemSeizureRecordController extends BaseController {
                 // 不设置过滤条件，查看所有数据
                 break;
         }
-        
+
         startPage();
         List<ItemSeizureRecord> list = itemSeizureRecordService.selectItemSeizureRecordList(itemSeizureRecord);
         return getDataTable(list);
@@ -102,6 +105,9 @@ public class ItemSeizureRecordController extends BaseController {
             case STATION:
                 itemSeizureRecord.setInspectStationId(dataPermission.getValue());
                 break;
+            case BRIGADE:
+                itemSeizureRecord.setInspectBrigadeId(dataPermission.getValue());
+                break;
             case DEPARTMENT:
                 itemSeizureRecord.setInspectDepartmentId(dataPermission.getValue());
                 break;
@@ -113,20 +119,20 @@ public class ItemSeizureRecordController extends BaseController {
                 // 不设置过滤条件，查看所有数据
                 break;
         }
-        
+
         List<ItemSeizureRecord> list = itemSeizureRecordService.selectItemSeizureRecordListForExport(itemSeizureRecord);
         exportData(response, list);
     }
-    
+
     /**
      * 导出查获记录数据
-     * 
+     *
      * @param response 响应对象
-     * @param list 查获记录列表
+     * @param list     查获记录列表
      */
     private void exportData(HttpServletResponse response, List<ItemSeizureRecord> list) {
         List<ItemSeizureRecordExportVO> exportList = new ArrayList<>();
-        
+
         // 直接使用已查询到的记录，避免再次查询数据库
         for (ItemSeizureRecord record : list) {
             if (record != null) {
@@ -140,14 +146,14 @@ public class ItemSeizureRecordController extends BaseController {
                     exportVO.setCheckMethodDesc(record.getCheckMethodDesc());
                     exportVO.setInspectTeamName(record.getInspectTeamName());
                     exportVO.setAttendanceTeamName(record.getAttendanceTeamName());
-                    
+
                     // 物品信息为空
                     exportVO.setCategoryNameTwo("");
                     exportVO.setQuantity(null);
                     exportVO.setCheckPositionNameTwo("");
                     exportVO.setHandlingMethod("");
                     exportVO.setIsActiveConcealmentDesc("");
-                    
+
                     exportList.add(exportVO);
                 } else {
                     // 处理有物品的记录
@@ -160,22 +166,22 @@ public class ItemSeizureRecordController extends BaseController {
                         exportVO.setCheckMethodDesc(record.getCheckMethodDesc());
                         exportVO.setInspectTeamName(record.getInspectTeamName());
                         exportVO.setAttendanceTeamName(record.getAttendanceTeamName());
-                        
+
                         // 物品信息
-                        exportVO.setCategoryNameTwo(item.getCategoryNameOne()+"/"+item.getCategoryNameTwo());
+                        exportVO.setCategoryNameTwo(item.getCategoryNameOne() + "/" + item.getCategoryNameTwo());
                         exportVO.setQuantity(item.getQuantity());
-                        exportVO.setCheckPositionNameTwo(item.getCheckPositionNameOne()+"/"+item.getCheckPositionNameTwo());
+                        exportVO.setCheckPositionNameTwo(item.getCheckPositionNameOne() + "/" + item.getCheckPositionNameTwo());
                         //处理方式查字典
                         String handlingMethodLabel = DictUtils.getDictLabel("item_handling_method", item.getHandlingMethod());
                         exportVO.setHandlingMethod(StringUtils.isNotEmpty(handlingMethodLabel) ? handlingMethodLabel : item.getHandlingMethod());
                         exportVO.setIsActiveConcealmentDesc("1".equals(String.valueOf(item.getIsActiveConcealment())) ? "是" : "否");
-                        
+
                         exportList.add(exportVO);
                     }
                 }
             }
         }
-        
+
         ExcelUtil<ItemSeizureRecordExportVO> util = new ExcelUtil<ItemSeizureRecordExportVO>(ItemSeizureRecordExportVO.class);
         util.exportExcel(response, exportList, "查获记录数据");
     }
@@ -203,6 +209,8 @@ public class ItemSeizureRecordController extends BaseController {
         }
         itemSeizureRecord.setInspectStationId(userInfo.getStationId());
         itemSeizureRecord.setInspectStationName(userInfo.getStationName());
+        itemSeizureRecord.setInspectBrigadeId(userInfo.getBrigadeId());
+        itemSeizureRecord.setInspectBrigadeName(userInfo.getBrigadeName());
         itemSeizureRecord.setInspectDepartmentId(userInfo.getDepartmentId());
         itemSeizureRecord.setInspectDepartmentName(userInfo.getDepartmentName());
         itemSeizureRecord.setInspectTeamId(userInfo.getTeamsId());

airport-admin/src/main/java/com/sundot/airport/web/core/utils/DataPermissionUtils.java

@@ -22,9 +22,9 @@ import java.util.stream.Collectors;
  */
 @Component
 public class DataPermissionUtils {
-    
+
     private static ISysDeptService sysDeptService;
-    
+
     @Autowired
     public void setSysDeptService(ISysDeptService sysDeptService) {
         DataPermissionUtils.sysDeptService = sysDeptService;
@@ -33,8 +33,8 @@ public class DataPermissionUtils {
     /**
      * 获取数据权限结果
      *
-     * @param userId 当前用户ID
-     * @param deptId 当前用户部门ID
+     * @param userId    当前用户ID
+     * @param deptId    当前用户部门ID
      * @param loginUser 当前登录用户信息
      * @return 数据权限结果
      */
@@ -58,6 +58,7 @@ public class DataPermissionUtils {
         // 检查是否包含特定角色
         boolean isAdminRole = roleKeys.contains(RoleTypeEnum.admin.getCode());
         boolean isStationRole = roleKeys.contains(RoleTypeEnum.test.getCode()) || roleKeys.contains(RoleTypeEnum.zhijianke.getCode());
+        boolean isBrigadeRole = roleKeys.contains(RoleTypeEnum.jingli.getCode()) || roleKeys.contains(RoleTypeEnum.xingzheng.getCode());
         boolean isDepartmentRole = roleKeys.contains(RoleTypeEnum.kezhang.getCode());
         boolean isTeamRole = roleKeys.contains(RoleTypeEnum.banzuzhang.getCode());
         boolean isInspectorRole = roleKeys.contains(RoleTypeEnum.SecurityCheck.getCode());
@@ -76,6 +77,14 @@ public class DataPermissionUtils {
                 return new DataPermissionResult(DataPermissionType.SELF, userId);
             }
         }
+        // 大队级角色查看本站数据
+        else if (isBrigadeRole) {
+            if (sysDept != null) {
+                return new DataPermissionResult(DataPermissionType.BRIGADE, sysDept.getDeptId());
+            } else {
+                return new DataPermissionResult(DataPermissionType.SELF, userId);
+            }
+        }
         // 科室角色查看本科室数据
         else if (isDepartmentRole) {
             if (sysDept != null) {
@@ -101,65 +110,82 @@ public class DataPermissionUtils {
             return new DataPermissionResult(DataPermissionType.SELF, userId);
         }
     }
-    
+
     /**
      * 判断用户是否具有管理员角色
+     *
      * @param loginUser 当前登录用户
      * @return 是否是管理员
      */
     public static boolean isAdmin(LoginUser loginUser) {
         return hasRole(loginUser, RoleTypeEnum.admin.getCode());
     }
-    
+
     /**
      * 判断用户是否具有站级角色（站长或质检科）
+     *
      * @param loginUser 当前登录用户
      * @return 是否是站级角色
      */
     public static boolean isStationRole(LoginUser loginUser) {
-        return hasRole(loginUser, RoleTypeEnum.test.getCode()) || 
-               hasRole(loginUser, RoleTypeEnum.zhijianke.getCode());
+        return hasRole(loginUser, RoleTypeEnum.test.getCode()) ||
+                hasRole(loginUser, RoleTypeEnum.zhijianke.getCode());
     }
-    
+
+    /**
+     * 判断用户是否具有大队级角色（经理或大队行政）
+     *
+     * @param loginUser 当前登录用户
+     * @return 是否是站级角色
+     */
+    public static boolean isBrigadeRole(LoginUser loginUser) {
+        return hasRole(loginUser, RoleTypeEnum.jingli.getCode()) ||
+                hasRole(loginUser, RoleTypeEnum.xingzheng.getCode());
+    }
+
     /**
      * 判断用户是否具有科室角色
+     *
      * @param loginUser 当前登录用户
      * @return 是否是科室角色
      */
     public static boolean isDepartmentRole(LoginUser loginUser) {
         return hasRole(loginUser, RoleTypeEnum.kezhang.getCode());
     }
-    
+
     /**
      * 判断用户是否具有班组角色
+     *
      * @param loginUser 当前登录用户
      * @return 是否是班组角色
      */
     public static boolean isTeamRole(LoginUser loginUser) {
         return hasRole(loginUser, RoleTypeEnum.banzuzhang.getCode());
     }
-    
+
     /**
      * 判断用户是否具有安检员角色
+     *
      * @param loginUser 当前登录用户
      * @return 是否是安检员角色
      */
     public static boolean isInspectorRole(LoginUser loginUser) {
         return hasRole(loginUser, RoleTypeEnum.SecurityCheck.getCode());
     }
-    
+
     /**
      * 判断用户是否具有指定角色
+     *
      * @param loginUser 当前登录用户
-     * @param roleKey 角色键值
+     * @param roleKey   角色键值
      * @return 是否具有指定角色
      */
     private static boolean hasRole(LoginUser loginUser, String roleKey) {
-        if (loginUser == null || loginUser.getUser() == null || 
-            CollectionUtils.isEmpty(loginUser.getUser().getRoles())) {
+        if (loginUser == null || loginUser.getUser() == null ||
+                CollectionUtils.isEmpty(loginUser.getUser().getRoles())) {
             return false;
         }
-        
+
         return loginUser.getUser().getRoles().stream()
                 .anyMatch(role -> roleKey.equals(role.getRoleKey()));
     }

airport-common/src/main/java/com/sundot/airport/common/enums/DataPermissionType.java

@@ -11,27 +11,32 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum DataPermissionType {
-    
+
     /**
      * 全部数据权限
      */
     ALL(null, "全部数据权限"),
-    
+
     /**
      * 个人数据权限
      */
     SELF("userId", "个人数据权限"),
-    
+
     /**
      * 站点数据权限
      */
     STATION("stationId", "站点数据权限"),
-    
+
+    /**
+     * 大队数据权限
+     */
+    BRIGADE("brigadeId", "大队数据权限"),
+
     /**
      * 科室数据权限
      */
     DEPARTMENT("departmentId", "科室数据权限"),
-    
+
     /**
      * 班组数据权限
      */
@@ -41,7 +46,7 @@ public enum DataPermissionType {
      * 对应的字段名
      */
     private final String fieldName;
-    
+
     /**
      * 描述信息
      */

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

@@ -220,6 +220,30 @@ public class ItemSeizureRecord extends BaseEntity {
     private String processStatus;
 
     /**
+     * 考勤大队ID
+     */
+    @Excel(name = "考勤大队ID")
+    private Long attendanceBrigadeId;
+
+    /**
+     * 考勤大队名称
+     */
+    @Excel(name = "考勤大队名称")
+    private String attendanceBrigadeName;
+
+    /**
+     * 查获人大队ID
+     */
+    @Excel(name = "查获人大队ID")
+    private Long inspectBrigadeId;
+
+    /**
+     * 查获人大队名称
+     */
+    @Excel(name = "查获人大队名称")
+    private String inspectBrigadeName;
+
+    /**
      * 查获物品明细列表
      */
     private List<ItemSeizureItems> itemSeizureItemsList;
@@ -488,6 +512,38 @@ public class ItemSeizureRecord extends BaseEntity {
         return inspectUserName;
     }
 
+    public void setAttendanceBrigadeId(Long attendanceBrigadeId) {
+        this.attendanceBrigadeId = attendanceBrigadeId;
+    }
+
+    public Long getAttendanceBrigadeId() {
+        return attendanceBrigadeId;
+    }
+
+    public void setAttendanceBrigadeName(String attendanceBrigadeName) {
+        this.attendanceBrigadeName = attendanceBrigadeName;
+    }
+
+    public String getAttendanceBrigadeName() {
+        return attendanceBrigadeName;
+    }
+
+    public void setInspectBrigadeId(Long inspectBrigadeId) {
+        this.inspectBrigadeId = inspectBrigadeId;
+    }
+
+    public Long getInspectBrigadeId() {
+        return inspectBrigadeId;
+    }
+
+    public void setInspectBrigadeName(String inspectBrigadeName) {
+        this.inspectBrigadeName = inspectBrigadeName;
+    }
+
+    public String getInspectBrigadeName() {
+        return inspectBrigadeName;
+    }
+
     public List<ItemSeizureItems> getItemSeizureItemsList() {
         return itemSeizureItemsList;
     }
@@ -532,6 +588,10 @@ public class ItemSeizureRecord extends BaseEntity {
                 ", passengerGenderDesc='" + passengerGenderDesc + '\'' +
                 ", inspectUserName='" + inspectUserName + '\'' +
                 ", processStatus='" + processStatus + '\'' +
+                ", attendanceBrigadeId='" + attendanceBrigadeId + '\'' +
+                ", attendanceBrigadeName='" + attendanceBrigadeName + '\'' +
+                ", inspectBrigadeId='" + inspectBrigadeId + '\'' +
+                ", inspectBrigadeName='" + inspectBrigadeName + '\'' +
                 ", itemSeizureItemsList=" + itemSeizureItemsList +
                 '}';
     }

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

@@ -43,6 +43,10 @@
         <result property="passengerGenderDesc" column="passenger_gender_desc"/>
         <result property="inspectUserName" column="inspect_user_name"/>
         <result property="processStatus" column="process_status"/>
+        <result property="attendanceBrigadeId" column="attendance_brigade_id"/>
+        <result property="attendanceBrigadeName" column="attendance_brigade_name"/>
+        <result property="inspectBrigadeId" column="inspect_brigade_id"/>
+        <result property="inspectBrigadeName" column="inspect_brigade_name"/>
     </resultMap>
 
     <resultMap type="ItemSeizureRecord" id="ItemSeizureRecordExportResult" extends="ItemSeizureRecordResult">
@@ -113,11 +117,15 @@
                check_method_desc,
                passenger_gender_desc,
                inspect_user_name,
-               process_status
+               process_status,
+               attendance_brigade_id,
+               attendance_brigade_name,
+               inspect_brigade_id,
+               inspect_brigade_name
         from item_seizure_record
     </sql>
 
-    <select id="selectItemSeizureRecordList"  resultMap="ItemSeizureRecordResult">
+    <select id="selectItemSeizureRecordList" resultMap="ItemSeizureRecordResult">
         <include refid="selectItemSeizureRecordVo"/>
         <where>
             <if test="tenantId != null  and tenantId != ''">and tenant_id = #{tenantId}</if>
@@ -139,26 +147,26 @@
             <if test="attendanceStationName != null  and attendanceStationName != ''">and attendance_station_name like
                 concat('%', #{attendanceStationName}, '%')
             </if>
-            <if test="channelName != null  and channelName != ''">and channel_name like concat('%', #{channelName},
-                '%')
+            <if test="channelName != null  and channelName != ''">and channel_name like
+                concat('%', #{channelName}, '%')
             </if>
             <if test="regionalCode != null ">and regional_code = #{regionalCode}</if>
-            <if test="regionalName != null  and regionalName != ''">and regional_name like concat('%', #{regionalName},
-                '%')
+            <if test="regionalName != null  and regionalName != ''">and regional_name like
+                concat('%', #{regionalName}, '%')
             </if>
             <if test="terminlCode != null ">and terminl_code = #{terminlCode}</if>
-            <if test="terminlName != null  and terminlName != ''">and terminl_name like concat('%', #{terminlName},
-                '%')
+            <if test="terminlName != null  and terminlName != ''">and terminl_name like
+                concat('%', #{terminlName}, '%')
             </if>
-            <if test="passengerName != null  and passengerName != ''">and passenger_name like concat('%',
-                #{passengerName}, '%')
+            <if test="passengerName != null  and passengerName != ''">and passenger_name like
+                concat('%', #{passengerName}, '%')
             </if>
             <if test="passengerGender != null  and passengerGender != ''">and passenger_gender = #{passengerGender}</if>
             <if test="passengerCard != null  and passengerCard != ''">and passenger_card = #{passengerCard}</if>
             <if test="passengerFlight != null  and passengerFlight != ''">and passenger_flight = #{passengerFlight}</if>
             <if test="inspectTeamId != null ">and inspect_team_id = #{inspectTeamId}</if>
-            <if test="inspectTeamName != null  and inspectTeamName != ''">and inspect_team_name like concat('%',
-                #{inspectTeamName}, '%')
+            <if test="inspectTeamName != null  and inspectTeamName != ''">and inspect_team_name like
+                concat('%', #{inspectTeamName}, '%')
             </if>
             <if test="inspectDepartmentId != null ">and inspect_department_id = #{inspectDepartmentId}</if>
             <if test="inspectDepartmentName != null  and inspectDepartmentName != ''">and inspect_department_name like
@@ -173,10 +181,18 @@
             <if test="passengerGenderDesc != null  and passengerGenderDesc != ''">and passenger_gender_desc =
                 #{passengerGenderDesc}
             </if>
-            <if test="inspectUserName != null  and inspectUserName != ''">and inspect_user_name like concat('%',
-                #{inspectUserName}, '%')
+            <if test="inspectUserName != null  and inspectUserName != ''">and inspect_user_name like
+                concat('%', #{inspectUserName}, '%')
             </if>
             <if test="processStatus != null  and processStatus != ''">and process_status = #{processStatus}</if>
+            <if test="attendanceBrigadeId != null ">and attendance_brigade_id = #{attendanceBrigadeId}</if>
+            <if test="attendanceBrigadeName != null  and attendanceBrigadeName != ''">and attendance_brigade_name like
+                concat('%', #{attendanceBrigadeName}, '%')
+            </if>
+            <if test="inspectBrigadeId != null ">and inspect_brigade_id = #{inspectBrigadeId}</if>
+            <if test="inspectBrigadeName != null  and inspectBrigadeName != ''">and inspect_brigade_name like
+                concat('%', #{inspectBrigadeName}, '%')
+            </if>
             <if test="beginTime !=null and endTime !=null ">
                 and seizure_time >= #{beginTime}
                 and seizure_time <![CDATA[ < ]]> date_add(#{endTime} , interval 1 day)
@@ -186,70 +202,70 @@
     </select>
 
     <select id="selectItemSeizureRecordListForExport" resultMap="ItemSeizureRecordExportResult">
-        SELECT 
-            isr.tenant_id,
-            isr.revision,
-            isr.create_by,
-            isr.create_time,
-            isr.update_by,
-            isr.update_time,
-            isr.inspect_user_id,
-            isr.channel_code,
-            isr.seizure_time,
-            isr.check_method,
-            isr.remark,
-            isr.attendance_id,
-            isr.id,
-            isr.attendance_team_id,
-            isr.attendance_team_name,
-            isr.attendance_department_id,
-            isr.attendance_department_name,
-            isr.attendance_station_id,
-            isr.attendance_station_name,
-            isr.channel_name,
-            isr.regional_code,
-            isr.regional_name,
-            isr.terminl_code,
-            isr.terminl_name,
-            isr.passenger_name,
-            isr.passenger_gender,
-            isr.passenger_card,
-            isr.passenger_flight,
-            isr.inspect_team_id,
-            isr.inspect_team_name,
-            isr.inspect_department_id,
-            isr.inspect_department_name,
-            isr.inspect_station_id,
-            isr.inspect_station_name,
-            isr.check_method_desc,
-            isr.passenger_gender_desc,
-            isr.inspect_user_name,
-            isr.process_status,
-            isi.id AS items_id,
-            isi.record_id,
-            isi.item_code,
-            isi.quantity,
-            isi.remark AS items_remark,
-            isi.check_position_code_one,
-            isi.is_active_concealment,
-            isi.check_position_code_two,
-            isi.check_position_specific,
-            isi.item_name,
-            isi.category_code_one,
-            isi.category_name_one,
-            isi.category_code_two,
-            isi.category_name_two,
-            isi.unit,
-            isi.check_position_name_one,
-            isi.check_position_name_two,
-            isi.unit_desc,
-            isi.handling_method,
-            isi.handling_method_desc,
-            isi.attachment_id,
-            isi.attachment_url,
-            isi.attachment_name,
-            isi.location,
-            isi.location_text
+        SELECT
+        isr.tenant_id,
+        isr.revision,
+        isr.create_by,
+        isr.create_time,
+        isr.update_by,
+        isr.update_time,
+        isr.inspect_user_id,
+        isr.channel_code,
+        isr.seizure_time,
+        isr.check_method,
+        isr.remark,
+        isr.attendance_id,
+        isr.id,
+        isr.attendance_team_id,
+        isr.attendance_team_name,
+        isr.attendance_department_id,
+        isr.attendance_department_name,
+        isr.attendance_station_id,
+        isr.attendance_station_name,
+        isr.channel_name,
+        isr.regional_code,
+        isr.regional_name,
+        isr.terminl_code,
+        isr.terminl_name,
+        isr.passenger_name,
+        isr.passenger_gender,
+        isr.passenger_card,
+        isr.passenger_flight,
+        isr.inspect_team_id,
+        isr.inspect_team_name,
+        isr.inspect_department_id,
+        isr.inspect_department_name,
+        isr.inspect_station_id,
+        isr.inspect_station_name,
+        isr.check_method_desc,
+        isr.passenger_gender_desc,
+        isr.inspect_user_name,
+        isr.process_status,
+        isi.id AS items_id,
+        isi.record_id,
+        isi.item_code,
+        isi.quantity,
+        isi.remark AS items_remark,
+        isi.check_position_code_one,
+        isi.is_active_concealment,
+        isi.check_position_code_two,
+        isi.check_position_specific,
+        isi.item_name,
+        isi.category_code_one,
+        isi.category_name_one,
+        isi.category_code_two,
+        isi.category_name_two,
+        isi.unit,
+        isi.check_position_name_one,
+        isi.check_position_name_two,
+        isi.unit_desc,
+        isi.handling_method,
+        isi.handling_method_desc,
+        isi.attachment_id,
+        isi.attachment_url,
+        isi.attachment_name,
+        isi.location,
+        isi.location_text
         FROM item_seizure_record isr
         LEFT JOIN item_seizure_items isi ON isi.record_id = isr.id
         <where>
@@ -269,33 +285,37 @@
                 isr.attendance_department_name like concat('%', #{attendanceDepartmentName}, '%')
             </if>
             <if test="attendanceStationId != null ">and isr.attendance_station_id = #{attendanceStationId}</if>
-            <if test="attendanceStationName != null  and attendanceStationName != ''">and isr.attendance_station_name like
-                concat('%', #{attendanceStationName}, '%')
+            <if test="attendanceStationName != null  and attendanceStationName != ''">and isr.attendance_station_name
+                like concat('%', #{attendanceStationName}, '%')
             </if>
-            <if test="channelName != null  and channelName != ''">and isr.channel_name like concat('%', #{channelName},
-                '%')
+            <if test="channelName != null  and channelName != ''">and isr.channel_name like
+                concat('%', #{channelName}, '%')
             </if>
             <if test="regionalCode != null ">and isr.regional_code = #{regionalCode}</if>
-            <if test="regionalName != null  and regionalName != ''">and isr.regional_name like concat('%', #{regionalName},
-                '%')
+            <if test="regionalName != null  and regionalName != ''">and isr.regional_name like
+                concat('%', #{regionalName}, '%')
             </if>
             <if test="terminlCode != null ">and isr.terminl_code = #{terminlCode}</if>
-            <if test="terminlName != null  and terminlName != ''">and isr.terminl_name like concat('%', #{terminlName},
-                '%')
+            <if test="terminlName != null  and terminlName != ''">and isr.terminl_name like
+                concat('%', #{terminlName}, '%')
             </if>
-            <if test="passengerName != null  and passengerName != ''">and isr.passenger_name like concat('%',
-                #{passengerName}, '%')
+            <if test="passengerName != null  and passengerName != ''">and isr.passenger_name like
+                concat('%', #{passengerName}, '%')
+            </if>
+            <if test="passengerGender != null  and passengerGender != ''">and isr.passenger_gender =
+                #{passengerGender}
             </if>
-            <if test="passengerGender != null  and passengerGender != ''">and isr.passenger_gender = #{passengerGender}</if>
             <if test="passengerCard != null  and passengerCard != ''">and isr.passenger_card = #{passengerCard}</if>
-            <if test="passengerFlight != null  and passengerFlight != ''">and isr.passenger_flight = #{passengerFlight}</if>
+            <if test="passengerFlight != null  and passengerFlight != ''">and isr.passenger_flight =
+                #{passengerFlight}
+            </if>
             <if test="inspectTeamId != null ">and isr.inspect_team_id = #{inspectTeamId}</if>
-            <if test="inspectTeamName != null  and inspectTeamName != ''">and isr.inspect_team_name like concat('%',
-                #{inspectTeamName}, '%')
+            <if test="inspectTeamName != null  and inspectTeamName != ''">and isr.inspect_team_name like
+                concat('%', #{inspectTeamName}, '%')
             </if>
             <if test="inspectDepartmentId != null ">and isr.inspect_department_id = #{inspectDepartmentId}</if>
-            <if test="inspectDepartmentName != null  and inspectDepartmentName != ''">and isr.inspect_department_name like
-                concat('%', #{inspectDepartmentName}, '%')
+            <if test="inspectDepartmentName != null  and inspectDepartmentName != ''">and isr.inspect_department_name
+                like concat('%', #{inspectDepartmentName}, '%')
             </if>
             <if test="inspectStationId != null ">and isr.inspect_station_id = #{inspectStationId}</if>
             <if test="inspectStationName != null  and inspectStationName != ''">and isr.inspect_station_name like
@@ -306,8 +326,8 @@
             <if test="passengerGenderDesc != null  and passengerGenderDesc != ''">and isr.passenger_gender_desc =
                 #{passengerGenderDesc}
             </if>
-            <if test="inspectUserName != null  and inspectUserName != ''">and isr.inspect_user_name like concat('%',
-                #{inspectUserName}, '%')
+            <if test="inspectUserName != null  and inspectUserName != ''">and isr.inspect_user_name like
+                concat('%', #{inspectUserName}, '%')
             </if>
             <if test="processStatus != null  and processStatus != ''">and isr.process_status = #{processStatus}</if>
             <if test="beginTime !=null and endTime !=null ">
@@ -363,6 +383,11 @@
             <if test="checkMethodDesc != null and checkMethodDesc != ''">check_method_desc,</if>
             <if test="passengerGenderDesc != null and passengerGenderDesc != ''">passenger_gender_desc,</if>
             <if test="inspectUserName != null and inspectUserName != ''">inspect_user_name,</if>
+            <if test="processStatus != null">process_status,</if>
+            <if test="attendanceBrigadeId != null">attendance_brigade_id,</if>
+            <if test="attendanceBrigadeName != null">attendance_brigade_name,</if>
+            <if test="inspectBrigadeId != null">inspect_brigade_id,</if>
+            <if test="inspectBrigadeName != null">inspect_brigade_name,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="tenantId != null">#{tenantId},</if>
@@ -403,6 +428,11 @@
             <if test="checkMethodDesc != null and checkMethodDesc != ''">#{checkMethodDesc},</if>
             <if test="passengerGenderDesc != null and passengerGenderDesc != ''">#{passengerGenderDesc},</if>
             <if test="inspectUserName != null and inspectUserName != ''">#{inspectUserName},</if>
+            <if test="processStatus != null">#{processStatus},</if>
+            <if test="attendanceBrigadeId != null">#{attendanceBrigadeId},</if>
+            <if test="attendanceBrigadeName != null">#{attendanceBrigadeName},</if>
+            <if test="inspectBrigadeId != null">#{inspectBrigadeId},</if>
+            <if test="inspectBrigadeName != null">#{inspectBrigadeName},</if>
         </trim>
     </insert>
 
@@ -457,6 +487,11 @@
                 #{passengerGenderDesc},
             </if>
             <if test="inspectUserName != null and inspectUserName != ''">inspect_user_name = #{inspectUserName},</if>
+            <if test="processStatus != null">process_status = #{processStatus},</if>
+            <if test="attendanceBrigadeId != null">attendance_brigade_id = #{attendanceBrigadeId},</if>
+            <if test="attendanceBrigadeName != null">attendance_brigade_name = #{attendanceBrigadeName},</if>
+            <if test="inspectBrigadeId != null">inspect_brigade_id = #{inspectBrigadeId},</if>
+            <if test="inspectBrigadeName != null">inspect_brigade_name = #{inspectBrigadeName},</if>
         </trim>
         where id = #{id}
     </update>