修改电销数据相关bug

src/main/java/com/ydtech/modules/admin/dao/KhglZzbDataMapper.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-@DS("khglzgb")
+@DS("khglzzb")
 public interface KhglZzbDataMapper extends BaseMapper<KhglDataDto> {
     /**
      *  @version

src/main/java/com/ydtech/modules/admin/model/dto/KhglDataDto.java

@@ -26,4 +26,5 @@ public class KhglDataDto {
      */
     @ApiModelProperty(value = "微信人数")
     private  Integer wxCount;
+
 }

src/main/java/com/ydtech/modules/admin/service/impl/DxDataServiceImpl.java

@@ -99,14 +99,14 @@ public class DxDataServiceImpl implements DxDataService {
                 //查询掌柜鼎 + 掌中保的数据的企业微信数据
                 String zgdUserId = dxReportDataDto.getZgdUserId();
                 String zzdUserId = dxReportDataDto.getZzdUserId();
-                if (StringUtils.isNotBlank(zgdUserId)) {
-                    KhglDataDto zzbDto = khglZzbDataService.findByUserId(new KhglDataVo(zgdUserId, dxQueryVo.getBeginDate(), dxQueryVo.getEndDate()));
+                if (StringUtils.isNotBlank(zzdUserId)) {
+                    KhglDataDto zzbDto = khglZzbDataService.findByUserId(new KhglDataVo(zzdUserId, dxQueryVo.getBeginDate(), dxQueryVo.getEndDate()));
                     if (zzbDto != null && zzbDto.getWxCount() != null) {
                         qywx_zzb += zzbDto.getWxCount();
                     }
                 }
                 if (StringUtils.isNotBlank(zgdUserId)) {
-                    KhglDataDto zgdDto = khglZgdDataService.findByUserId(new KhglDataVo(zzdUserId, dxQueryVo.getBeginDate(), dxQueryVo.getEndDate()));
+                    KhglDataDto zgdDto = khglZgdDataService.findByUserId(new KhglDataVo(zgdUserId, dxQueryVo.getBeginDate(), dxQueryVo.getEndDate()));
                     if (zgdDto != null && zgdDto.getWxCount() != null) {
                         qywx_zgd += zgdDto.getWxCount();
                     }
@@ -171,14 +171,14 @@ public class DxDataServiceImpl implements DxDataService {
                 //查询掌柜鼎 + 掌中保的数据的企业微信数据
                 String zgdUserId = dxReportDataDto.getZgdUserId();
                 String zzdUserId = dxReportDataDto.getZzdUserId();
-                if (StringUtils.isNotBlank(zgdUserId)) {
-                    KhglDataDto zzbDto = khglZzbDataService.findByUserId(new KhglDataVo(zgdUserId, dxReportDataDto.getDateTime()));
+                if (StringUtils.isNotBlank(zzdUserId)) {
+                    KhglDataDto zzbDto = khglZzbDataService.findByUserId(new KhglDataVo(zzdUserId, dxReportDataDto.getDateTime()));
                     if (zzbDto != null && zzbDto.getWxCount() != null) {
                         qywx_zzb += zzbDto.getWxCount();
                     }
                 }
                 if (StringUtils.isNotBlank(zgdUserId)) {
-                    KhglDataDto zgdDto = khglZgdDataService.findByUserId(new KhglDataVo(zzdUserId, dxReportDataDto.getDateTime()));
+                    KhglDataDto zgdDto = khglZgdDataService.findByUserId(new KhglDataVo(zgdUserId, dxReportDataDto.getDateTime()));
                     if (zgdDto != null && zgdDto.getWxCount() != null) {
                         qywx_zgd += zgdDto.getWxCount();
 

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

@@ -28,8 +28,7 @@
 
     <select id="findByUserId" resultType="com.ydtech.modules.admin.model.dto.KhglDataDto">
         SELECT
-            SUM( CASE WHEN wc.customer_type = 1 THEN 1 ELSE 0 END ) AS wxCount,
-            SUM( CASE WHEN wc.customer_type = 2 THEN 1 ELSE 0 END ) AS qywxCount
+            ifNULL(count(0),0) AS wxCount
         FROM
             we_customer wc
                 LEFT JOIN sys_user su ON wc.add_user_id = su.we_user_id

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

@@ -27,7 +27,7 @@
 
     <select id="findByUserId" resultType="com.ydtech.modules.admin.model.dto.KhglDataDto">
         SELECT
-           ifNULL(count(0),0) AS qywxCount
+           ifNULL(count(0),0) AS wxCount
         FROM
             we_customer wc
                 LEFT JOIN sys_user su ON wc.add_user_id = su.we_user_id

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

@@ -46,7 +46,6 @@
         LEFT JOIN sys_dept_internal_agent t4 ON t4.parent_id = t3.id
         LEFT JOIN  sys_dept  dept  on t3.bind_dept_id = dept.id
         <where>
-            t3.bind_dept_id  is not null
             <if test="comtype != null and comtype != ''">
                 AND t4.comtype = #{comtype}
             </if>

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

@@ -28,14 +28,14 @@
             t5.id AS groupId,
             zgd.zgd_user_id AS zgdUserId,
             zzb.zzb_user_id AS zzdUserId,
-            dx.dial_username AS dxUserId
+            dx.dx_user_id AS dxUserId
         FROM
             sys_user t1
         LEFT JOIN sys_dept t2 ON t1.dept_id = t2.id
-        LEFT JOIN sys_user_is_dial dx ON t1.id = dx.user_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_user_link_zgd_user_id zgd ON t2.id = zgd.user_id
-        LEFT JOIN sys_user_link_zzb_user_id zzb ON t2.id = zzb.user_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.parent_id = t5.bind_dept_id
@@ -105,14 +105,14 @@
             t5.id AS groupId,
             zgd.zgd_user_id AS zgdUserId,
             zzb.zzb_user_id AS zzdUserId,
-            dx.dial_username AS dxUserId
+            dx.dx_user_id AS dxUserId
         FROM
             sys_user t1
                 LEFT JOIN sys_dept t2 ON t1.dept_id = t2.id
-                LEFT JOIN sys_user_is_dial dx ON t1.id = dx.user_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_user_link_zgd_user_id zgd ON t2.id = zgd.user_id
-                LEFT JOIN sys_user_link_zzb_user_id zzb ON t2.id = zzb.user_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.parent_id = t5.bind_dept_id