增加队伍

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GCourtyardNetworkManagementBo.java

@@ -25,6 +25,7 @@ public class GCourtyardNetworkManagementBo extends BaseEntity {
     private List<String> photoList;
     private String processStatus;
     private String processComments;
+    private String ranks;
     /**
      * 主键id
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GRegulatorBoxBo.java

@@ -266,5 +266,6 @@ public class GRegulatorBoxBo extends BaseEntity {
      */
     @ApiModelProperty(value = "排序的方向", example = "asc,desc")
     private String isAsc;
+    private String ranks;
 
 }

ruoyi-gas/src/main/resources/mapper/GCourtyardNetworkManagementMapper.xml

@@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from g_courtyard_network_management a
         left join g_building c on a.building_id = c.id and c.del_flag = '0'
         left join g_area d on d.id = c.area_id and d.del_flag = '0'
+        left join g_user u on u.id = a.create_by
         <where>
             a.del_flag = '0'
             <if test="p.findProblem != null  and p.findProblem != ''">
@@ -41,6 +42,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="p.createBy != null  and p.createBy != ''">
                 and a.create_by = #{p.createBy}
             </if>
+            <if test="p.ranks != null and p.ranks != ''">
+                and u.ranks = #{p.ranks}
+            </if>
         </where>
         ORDER BY a.create_time DESC
     </select>

ruoyi-gas/src/main/resources/mapper/GRegulatorBoxMapper.xml

@@ -67,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (select name from g_user u where u.id = a.create_by) AS createByName
         from g_regulator_box a
         left join g_area d on d.id = a.area_id and d.del_flag = '0'
+        left join g_user u on u.id = a.create_by
         <where>
             a.del_flag = '0'
             <if test="p.administrativeOffice != null  and p.administrativeOffice != ''">
@@ -78,6 +79,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="p.createBy != null  and p.createBy != ''">
                 and a.create_by = #{p.createBy}
             </if>
+            <if test="p.ranks != null and p.ranks != ''">
+                and u.ranks = #{p.ranks}
+            </if>
         </where>
         ORDER BY a.create_time DESC
     </select>