Merge branch 'master' into feature/master-qualityControlAnalysisReport-20260305

airport-common/src/main/java/com/sundot/airport/common/core/domain/entity/SysUser.java

@@ -131,6 +131,11 @@ public class SysUser extends BaseEntity {
     private Long roleId;
 
     /**
+     * 角色名称（模糊查询）
+     */
+    private String roleName;
+
+    /**
      * 身份证号
      */
     @Excel(name = "身份证号", cellType = ColumnType.TEXT)
@@ -540,6 +545,14 @@ public class SysUser extends BaseEntity {
         this.roleId = roleId;
     }
 
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+
     public String getCardNumber() {
         return cardNumber;
     }

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

@@ -214,6 +214,24 @@ public class ItemSeizureRecord extends BaseEntity {
     private String inspectUserName;
 
     /**
+     * 开机指令（0-指令，1-非指令，默认 0）
+     */
+    @Excel(name = "开机指令", readConverterExp = "0=指令，1=非指令")
+    private Integer powerOnInstruction;
+
+    /**
+     * X 光开机员 ID（当开机指令为非指令时必填）
+     */
+    @Excel(name = "X 光开机员 ID")
+    private Long xrayOperatorId;
+
+    /**
+     * X 光开机员名称
+     */
+    @Excel(name = "X 光开机员名称")
+    private String xrayOperatorName;
+
+    /**
      * 流程状态 0草稿,1审核中,2 人工终止 ,3归档
      */
     @Excel(name = "流程状态 0草稿,1审核中,2 人工终止 ,3归档")
@@ -552,6 +570,30 @@ public class ItemSeizureRecord extends BaseEntity {
         this.itemSeizureItemsList = itemSeizureItemsList;
     }
 
+    public Integer getPowerOnInstruction() {
+        return powerOnInstruction;
+    }
+
+    public void setPowerOnInstruction(Integer powerOnInstruction) {
+        this.powerOnInstruction = powerOnInstruction;
+    }
+
+    public Long getXrayOperatorId() {
+        return xrayOperatorId;
+    }
+
+    public void setXrayOperatorId(Long xrayOperatorId) {
+        this.xrayOperatorId = xrayOperatorId;
+    }
+
+    public String getXrayOperatorName() {
+        return xrayOperatorName;
+    }
+
+    public void setXrayOperatorName(String xrayOperatorName) {
+        this.xrayOperatorName = xrayOperatorName;
+    }
+
     @Override
     public String toString() {
         return "ItemSeizureRecord{" +

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

@@ -47,6 +47,9 @@
         <result property="attendanceBrigadeName" column="attendance_brigade_name"/>
         <result property="inspectBrigadeId" column="inspect_brigade_id"/>
         <result property="inspectBrigadeName" column="inspect_brigade_name"/>
+        <result property="powerOnInstruction" column="power_on_instruction"/>
+        <result property="xrayOperatorId" column="xray_operator_id"/>
+        <result property="xrayOperatorName" column="xray_operator_name"/>
     </resultMap>
 
     <resultMap type="ItemSeizureRecord" id="ItemSeizureRecordExportResult" extends="ItemSeizureRecordResult">
@@ -121,7 +124,10 @@
                attendance_brigade_id,
                attendance_brigade_name,
                inspect_brigade_id,
-               inspect_brigade_name
+               inspect_brigade_name,
+               power_on_instruction,
+               xray_operator_id,
+               xray_operator_name
         from item_seizure_record
     </sql>
 
@@ -388,6 +394,9 @@
             <if test="attendanceBrigadeName != null">attendance_brigade_name,</if>
             <if test="inspectBrigadeId != null">inspect_brigade_id,</if>
             <if test="inspectBrigadeName != null">inspect_brigade_name,</if>
+            <if test="powerOnInstruction != null">power_on_instruction,</if>
+            <if test="xrayOperatorId != null">xray_operator_id,</if>
+            <if test="xrayOperatorName != null and xrayOperatorName != ''">xray_operator_name,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="tenantId != null">#{tenantId},</if>
@@ -433,6 +442,9 @@
             <if test="attendanceBrigadeName != null">#{attendanceBrigadeName},</if>
             <if test="inspectBrigadeId != null">#{inspectBrigadeId},</if>
             <if test="inspectBrigadeName != null">#{inspectBrigadeName},</if>
+            <if test="powerOnInstruction != null">#{powerOnInstruction},</if>
+            <if test="xrayOperatorId != null">#{xrayOperatorId},</if>
+            <if test="xrayOperatorName != null and xrayOperatorName != ''">#{xrayOperatorName},</if>
         </trim>
     </insert>
 
@@ -492,6 +504,9 @@
             <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>
+            <if test="powerOnInstruction != null">power_on_instruction = #{powerOnInstruction},</if>
+            <if test="xrayOperatorId != null">xray_operator_id= #{xrayOperatorId},</if>
+            <if test="xrayOperatorName != null and xrayOperatorName != ''">xray_operator_name = #{xrayOperatorName},</if>
         </trim>
         where id = #{id}
     </update>

airport-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -214,6 +214,14 @@
             AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId},
             ancestors) ))
         </if>
+        <!-- 角色查询 -->
+        <if test="roleId != null and roleId != 0">
+            AND u.user_id IN (SELECT user_id FROM sys_user_role WHERE role_id= #{roleId})
+        </if>
+        <!-- 角色名称模糊查询 -->
+        <if test="roleName != null and roleName != ''">
+            AND u.user_id IN (SELECT user_id FROM sys_user_role sur INNER JOIN sys_role sr ON sur.role_id = sr.role_id WHERE sr.role_name like concat('%', #{roleName}, '%'))
+        </if>
         <if test="cardNumber != null and cardNumber != ''">
             AND u.card_number like concat('%', #{cardNumber}, '%')
         </if>