提交平台结算情况统计的bug

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

@@ -19,28 +19,26 @@
 
     <select id="queryUserDataPage" resultType="com.ydtech.modules.admin.model.dto.DxReportDataDto">
         SELECT
-            t1.id AS userId,
-            t1.NAME AS userName,
-            t1.mobile AS mobile,
-            t2.id AS deptId,
-            t2.`name` AS deptName,
-            t5.NAME AS groupName,
-            t5.id AS groupId,
-            zgd.zgd_user_id AS zgdUserId,
-            zzb.zzb_user_id AS zzdUserId,
-            dx.dx_user_id AS dxUserId
+        t1.id AS userId,
+        t1.NAME AS userName,
+        t1.mobile AS mobile,
+        t2.id AS deptId,
+        t2.`name` AS deptName,
+        t5.NAME AS groupName,
+        t5.id AS groupId,
+        zgd.zgd_user_id AS zgdUserId,
+        zzb.zzb_user_id AS zzdUserId,
+        dx.dx_user_id AS dxUserId
         FROM
-            sys_user t1
+        sys_user t1
         LEFT JOIN sys_dept t2 ON t1.dept_id = t2.id
         LEFT JOIN sys_user_link_dx_user_id dx ON t1.id = dx.user_id
         LEFT JOIN sys_user_link_dept_internal_agent t4 ON t4.user_id = t1.id
+        LEFT JOIN sys_dept_internal_agent   t5  on t4.sys_dept_internal_agent_id =t5.id
         LEFT JOIN sys_user_link_zgd_user_id zgd ON t1.id = zgd.user_id
         LEFT JOIN sys_user_link_zzb_user_id zzb ON t1.id = zzb.user_id
-        LEFT JOIN
-        (select t3.bind_dept_id,t4.id,t4.name from  sys_dept_internal_agent t3   left join sys_dept_internal_agent t4  on t4.parent_id =t3.id ) t5
-        ON t2.id = t5.bind_dept_id
         WHERE
-         t1.`status` = 1
+        t1.`status` = 1
         AND t1.dept_id= '9914D13'
         AND ( t1.id != '9914D1305' and t1.id != '9914D1316' )
         <if test='vo !=null  '>

src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

@@ -3380,6 +3380,7 @@
             LEFT JOIN ptl_agreement pa ON pa.id = a.agreement_id
         <where>
             pa.agreement_type = 1
+            AND a.is_not_car = '0'
             <if test="vo.dockingPerson !=null  and  vo.dockingPerson  !=''">
                 and pa.docking_person =#{vo.dockingPerson}
             </if>
@@ -3388,8 +3389,7 @@
             </if>
         </where>
         GROUP BY
-        pa.docking_person,
-        a.handling_fees_status
+        pa.docking_person
         order by  sum( a.all_fee_value ) - sum(case when a.handling_fees_status =1 then a.all_fee_value else 0 end) desc
     </select>
 
@@ -3404,6 +3404,7 @@
         LEFT JOIN ptl_agreement pa on pa.id= a.agreement_id
         <where>
             pa.agreement_type = 1
+            AND a.is_not_car = '0'
             <if test="vo.dockingPerson !=null  and  vo.dockingPerson  !=''">
                 and pa.docking_person =#{vo.dockingPerson}
             </if>
@@ -3411,8 +3412,7 @@
         GROUP BY
         a.company_name,
         a.partner_companies_name,
-        pa.docking_person,
-        a.handling_fees_status
+        pa.docking_person
         order by  sum( a.all_fee_value ) - sum(case when a.handling_fees_status =1 then a.all_fee_value else 0 end) desc
     </select>
 </mapper>