Merge remote-tracking branch 'origin/test' into test

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

@@ -82,5 +82,9 @@ public class DxReportDataDto  implements Serializable {
     @ApiModelProperty(value = "")
     private  String zzdUserId;
 
-
+    /***
+     *  电销用户id
+     */
+    @ApiModelProperty(value = "")
+    private  String  dxUserId;
 }

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

@@ -143,7 +143,7 @@ public class DxDataServiceImpl implements DxDataService {
                 dxReportDataDto.setUserName(user.getUserName());
 
                 //通过用户id查询电销数据
-                DxDataDto dxData = getDataByPost(new DxDataVo(dxReportDataDto.getUserId(),dxReportDataDto.getDateTime()), dxApiConfigurationProperties.getFindDataUserIdAndDayUrl());
+                DxDataDto dxData = getDataByPost(new DxDataVo(dxReportDataDto.getDxUserId(),dxReportDataDto.getDateTime()), dxApiConfigurationProperties.getFindDataUserIdAndDayUrl());
                 if (dxData != null) {
                     dxReportDataDto.setExhaleDuration(dxData.getExhaleDuration());
                     dxReportDataDto.setOutgoingCallsNumber(dxData.getOutgoingCallsNumber());

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

@@ -99,10 +99,12 @@
         t3.NAME AS groupName,
         t3.id AS groupId,
         zgd.zgd_user_id AS zgdUserId,
-        zzb.zzb_user_id AS zzdUserId
+        zzb.zzb_user_id AS zzdUserId,
+        dx.dial_username 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_dept_internal_agent t4 ON t4.user_id = t1.id
         LEFT JOIN sys_dept_internal_agent t3 ON t2.id = t3.bind_dept_id
         LEFT JOIN sys_user_link_zgd_user_id zgd ON t2.id = zgd.user_id

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

@@ -40,7 +40,7 @@
                 AND su.id = #{vo.userId}
             </if>
             <if test="vo.deptId != null and vo.deptId != ''">
-                AND su.dept_id like CONCAT('%', #{deptId}, '%')
+                AND su.dept_id like CONCAT('%', #{vo.deptId}, '%')
             </if>
         </where>
           order by su.id

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

@@ -40,7 +40,7 @@
                 AND su.id = #{vo.userId}
             </if>
             <if test="vo.deptId != null and vo.deptId != ''">
-                AND su.dept_id like CONCAT('%', #{deptId}, '%')
+                AND su.dept_id like CONCAT('%', #{vo.deptId}, '%')
             </if>
         </where>
         order by su.id