1.控制台任务渠道代理人条件筛选

src/main/java/com/ydtech/modules/admin/model/vo/TaskStatisticsVo.java

@@ -100,7 +100,11 @@ public class TaskStatisticsVo implements Serializable {
     private List<String> deptIds;
 
 
+    @ApiModelProperty(value = "管理人")
+    private String leaderName;
 
+    @ApiModelProperty(value = "管理人工号")
+    private String leaderId;
 
 
 

src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -1136,6 +1136,17 @@
         left  join  sys_user su  on su.id =a.userId
         LEFT JOIN  ins_upload_files   inf on  su.head_sculpture  =inf.id
         LEFT JOIN sys_user_info  sui  on  sui .id =su.id
+        <where>
+            <if test='taskStatisticsVo.userName !=null and taskStatisticsVo.userName!="" '>
+                and su.name like concat('%',#{taskStatisticsVo.userName},'%')
+            </if>
+            <if test='taskStatisticsVo.leaderId !=null and taskStatisticsVo.leaderId!="" '>
+                and su.leader_id  =#{taskStatisticsVo.leaderId}
+            </if>
+             <if test='taskStatisticsVo.userId !=null and taskStatisticsVo.userId!="" '>
+                and su.id =#{taskStatisticsVo.userId}
+            </if>
+        </where>
 
     </select>
     <select id="queryPageTaskStatisticsTotal"  resultType="java.lang.Long">
@@ -1382,6 +1393,15 @@
             <if test="taskStatisticsVo.userId !=null  and  taskStatisticsVo.userId!='' ">
                 and io.userid =#{taskStatisticsVo.userId}
             </if>
+            <if test='taskStatisticsVo.userName !=null and taskStatisticsVo.userName!="" '>
+                and su.name like concat('%',#{taskStatisticsVo.userName},'%')
+            </if>
+            <if test='taskStatisticsVo.leaderId !=null and taskStatisticsVo.leaderId!="" '>
+                and su.leader_id  =#{taskStatisticsVo.leaderId}
+            </if>
+            <if test='taskStatisticsVo.userId !=null and taskStatisticsVo.userId!="" '>
+                and su.id =#{taskStatisticsVo.userId}
+            </if>
 
             <if test="taskStatisticsVo.createtimeStart !=null and taskStatisticsVo.createtimeStart != '' and taskStatisticsVo.createtimeEnd !=null and taskStatisticsVo.createtimeEnd != ''">
                 AND   DATE_FORMAT( io.createtime, '%Y-%m-%d')   BETWEEN #{taskStatisticsVo.createtimeStart} AND #{taskStatisticsVo.createtimeEnd}
@@ -1436,6 +1456,7 @@
         ins_area_company iac
         left  join   ins_orders  io  on  io.orderno  = iac.orderno
         left  join   sys_dept sd  on sd.id=io.deptid
+        left  join   sys_user su  on su.id=io.userid
         <where>
             sd.management_source = '2'
             <if test="taskStatisticsVo.provinceId != null and taskStatisticsVo.provinceId != ''">
@@ -1450,6 +1471,15 @@
             <if test="taskStatisticsVo.houseId != null and taskStatisticsVo.houseId != ''">
                 and io.deptid like "${taskStatisticsVo.houseId}%"
             </if>
+            <if test='taskStatisticsVo.userName !=null and taskStatisticsVo.userName!="" '>
+                and su.name like concat('%',#{taskStatisticsVo.userName},'%')
+            </if>
+            <if test='taskStatisticsVo.leaderId !=null and taskStatisticsVo.leaderId!="" '>
+                and su.leader_id  =#{taskStatisticsVo.leaderId}
+            </if>
+            <if test='taskStatisticsVo.userId !=null and taskStatisticsVo.userId!="" '>
+                and su.id =#{taskStatisticsVo.userId}
+            </if>
 
             <if test="taskStatisticsVo.createtimeStart !=null and taskStatisticsVo.createtimeStart != '' and taskStatisticsVo.createtimeEnd !=null and taskStatisticsVo.createtimeEnd != ''">
                 AND   DATE_FORMAT( io.createtime, '%Y-%m-%d')   BETWEEN #{taskStatisticsVo.createtimeStart} AND #{taskStatisticsVo.createtimeEnd}