1.导出添加领导人

2.业务数据添加维护人筛选

src/main/resources/mapper/modules/admin/TaskStatisticsMapper.xml

@@ -89,6 +89,11 @@
                 </foreach>
             </if>
 
+
+            <if test="vo.leaderName !=null  and vo.leaderName!=''">
+                and su.leader_name=#{vo.leaderName}
+            </if>
+
             <choose>
                 <when  test='vo.managementSource == "2"'>
                     and (sur.role_id = 20  or  sur.role_id = 21)
@@ -146,6 +151,10 @@
                 </foreach>
             </if>
 
+            <if test="vo.leaderName !=null  and vo.leaderName!=''">
+                and su.leader_name=#{vo.leaderName}
+            </if>
+
             <if test="vo.deptId !=null  and vo.deptId!=''">
                 and sd.id like concat('%',#{vo.deptId},'%')
             </if>
@@ -221,6 +230,9 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="vo.leaderName !=null  and vo.leaderName!=''">
+                and su.leader_name=#{vo.leaderName}
+            </if>
         </where>
     </select>
 
@@ -243,6 +255,10 @@
                 AND DATE_FORMAT(iac.createtime, '%Y-%m-%d') BETWEEN DATE_FORMAT(#{vo.enterTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{vo.enterTimeEnd}, '%Y-%m-%d')
             </if>
 
+            <if test="vo.leaderName !=null  and vo.leaderName!=''">
+                and su.leader_name=#{vo.leaderName}
+            </if>
+
             <if test="vo.userName !=null  and vo.userName!=''">
                 and su.name=#{vo.userName}
             </if>

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

@@ -957,7 +957,8 @@
             agree.audit_type as "auditType",
             ifa.auditstatus  as "auditstatus",
             io.licenseno  as "licenseno",
-            su1.name  as "userName"
+            su1.name  as "userName",
+            su1.leader_name  as "leaderName"
             from ins_area_company iac
             LEFT JOIN ptl_agreement agree ON iac.agreement_id = agree.id
             LEFT JOIN ins_orders io ON iac.orderno = io.orderno