设备管理

airport-equipment/src/main/java/com/sundot/airport/equipment/domain/EquipmentLedger.java

@@ -151,6 +151,14 @@ public class EquipmentLedger extends BaseEntity {
     @TableField(exist = false)
     private List<BaseAttachment> baseAttachmentList;
 
+    /** 查询定/自检小组人员ID*/
+    @TableField(exist = false)
+    private String inspectionTeamUserId;
+
+    /** 查询定/自检小组人员ID名称*/
+    @TableField(exist = false)
+    private String inspectionTeamUserName;
+
     public void setTenantId(String tenantId) {
         this.tenantId = tenantId;
     }
@@ -383,6 +391,22 @@ public class EquipmentLedger extends BaseEntity {
         this.baseAttachmentList = baseAttachmentList;
     }
 
+    public String getInspectionTeamUserId() {
+        return inspectionTeamUserId;
+    }
+
+    public void setInspectionTeamUserId(String inspectionTeamUserId) {
+        this.inspectionTeamUserId = inspectionTeamUserId;
+    }
+
+    public String getInspectionTeamUserName() {
+        return inspectionTeamUserName;
+    }
+
+    public void setInspectionTeamUserName(String inspectionTeamUserName) {
+        this.inspectionTeamUserName = inspectionTeamUserName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

airport-equipment/src/main/resources/mapper/equipment/EquipmentLedgerMapper.xml

@@ -121,6 +121,18 @@
             <if test="inspectionTeamMember2Name != null  and inspectionTeamMember2Name != ''">and
                 inspection_team_member2_name like concat('%', #{inspectionTeamMember2Name}, '%')
             </if>
+            <if test="inspectionTeamUserId != null ">and (
+                inspection_team_leader_id = #{inspectionTeamUserId} or
+                inspection_team_member1_id = #{inspectionTeamUserId} or
+                inspection_team_member2_id = #{inspectionTeamUserId}
+                )
+            </if>
+            <if test="inspectionTeamUserName != null  and inspectionTeamUserName != ''">and (
+                inspection_team_leader_name like concat('%', #{inspectionTeamUserName}, '%') or
+                inspection_team_member1_name like concat('%', #{inspectionTeamUserName}, '%') or
+                inspection_team_member2_name like concat('%', #{inspectionTeamUserName}, '%')
+                )
+            </if>
         </where>
         order by create_time desc
     </select>