电销添加企业微信数据

src/main/java/com/ydtech/modules/admin/controller/SysTelemarketingController.java

@@ -0,0 +1,75 @@
+package com.ydtech.modules.admin.controller;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.admin.model.po.SysTelemarketingWechatData;
+import com.ydtech.modules.admin.model.vo.SysTelemarketingWechatDataSaveVo;
+import com.ydtech.modules.admin.model.vo.SysTelemarketingWechatDataVo;
+import com.ydtech.modules.admin.service.SysTelemarketingWechatDataService;
+import com.ydtech.modules.base.controller.BaseController;
+import com.ydtech.modules.order.entity.BasePageResult;
+import com.ydtech.modules.protocol.utils.AssertionUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+
+@Api(tags = "电销管理")
+@RestController
+@RequestMapping("/sys/telemarketing")
+@RequiredArgsConstructor
+public class SysTelemarketingController {
+
+    private final SysTelemarketingWechatDataService sysTelemarketingWechatDataService;
+
+    @PostMapping("/page")
+    @ApiOperation("电销数据分页查询")
+    public HttpResult<BasePageResult<SysTelemarketingWechatData>> page(@RequestBody SysTelemarketingWechatDataVo sysTelemarketingWechatDataVo) {
+        Page<SysTelemarketingWechatData> page = new Page<>(sysTelemarketingWechatDataVo.getPageNum(), sysTelemarketingWechatDataVo.getPageSize());
+        String userId = BaseController.getUserId();
+        Page<SysTelemarketingWechatData> sysTelemarketingWechatDataPage = sysTelemarketingWechatDataService
+                .lambdaQuery()
+                .eq(SysTelemarketingWechatData::getUserId, userId)
+                .page(page);
+
+        BasePageResult<SysTelemarketingWechatData> basePageResult = new BasePageResult<>(
+                sysTelemarketingWechatDataVo.getPageNum(),
+                sysTelemarketingWechatDataVo.getPageSize(),
+                sysTelemarketingWechatDataPage.getTotal(),
+                sysTelemarketingWechatDataPage.getPages(),
+                sysTelemarketingWechatDataPage.getRecords());
+
+        return HttpResult.ok(basePageResult);
+    }
+
+    @PostMapping
+    @ApiOperation("电销数据添加")
+    public HttpResult<Object> add(@RequestBody SysTelemarketingWechatDataSaveVo sysTelemarketingWechatDataSaveVo) {
+
+        sysTelemarketingWechatDataService.checkData(sysTelemarketingWechatDataSaveVo.getCreateTime());
+
+        SysTelemarketingWechatData sysTelemarketingWechatData = new SysTelemarketingWechatData();
+        BeanUtils.copyProperties(sysTelemarketingWechatDataSaveVo, sysTelemarketingWechatData);
+        String userId = BaseController.getUserId();
+        sysTelemarketingWechatData.setUserId(userId);
+        boolean save = sysTelemarketingWechatDataService.save(sysTelemarketingWechatData);
+        AssertionUtils.isSucceed(save, "添加失败");
+        return HttpResult.ok("添加成功");
+    }
+
+    @PutMapping("{telemarketingId}")
+    @ApiOperation("电销数据添加")
+    public HttpResult<Object> revise(@RequestBody SysTelemarketingWechatDataSaveVo sysTelemarketingWechatDataSaveVo, @PathVariable String telemarketingId) {
+        SysTelemarketingWechatData sysTelemarketingWechatData = sysTelemarketingWechatDataService.getByIdExist(telemarketingId, "查询不到此数据");
+        BeanUtils.copyProperties(sysTelemarketingWechatDataSaveVo, sysTelemarketingWechatData);
+        sysTelemarketingWechatData.setUpdateTime(new Date());
+        boolean b = sysTelemarketingWechatDataService.updateById(sysTelemarketingWechatData);
+        AssertionUtils.isSucceed(b, "修改失败");
+        return HttpResult.ok("修改成功");
+    }
+
+}

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

@@ -0,0 +1,18 @@
+package com.ydtech.modules.admin.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.admin.model.po.SysTelemarketingWechatData;
+
+/**
+* @author Administrator
+* @description 针对表【sys_telemarketing_wechat_data(微信提交数据)】的数据库操作Mapper
+* @createDate 2024-08-29 17:23:42
+* @Entity generator.domain.SysTelemarketingWechatData
+*/
+public interface SysTelemarketingWechatDataMapper extends BaseMapper<SysTelemarketingWechatData> {
+
+}
+
+
+
+

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

@@ -137,15 +137,15 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
     /**
      * 获取用户列表
-     * @param page 分页信息
-     * @param sysUser   查询条件
-     * @param containsSubDept   是否包含下级机构
+     *
+     * @param page            分页信息
+     * @param sysUser         查询条件
+     * @param containsSubDept 是否包含下级机构
      * @return
      */
     public IPage<SysUser> selectUserPage(Page page, @Param("sysUser") SysUser sysUser, @Param("containsSubDept") String containsSubDept);
 
 
-
     //    @Select("select count(1) " + selectUserFromSql + selectUserFromWhereSql)
     @Select({"<script>", "select count(1) ", selectUserFromSql, selectUserFromWhereSql, "</script>"})
     int gainUserBaseInfoCount(@Param("page") PageDto pageDto);
@@ -159,247 +159,289 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
             " WHERE sur.role_id = #{roleId} and u.status=1 " +
             "<if test='userId!=\"\" '>" +
             "   and u.id=#{userId} " +
-            "</if> " ;
+            "</if> ";
 
-    @Select({"<script>",selectSql,"</script>"})
-    List<SysUser> findAllAgentRoleUser(@Param("userId") String userId,@Param("roleId") String roleId);
+    @Select({"<script>", selectSql, "</script>"})
+    List<SysUser> findAllAgentRoleUser(@Param("userId") String userId, @Param("roleId") String roleId);
 
-    List<QuTeamNum> getDept(@Param("quTeamNumDto")QuTeamNumDto quTeamNumDto);
+    List<QuTeamNum> getDept(@Param("quTeamNumDto") QuTeamNumDto quTeamNumDto);
 
-    List<QuTeamNum> getDeptByCompany(@Param("quTeamNumDto")QuTeamNumDto quTeamNumDto);
+    List<QuTeamNum> getDeptByCompany(@Param("quTeamNumDto") QuTeamNumDto quTeamNumDto);
 
-    List<QuTeamNum> getUser(@Param("quTeamNumDto")QuTeamNumDto quTeamNumDto);
+    List<QuTeamNum> getUser(@Param("quTeamNumDto") QuTeamNumDto quTeamNumDto);
 
     List<QuUserNum> getUserNum(@Param("quUserNumDto") QuUserNumDto quUserNumDto);
+
     List<QuUserNum> getMainWaitAuditSum(@Param("quUserNumDto") QuUserNumDto quUserNumDto);
+
     List<QuUserNum> getMainWaitPaySum(@Param("quUserNumDto") QuUserNumDto quUserNumDto);
+
     List<QuUserNum> getMainAcceptInsuranceSum(@Param("quUserNumDto") QuUserNumDto quUserNumDto);
 
 //    List<QuUserNum> getMainOrderDetails(@Param("quUserNumDto") QuUserNumDto quUserNumDto);
 
     List<QuUserNum> getUserByCompany(@Param("quUserNumDto") QuUserNumDto quUserNumDto);
+
     List<QuUserNum> getComMainWaitAuditSum(@Param("quUserNumDto") QuUserNumDto quUserNumDto);
+
     List<QuUserNum> getComMainWaitPaySum(@Param("quUserNumDto") QuUserNumDto quUserNumDto);
+
     List<QuUserNum> getComMainAcceptInsuranceSum(@Param("quUserNumDto") QuUserNumDto quUserNumDto);
 
     List<QuUserNum> getUserDetail(@Param("quUserNumDto") QuUserNumDto quUserNumDto);
+
     List<QuUserNum> getUserMainWaitAuditSum(@Param("quUserNumDto") QuUserNumDto quUserNumDto);
+
     List<QuUserNum> getUserMainWaitPaySum(@Param("quUserNumDto") QuUserNumDto quUserNumDto);
+
     List<QuUserNum> getUserMainAcceptInsuranceSum(@Param("quUserNumDto") QuUserNumDto quUserNumDto);
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/15 17:51
-     *  @Description: 添加查询后线人员
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/15 17:51
+     * @Description: 添加查询后线人员
      */
-    String findQXUserSql=" SELECT  t1.id AS userId,t1.NAME AS NAME,t1.mobile AS mobile,t1.`status` AS `status`,t2.id AS deptId,t2.`name` AS deptName,sd2.id AS pDeptId,sd2.`name` AS pDeptName  " +
+    String findQXUserSql = " SELECT  t1.id AS userId,t1.NAME AS NAME,t1.mobile AS mobile,t1.`status` AS `status`,t2.id AS deptId,t2.`name` AS deptName,sd2.id AS pDeptId,sd2.`name` AS pDeptName  " +
             " FROM sys_user t1 LEFT JOIN sys_dept t2 ON t1.dept_id = t2.id LEFT JOIN sys_dept sd2 ON sd2.id = t2.parent_id " +
-             " WHERE t1.`status` = 1 AND t1.id not LIKE '%M%' "+
-              "<if test='userId!=\"\" and userId!=null '>" +
-                      "   AND t1.id=#{userId} " +
-               "</if> ";
-    @Select({"<script>",findQXUserSql,"</script>"})
+            " WHERE t1.`status` = 1 AND t1.id not LIKE '%M%' " +
+            "<if test='userId!=\"\" and userId!=null '>" +
+            "   AND t1.id=#{userId} " +
+            "</if> ";
+
+    @Select({"<script>", findQXUserSql, "</script>"})
     List<SysUserBaseVO> findQXUserList(@Param("userId") String userId);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/16 16:25
-     *  @Description: 通过工号、姓名、手机号查询工号信息
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/16 16:25
+     * @Description: 通过工号、姓名、手机号查询工号信息
      */
     List<SysUserBaseVO> getAllUsersByHospitality(@Param("user") SysUserVOExt sysUserVOExt);
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/16 16:25
-     *  @Description: 查询领导人为用户id的数据
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/16 16:25
+     * @Description: 查询领导人为用户id的数据
      */
     @Select(" SELECT  t1.id AS userId,t1.NAME AS NAME,t1.mobile AS mobile,t1.`status` AS `status`,t2.id AS deptId,t2.`name` AS deptName,sd2.id AS pDeptId,sd2.`name` AS pDeptName  " +
             " FROM sys_user t1 LEFT JOIN sys_dept t2 ON t1.dept_id = t2.id LEFT JOIN sys_dept sd2 ON sd2.id = t2.parent_id " +
             " WHERE t1.`status` = 1 AND t1.leader_id = #{userId}")
     List<SysUserBaseVO> getAllUsersByLeaderId(@Param("userId") String userId);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/17 16:55
-     *  @Description:  查询所有的代理人
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/17 16:55
+     * @Description: 查询所有的代理人
      */
     @Select(" SELECT su.id FROM  sys_user su  LEFT JOIN sys_user_info info ON info.id = su.id  LEFT JOIN sys_dept sd ON su.dept_id = sd.id " +
             " LEFT JOIN sys_dept psd ON psd.id = sd.parent_id   LEFT JOIN sys_user_role t3 ON su.id = t3.user_id  LEFT JOIN sys_role t4 ON t3.role_id = t4.id  " +
             " AND sd.del_flag = '0'  and su.status = 1 " +
             " WHERE  su.dept_id LIKE concat( '%', 9, '%' )    AND t3.role_id IN ( 20 )  AND sd.management_source = 2")
     List<String> getAgentUserIds();
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/18 16:15
-     *  @Description: 获取客服人员数据
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/18 16:15
+     * @Description: 获取客服人员数据
      */
     List<SysUserBaseVO> getCustomerUsers(@Param("user") SysUserVOExt sysUserVOExt);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/23 10:49
-     *  @Description: 通过用户id和角色ids查询机构ids
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/23 10:49
+     * @Description: 通过用户id和角色ids查询机构ids
      */
     List<String> getDeptIdsByRoleIdsAndUserIds(@Param("userIds") List<String> agentUserIds, @Param("roleIds") List<String> roleIds);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/23 11:39
-     *  @Description: 查询后线人员+分页
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/23 11:39
+     * @Description: 查询后线人员+分页
      */
     Page<SysUserBaseVO> findUserListByPage(@Param("page") Page<SysUserBaseVO> page, @Param("user") SysUserDto sysUserDto);
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/16 16:25
-     *  @Description: 查询领导人为用户id的数据ids数据
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/16 16:25
+     * @Description: 查询领导人为用户id的数据ids数据
      */
-    @Select(" SELECT  t1.id  FROM sys_user t1 WHERE t1.`status` = 1 AND t1.leader_id = #{userId}" )
+    @Select(" SELECT  t1.id  FROM sys_user t1 WHERE t1.`status` = 1 AND t1.leader_id = #{userId}")
     List<String> getUserIdsByLeaderId(@Param("userId") String userId);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/25 8:50
-     *  @Description: 通过当前的用户查询渠道下的团队长的的管理的部门ids
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/25 8:50
+     * @Description: 通过当前的用户查询渠道下的团队长的的管理的部门ids
      */
     List<String> getDeptIdsByUserIds(@Param("userId") String userId);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/26 17:25
-     *  @Description: 查询用户分页+区域标志显示
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/26 17:25
+     * @Description: 查询用户分页+区域标志显示
      */
     Page<SysUserBaseVO> findUserListByAreaPage(@Param("page") Page<SysUserBaseVO> page, @Param("user") SysUserDto sysUserDto);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/27 09:55
-     *  @Description:  查询所有的代理人
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/27 09:55
+     * @Description: 查询所有的代理人
      */
     List<SysUserBaseVO> getAgentUserList();
 
 
     List<SysUserBaseVO> getAgentUserIdsByAreaIds();
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/5/7 10:45
-     *  @Description:  通过角色id和部门id查询是否存在团队长
+     * @version
+     * @author: hxl
+     * @Date: 2024/5/7 10:45
+     * @Description: 通过角色id和部门id查询是否存在团队长
      */
     int getCountByDeptAndRoleId(@Param("user") SysUser sysUserVo);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/5/7 11:46
-     *  @Description: 查询该部门的渠道团队长
+     * @version
+     * @author: hxl
+     * @Date: 2024/5/7 11:46
+     * @Description: 查询该部门的渠道团队长
      */
     String findTDZUserIdByDeptId(@Param("deptId") String deptId);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/28 9:34
-     *  @Description: 通过机构查询统计数据
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/28 9:34
+     * @Description: 通过机构查询统计数据
      */
     HashMap<String, String> findSumCountAndAvgAge(@Param("deptId") String deptId);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/28 9:48
-     *  @Description: 查询某个部门的学历分布
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/28 9:48
+     * @Description: 查询某个部门的学历分布
      */
     List<ReportDto> findEducationSumCount(@Param("deptId") String deptId);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/28 10:35
-     *  @Description: 查询团队长的总人数和平均年龄
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/28 10:35
+     * @Description: 查询团队长的总人数和平均年龄
      */
     HashMap<String, String> findQXTDSumCountAndAvgAge(@Param("deptId") String deptId);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/28 10:48
-     *  @Description: 查询代理人总数
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/28 10:48
+     * @Description: 查询代理人总数
      */
-    HashMap<String, String> findQXDLSumCountAndAvgAge(@Param("deptId") String deptId,@Param("type") String type);
+    HashMap<String, String> findQXDLSumCountAndAvgAge(@Param("deptId") String deptId, @Param("type") String type);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/7/5 16:39
-     *  @Description: 查询团队长区域分布
+     * @version
+     * @author: hxl
+     * @Date: 2024/7/5 16:39
+     * @Description: 查询团队长区域分布
      */
     List<ReportDto> findQXTDAreaSumCount(@Param("deptId") String deptId);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/7/5 16:43
-     *  @Description:  查询代理人的区域分布
+     * @version
+     * @author: hxl
+     * @Date: 2024/7/5 16:43
+     * @Description: 查询代理人的区域分布
      */
     List<ReportDto> findQXDLAreaSumCount(@Param("deptId") String deptId);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/7/5 16:47
-     *  @Description: 查询团队张的性别分布
+     * @version
+     * @author: hxl
+     * @Date: 2024/7/5 16:47
+     * @Description: 查询团队张的性别分布
      */
     List<ReportDto> findQXTDSexSumCount(@Param("deptId") String deptId);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/7/5 16:54
-     *  @Description: 查询代理人的性别分布
+     * @version
+     * @author: hxl
+     * @Date: 2024/7/5 16:54
+     * @Description: 查询代理人的性别分布
      */
     List<ReportDto> findQXDLSexSumCount(@Param("deptId") String deptId);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/7/5 16:56
-     *  @Description: 团队长维护人分布
+     * @version
+     * @author: hxl
+     * @Date: 2024/7/5 16:56
+     * @Description: 团队长维护人分布
      */
     List<ReportDto> findQXTDWhSumCount(@Param("deptId") String deptId);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/7/5 17:04
-     *  @Description: 代理人维护人分布
+     * @version
+     * @author: hxl
+     * @Date: 2024/7/5 17:04
+     * @Description: 代理人维护人分布
      */
     List<ReportDto> findQXDLWhSumCount(@Param("deptId") String deptId);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/7/5 17:11
-     *  @Description:  查询渠道数据
+     * @version
+     * @author: hxl
+     * @Date: 2024/7/5 17:11
+     * @Description: 查询渠道数据
      */
     List<QianLineQDPersonnelReportDto> queryQXQDReportData(@Param("deptId") String deptId);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/7/5 17:41
-     *  @Description:  查询该机构下的代理人
+     * @version
+     * @author: hxl
+     * @Date: 2024/7/5 17:41
+     * @Description: 查询该机构下的代理人
      */
     List<SysUser> findQXDLUserList(@Param("deptId") String deptId, @Param("type") String type);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/7/11 16:09
-     *  @Description:  查询所有的后线人员
+     * @version
+     * @author: hxl
+     * @Date: 2024/7/11 16:09
+     * @Description: 查询所有的后线人员
      */
     List<SysUser> findHxUserList();
+
     @Select("select id   from  sys_user  where   status ='1' ")
     List<String> getUserIds();
 
-    HashMap<String,Object> queryHXReportDataNew( @Param("vo")  HouLinePersonnelReportVo houLinePersonnelReportVo);
+    HashMap<String, Object> queryHXReportDataNew(@Param("vo") HouLinePersonnelReportVo houLinePersonnelReportVo);
 
-     IPage<QxFrontlineAgentDto> queryQxFrontlineAgent(@Param("page") Page page,@Param("vo") QxFrontlineAgentVo qxFrontlineAgentVo);
+    IPage<QxFrontlineAgentDto> queryQxFrontlineAgent(@Param("page") Page page, @Param("vo") QxFrontlineAgentVo qxFrontlineAgentVo);
 
     IPage<QxFrontlineAgentDto> getByIdsList(@Param("page") Page page, @Param("vo") QxFrontlineAgentVo qxFrontlineAgentVo);
 
 
     SysUser getByUserId(String userId);
+
+    /**
+     * 获取电销人员的用户名
+     *
+     * @param userId 用户名
+     * @return 电销人员工号列表
+     */
+    List<String> getTelemarketingPersonnelUserId(@Param("userId") String userId);
 }
 
 

src/main/java/com/ydtech/modules/admin/model/po/SysTelemarketingWechatData.java

@@ -0,0 +1,96 @@
+package com.ydtech.modules.admin.model.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 微信提交数据
+ * @TableName sys_telemarketing_wechat_data
+ */
+@TableName(value ="sys_telemarketing_wechat_data")
+@Data
+public class SysTelemarketingWechatData implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 用户id
+     */
+    @TableField(value = "user_id")
+    private String userId;
+
+    /**
+     * 添加企业微信数量
+     */
+    @TableField(value = "number")
+    private Integer number;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "update_time")
+    private Date updateTime;
+
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        SysTelemarketingWechatData other = (SysTelemarketingWechatData) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
+            && (this.getNumber() == null ? other.getNumber() == null : this.getNumber().equals(other.getNumber()))
+            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
+        result = prime * result + ((getNumber() == null) ? 0 : getNumber().hashCode());
+        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", userId=").append(userId);
+        sb.append(", number=").append(number);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,27 @@
+package com.ydtech.modules.admin.model.vo;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SysTelemarketingWechatDataSaveVo implements Serializable {
+
+    private static final long serialVersionUID = 2698136338943221933L;
+
+    @ApiModelProperty("添加企业微信数量")
+    private Integer number;
+
+    @ApiModelProperty("创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+}

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

@@ -0,0 +1,28 @@
+package com.ydtech.modules.admin.model.vo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ydtech.core.page.BasePageVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SysTelemarketingWechatDataVo extends BasePageVO {
+
+    private static final long serialVersionUID = 5683859929949061777L;
+
+    @ApiModelProperty("开始时间")
+    private String startTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
+}

src/main/java/com/ydtech/modules/admin/service/SysTelemarketingWechatDataService.java

@@ -0,0 +1,32 @@
+package com.ydtech.modules.admin.service;
+
+import com.ydtech.extension.BaseIService;
+import com.ydtech.modules.admin.model.po.SysTelemarketingWechatData;
+import com.ydtech.modules.protocol.utils.AssertionUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description 针对表【sys_telemarketing_wechat_data(微信提交数据)】的数据库操作Service
+ * @createDate 2024-08-29 17:23:42
+ */
+public interface SysTelemarketingWechatDataService extends BaseIService<SysTelemarketingWechatData> {
+
+    /**
+     * 校验此人是否已经添加了数据
+     *
+     * @param date 添加日期
+     */
+    default void checkData(Date date) {
+        List<SysTelemarketingWechatData> list = lambdaQuery()
+                .eq(SysTelemarketingWechatData::getCreateTime, date)
+                .list();
+        String dateStr = new SimpleDateFormat("yyyy-MM-dd").format(date);
+        AssertionUtils.isSucceed(!list.isEmpty(), "日期为：" + dateStr + "添加了日期");
+
+    }
+
+}

src/main/java/com/ydtech/modules/admin/service/SysUserService.java

@@ -224,6 +224,12 @@ public interface SysUserService extends BaseIService<SysUser> {
 
     SysUser getByUserId(String userid);
 
+    /**
+     * 获取电销人员的id
+     * @param userId 用户id
+     * @return
+     */
+    List<String> getTelemarketingPersonnelData(String userId);
 }
 
 

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

@@ -0,0 +1,22 @@
+package com.ydtech.modules.admin.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.modules.admin.dao.SysTelemarketingWechatDataMapper;
+import com.ydtech.modules.admin.model.po.SysTelemarketingWechatData;
+import com.ydtech.modules.admin.service.SysTelemarketingWechatDataService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【sys_telemarketing_wechat_data(微信提交数据)】的数据库操作Service实现
+* @createDate 2024-08-29 17:23:42
+*/
+@Service
+public class SysTelemarketingWechatDataServiceImpl extends ServiceImpl<SysTelemarketingWechatDataMapper, SysTelemarketingWechatData>
+    implements SysTelemarketingWechatDataService {
+
+}
+
+
+
+

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

@@ -1602,4 +1602,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public SysUser getByUserId(String userid){
         return baseMapper.getByUserId(userid);
     }
+
+    @Override
+    public List<String> getTelemarketingPersonnelData(String userId) {
+        baseMapper.getTelemarketingPersonnelUserId(userId);
+        return Collections.emptyList();
+    }
 }

src/main/java/com/ydtech/modules/order/controller/InsOrdersController.java

@@ -204,88 +204,102 @@ public class InsOrdersController extends BaseController {
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/17 15:32
-     *  @Description: 添加待客录单查询订单接口
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/17 15:32
+     * @Description: 添加待客录单查询订单接口
      */
     @PostMapping("/queryPageHospitalityOrder")
     @ApiOperation(value = "通过用户id和订单状态查询待客录单接口+分页")
-    public HttpResult<BasePageResult<InsOrders>> queryPageHospitalityOrder(@RequestBody  OrderQueryVo orderQueryVo) {
-        if(orderQueryVo.getUserId()==null || "".equals(orderQueryVo.getUserId())){
+    public HttpResult<BasePageResult<InsOrders>> queryPageHospitalityOrder(@RequestBody OrderQueryVo orderQueryVo) {
+        if (orderQueryVo.getUserId() == null || "".equals(orderQueryVo.getUserId())) {
             return HttpResult.error("待客录单人员id不能为空");
         }
-        try{
+        try {
             //前台传的部门不对赋值null
             orderQueryVo.setDeptId(null);
             BasePageResult<InsOrders> quoteResult = this.insOrdersService.queryPageHospitalityOrder(orderQueryVo);
             return HttpResult.ok("success", quoteResult);
-        }catch (Exception e){
-            return HttpResult.error("查询失败"+e.getMessage());
+        } catch (Exception e) {
+            return HttpResult.error("查询失败" + e.getMessage());
         }
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/17 15:32
-     *  @Description: 通过用户id和订单状态查询关联渠道的订单数据+分页
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/17 15:32
+     * @Description: 通过用户id和订单状态查询关联渠道的订单数据+分页
      */
     @AntiReptile
     @PostMapping("/queryPageHospitalityByChannel")
     @ApiOperation(value = "通过用户id和订单状态查询关联渠道的订单数据+分页")
-    public HttpResult<Object> queryPageHospitalityByChannel(@RequestBody  OrderQueryVo orderQueryVo) {
-        if(orderQueryVo.getUserId()==null || "".equals(orderQueryVo.getUserId())){
+    public HttpResult<Object> queryPageHospitalityByChannel(@RequestBody OrderQueryVo orderQueryVo) {
+        if (orderQueryVo.getUserId() == null || "".equals(orderQueryVo.getUserId())) {
             return HttpResult.error("待客录单人员id不能为空");
         }
-        try{
+        try {
             BasePageResult<InsOrders> quoteResult = this.insOrdersService.queryPageOrderByLinkType(orderQueryVo, OrderLinkTypeConstants.ORDER_LINK_TYPE_CONSTANTS_1.getCode());
             return HttpResult.ok("success", quoteResult);
-        }catch (Exception e){
-            return HttpResult.error("查询失败"+e.getMessage());
+        } catch (Exception e) {
+            return HttpResult.error("查询失败" + e.getMessage());
         }
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/17 15:32
-     *  @Description: 通过用户id和订单状态查询关联代理人的订单数据+分页
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/17 15:32
+     * @Description: 通过用户id和订单状态查询关联代理人的订单数据+分页
      */
     @AntiReptile
     @PostMapping("/queryPageHospitalityLinkagent")
     @ApiOperation(value = "通过用户id和订单状态查询关联代理人的订单数据+分页")
-    public HttpResult<Object> queryPageHospitalityLinkagent(@RequestBody  OrderQueryVo orderQueryVo) {
-        if(orderQueryVo.getUserId()==null || "".equals(orderQueryVo.getUserId())){
+    public HttpResult<Object> queryPageHospitalityLinkagent(@RequestBody OrderQueryVo orderQueryVo) {
+        if (orderQueryVo.getUserId() == null || "".equals(orderQueryVo.getUserId())) {
             return HttpResult.error("待客录单人员id不能为空");
         }
-        try{
-            BasePageResult<InsOrders> quoteResult = this.insOrdersService.queryPageOrderByLinkType(orderQueryVo,OrderLinkTypeConstants.ORDER_LINK_TYPE_CONSTANTS_2.getCode());
+        try {
+            BasePageResult<InsOrders> quoteResult = this.insOrdersService.queryPageOrderByLinkType(orderQueryVo, OrderLinkTypeConstants.ORDER_LINK_TYPE_CONSTANTS_2.getCode());
             return HttpResult.ok("success", quoteResult);
-        }catch (Exception e){
-            return HttpResult.error("查询失败"+e.getMessage());
+        } catch (Exception e) {
+            return HttpResult.error("查询失败" + e.getMessage());
         }
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/17 15:32
-     *  @Description: 通过用户id和订单状态查询关联保险公司的订单数据+分页
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/17 15:32
+     * @Description: 通过用户id和订单状态查询关联保险公司的订单数据+分页
      */
     @AntiReptile
     @PostMapping("/queryPageHospitalityByInsuranceCompany")
     @ApiOperation(value = "通过用户id和订单状态查询关联保险公司的订单数据+分页")
-    public HttpResult<Object> queryPageHospitalityByInsuranceCompany(@RequestBody  OrderQueryVo orderQueryVo) {
-        if(orderQueryVo.getUserId()==null || "".equals(orderQueryVo.getUserId())){
+    public HttpResult<Object> queryPageHospitalityByInsuranceCompany(@RequestBody OrderQueryVo orderQueryVo) {
+        if (orderQueryVo.getUserId() == null || "".equals(orderQueryVo.getUserId())) {
             return HttpResult.error("待客录单人员id不能为空");
         }
         //if(orderQueryVo.getOrderStatus()==null || "".equals(orderQueryVo.getOrderStatus())){
         //   return HttpResult.error("订单状态不能为空");
         // }
-        try{
-            BasePageResult<InsOrders> quoteResult = this.insOrdersService.queryPageOrderByLinkType(orderQueryVo,OrderLinkTypeConstants.ORDER_LINK_TYPE_CONSTANTS_3.getCode());
+        try {
+            BasePageResult<InsOrders> quoteResult = this.insOrdersService.queryPageOrderByLinkType(orderQueryVo, OrderLinkTypeConstants.ORDER_LINK_TYPE_CONSTANTS_3.getCode());
             return HttpResult.ok("success", quoteResult);
-        }catch (Exception e){
-            return HttpResult.error("查询失败"+e.getMessage());
+        } catch (Exception e) {
+            return HttpResult.error("查询失败" + e.getMessage());
+        }
+    }
+
+    @AntiReptile
+    @PostMapping("/queryPageTelemarketingLinkAgent")
+    @ApiOperation(value = "通过用户id和订单状态查询电销人员的订单数据+分页")
+    public HttpResult<Object> queryPageTelemarketingLinkAgent(@RequestBody OrderQueryVo orderQueryVo) {
+        try {
+            BasePageResult<InsOrders> quoteResult = this.insOrdersService.queryPageOrderByLinkType(orderQueryVo, OrderLinkTypeConstants.ORDER_LINK_TYPE_CONSTANTS_4.getCode());
+            return HttpResult.ok("success", quoteResult);
+        } catch (Exception e) {
+            return HttpResult.error("查询失败" + e.getMessage());
         }
     }
 
@@ -295,30 +309,31 @@ public class InsOrdersController extends BaseController {
         String userId = getUserId();
         return this.insOrdersService.getTaskByCompanyId(companyId, userId);
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/5/13 8:41
-     *  @Description: 批量更新子订单的险种信息
+     * @version
+     * @author: hxl
+     * @Date: 2024/5/13 8:41
+     * @Description: 批量更新子订单的险种信息
      */
     @GetMapping("/updateBatchPruductById")
     @ApiOperation(value = "批量更新子订单的险种信息")
-    public HttpResult updateBatchPruductById( String subOrderId) {
+    public HttpResult updateBatchPruductById(String subOrderId) {
         return this.insAreaCompanyService.updateBatchPruductById(subOrderId);
     }
 
 
     @GetMapping("/getMobileByOrderNo")
     @ApiOperation(value = "通过订单号查询手机号码")
-    public HttpResult getMobileByOrderNo(String orderNo,String type){
+    public HttpResult getMobileByOrderNo(String orderNo, String type) {
         JSONObject result = new JSONObject();
-        String phone = insOrdersService.getMobileByOrderNo(orderNo,type);
-        result.put("phone",phone);
+        String phone = insOrdersService.getMobileByOrderNo(orderNo, type);
+        result.put("phone", phone);
         SysUserIsDial sysUserIsDial = sysUserIsDialService.getByUserId(getUserId());
-        if(sysUserIsDial != null) {
+        if (sysUserIsDial != null) {
             if (sysUserIsDial.getIsDial().equals("1")) {
-                result.put("username",sysUserIsDial.getDialUserName());
-                result.put("password",sysUserIsDial.getDialPassWord());
+                result.put("username", sysUserIsDial.getDialUserName());
+                result.put("password", sysUserIsDial.getDialPassWord());
             }
         }
         return HttpResult.ok(result);
@@ -326,112 +341,117 @@ public class InsOrdersController extends BaseController {
 
     /**
      * 获取快到期的保单
+     *
      * @return
      */
     @PostMapping("/getExpirationInsure")
     @ApiOperation(value = "获取快到期的保单")
-    public HttpResult getExpirationInsure(@RequestBody OrderExpirationQueryVo orderExpirationQueryVo){
+    public HttpResult getExpirationInsure(@RequestBody OrderExpirationQueryVo orderExpirationQueryVo) {
         Page page = buildPageRequest(orderExpirationQueryVo.getPageDto());
         orderExpirationQueryVo.setUserid(getUserId());
-        return HttpResult.ok(insOrdersService.getExpirationInsure(page,orderExpirationQueryVo));
+        return HttpResult.ok(insOrdersService.getExpirationInsure(page, orderExpirationQueryVo));
     }
 
 
     /**
      * 获取快到期的保单的数量
+     *
      * @return
      */
     @PostMapping("/getExpirationInsureCount")
     @ApiOperation(value = "获取快到期的保单数量")
-    public HttpResult getExpirationInsureCount(@RequestBody OrderExpirationQueryVo orderExpirationQueryVo){
+    public HttpResult getExpirationInsureCount(@RequestBody OrderExpirationQueryVo orderExpirationQueryVo) {
         orderExpirationQueryVo.setUserid(getUserId());
         return HttpResult.ok(insOrdersService.getExpirationInsureCount(orderExpirationQueryVo));
     }
 
     /**
      * 批单操作
+     *
      * @param batchOrderVo
      * @return
      */
     @PostMapping("/batchOrder")
     @ApiOperation(value = "批单")
-    public HttpResult batchOrder(@RequestBody BatchOrderVo batchOrderVo){
+    public HttpResult batchOrder(@RequestBody BatchOrderVo batchOrderVo) {
         boolean result = batchOrderService.batchOrder(batchOrderVo);
-        if(result){
+        if (result) {
             return HttpResult.ok("批单修改成功，等待审核");
-        }else{
+        } else {
             return HttpResult.error("批单修改失败");
         }
     }
 
     /**
      * 获取批单信息
+     *
      * @param subOrderNo
      * @return
      */
     @GetMapping("/getBatchOrder")
     @ApiOperation(value = "获取批单信息")
-    public HttpResult getBatchOrder(String subOrderNo){
+    public HttpResult getBatchOrder(String subOrderNo) {
         BatchOrder batchOrderBySubOrderNo = batchOrderService.getBatchOrderBySubOrderNo(subOrderNo);
-        if(batchOrderBySubOrderNo != null){
+        if (batchOrderBySubOrderNo != null) {
             return HttpResult.ok(batchOrderBySubOrderNo);
-        }else{
+        } else {
             return HttpResult.error("获取批单失败");
         }
     }
 
     @PostMapping("/getBatchOrderList")
     @ApiOperation(value = "获取批单列表")
-    public HttpResult getBatchOrderList(@RequestBody BatchOrderQueryVo batchOrderQueryVo){
+    public HttpResult getBatchOrderList(@RequestBody BatchOrderQueryVo batchOrderQueryVo) {
         Page page = buildPageRequest(batchOrderQueryVo.getPageDto());
-        if(batchOrderQueryVo.getIsAudit() == null){
+        if (batchOrderQueryVo.getIsAudit() == null) {
             batchOrderQueryVo.setIsAudit(0);
         }
-        return HttpResult.ok(batchOrderService.getBatchOrderList(page,batchOrderQueryVo));
+        return HttpResult.ok(batchOrderService.getBatchOrderList(page, batchOrderQueryVo));
     }
 
     @PostMapping("/getBtachOrderRejectList")
     @ApiOperation(value = "获取批单驳回列表")
-    public HttpResult getBatchOrderRejectList(@RequestBody BatchOrderQueryVo batchOrderQueryVo){
+    public HttpResult getBatchOrderRejectList(@RequestBody BatchOrderQueryVo batchOrderQueryVo) {
         Page page = buildPageRequest(batchOrderQueryVo.getPageDto());
         batchOrderQueryVo.setUserId(getUserId());
-        if(batchOrderQueryVo.getIsAudit() == null){
+        if (batchOrderQueryVo.getIsAudit() == null) {
             batchOrderQueryVo.setIsAudit(2);
         }
-        return HttpResult.ok(batchOrderService.getBatchOrderRejectList(page,batchOrderQueryVo));
+        return HttpResult.ok(batchOrderService.getBatchOrderRejectList(page, batchOrderQueryVo));
     }
 
     @PostMapping("/auditBatchOrder")
     @ApiOperation(value = "批单审核")
-    public HttpResult auditBatchOrder(@RequestBody BatchOrderAuditVo batchOrderAuditVo){
+    public HttpResult auditBatchOrder(@RequestBody BatchOrderAuditVo batchOrderAuditVo) {
         boolean result = batchOrderService.auditBatchOrder(batchOrderAuditVo);
-        if(result){
+        if (result) {
             return HttpResult.ok("批单审核成功");
-        }else{
+        } else {
             return HttpResult.error("批单审核失败");
         }
     }
 
     @PostMapping("/savePosition")
     @ApiOperation(value = "保存位置信息")
-    public HttpResult savePosition(@RequestBody InsAreaCompanyPosition insAreaCompanyPosition){
+    public HttpResult savePosition(@RequestBody InsAreaCompanyPosition insAreaCompanyPosition) {
         return HttpResult.ok(insAreaCompanyPositionService.save(insAreaCompanyPosition));
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/24 18:07
-     *  @Description: 通过子订单ids获取比价信息
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/24 18:07
+     * @Description: 通过子订单ids获取比价信息
      */
     @PostMapping("/getInquiryDetalsBySubOrderNos")
     @ApiOperation(value = "通过子订单ids获取比价信息")
-    public HttpResult<InquiryDetalsVo> getInquiryDetalsBySubOrderNos(@RequestBody InquiryDetalsQueryDto inquiryDetalsDto){
+    public HttpResult<InquiryDetalsVo> getInquiryDetalsBySubOrderNos(@RequestBody InquiryDetalsQueryDto inquiryDetalsDto) {
         return HttpResult.ok(insOrdersService.getInquiryDetalsBySubOrderIds(inquiryDetalsDto));
     }
 
     @PostMapping("/queryHxOrdersCount")
     @ApiOperation(value = "查询后线人员代课录单次数")
-    public HttpResult<IPage<QueryHxOrdersCountVo>> queryHxOrdersCount(@RequestBody QueryHxOrdersCountVo queryHxOrdersCountVo){
+    public HttpResult<IPage<QueryHxOrdersCountVo>> queryHxOrdersCount(@RequestBody QueryHxOrdersCountVo queryHxOrdersCountVo) {
         IPage<QueryHxOrdersCountVo> result = insOrdersService.queryHxOrdersCount(queryHxOrdersCountVo);
         return HttpResult.ok("success", result);
     }
@@ -446,7 +466,7 @@ public class InsOrdersController extends BaseController {
             Files.createDirectories(path);
         }
         String fileName = EasyExcelUtils.downExcel(uploadPath, "后线人员代课录单统计报表", QueryHxOrdersCountExcel.class, result);
-        return HttpResult.ok("",uploadUrl + "excel/" + fileName);
+        return HttpResult.ok("", uploadUrl + "excel/" + fileName);
     }
 
 

src/main/java/com/ydtech/modules/order/controller/InsTelemarketingOrderController.java

@@ -35,17 +35,17 @@ public class InsTelemarketingOrderController {
         return HttpResult.ok();
     }
 
-    @PostMapping("/submitAudit/{subOrderNo}")
+    @GetMapping("/submitAudit/{subOrderNo}")
     @ApiOperation(value = "提交审核")
     public HttpResult<Object> submitAudit(@PathVariable String subOrderNo){
         insTelemarketingOrderService.submitAudit(subOrderNo);
         return HttpResult.ok();
     }
 
-    @PostMapping("/edit/{subOrderNo}")
-    @ApiOperation(value = "修改费用编辑")
-    public HttpResult<TelemarketingAuditOrderEditVo> edit(@PathVariable String subOrderNo){
-        TelemarketingAuditOrderEditVo telemarketingAuditOrderEditVo = insTelemarketingOrderService.edit(subOrderNo);
+    @GetMapping("/queryExpenses/{subOrderNo}")
+    @ApiOperation(value = "编辑查询")
+    public HttpResult<TelemarketingAuditOrderEditVo> queryExpenses(@PathVariable String subOrderNo){
+        TelemarketingAuditOrderEditVo telemarketingAuditOrderEditVo = insTelemarketingOrderService.queryExpenses(subOrderNo);
         return HttpResult.ok(telemarketingAuditOrderEditVo);
     }
 

src/main/java/com/ydtech/modules/order/entity/dto/TelemarketingAuditOrderDTO.java

@@ -42,6 +42,9 @@ public class TelemarketingAuditOrderDTO implements Serializable {
     @ApiModelProperty("录单时间")
     private String createTime;
 
+    @ApiModelProperty("承保公司")
+    private String insCompany;
+
     @ApiModelProperty("审核状态")
     private String auditStatus;
 

src/main/java/com/ydtech/modules/order/entity/vo/telemarketing/TelemarketingAuditOrderQueryVo.java

@@ -35,9 +35,6 @@ public class TelemarketingAuditOrderQueryVo extends BasePageVO implements Serial
     @ApiModelProperty(value = "投保险种")
     private String productId;
 
-    @ApiModelProperty(value = "审核状态")
-    private String auditStatus;
-
     @ApiModelProperty(value = "开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDate startDate;

src/main/java/com/ydtech/modules/order/service/InsTelemarketingOrderService.java

@@ -34,6 +34,6 @@ public interface InsTelemarketingOrderService {
      * 修改编辑
      * @param subOrderNo 子订单编号
      */
-    TelemarketingAuditOrderEditVo edit(String subOrderNo);
+    TelemarketingAuditOrderEditVo queryExpenses(String subOrderNo);
 
 }

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -999,7 +999,10 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                     agreeIds.add(sysUserLinkPtlAgreementDto.getPtlAgreement().getId());
                 }
             }
+        }else if (type == 4) {
+            agentUserIds = sysUserService.getTelemarketingPersonnelData(orderQueryVo.getUserId());
         }
+
         Long total = 0L;
         Page<InsOrders> orderVoPage = new Page<>();
         //注释逻辑给前台返回数据

src/main/java/com/ydtech/modules/order/service/impl/InsTelemarketingOrderServiceImpl.java

@@ -61,7 +61,7 @@ public class InsTelemarketingOrderServiceImpl implements InsTelemarketingOrderSe
 
         // 协议费用信息
         PtlAgreementProductCostsNew ptlAgreementProductCostsNew = ptlAgreementProductCostsNewService.lambdaQuery()
-                .eq(PtlAgreementProductCostsNew::getId, insFeeOrderNew.getAgreementId())
+                .eq(PtlAgreementProductCostsNew::getId, insFeeOrderNew.getCostsId())
                 .one();
 
         String state = submitExportFeesVo.getState();
@@ -107,11 +107,12 @@ public class InsTelemarketingOrderServiceImpl implements InsTelemarketingOrderSe
     }
 
     @Override
-    public TelemarketingAuditOrderEditVo edit(String subOrderNo) {
+    public TelemarketingAuditOrderEditVo queryExpenses(String subOrderNo) {
         InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(subOrderNo);
         // 费用信息
         InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getByInsOrderNo(insAreaCompany.getId());
         return new TelemarketingAuditOrderEditVo(insFeeOrderNew);
     }
 
+
 }

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ydtech.modules.admin.dao.SysTelemarketingWechatDataMapper">
+
+    <resultMap id="BaseResultMap" type="com.ydtech.modules.admin.model.po.SysTelemarketingWechatData">
+        <id property="id" column="id" jdbcType="INTEGER"/>
+        <result property="userId" column="user_id" jdbcType="VARCHAR"/>
+        <result property="number" column="number" jdbcType="INTEGER"/>
+        <result property="createTime" column="create_time" jdbcType="DATE"/>
+        <result property="updateTime" column="update_time" jdbcType="DATE"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,user_id,number,
+        create_time, update_time
+    </sql>
+</mapper>

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

@@ -1404,4 +1404,18 @@
         where u.dept_id = #{deptId}
     </select>
 
+
+    <select id="getTelemarketingPersonnelUserId" resultType="java.lang.String">
+        SELECT
+        u.id
+        FROM
+        sys_user u
+        LEFT JOIN sys_dept d ON u.dept_id = d.id
+        WHERE
+        d.management_source = '3'
+        <if test="userId != null and userId != ''">
+            and u.id =#{userId}
+        </if>
+    </select>
+
 </mapper>

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

@@ -1554,7 +1554,6 @@
 
     </select>
 
-
     <resultMap id="hxOrderCountMap" type="com.ydtech.modules.order.entity.vo.QueryHxOrdersCountVo">
         <result property="operatorId" column="operatorid" jdbcType="VARCHAR"/>
         <result property="name" column="name" jdbcType="VARCHAR"/>
@@ -1580,9 +1579,9 @@
         <result property="insuredName" column="insuredname" jdbcType="VARCHAR"/>
         <result property="createTime" column="createtime" jdbcType="VARCHAR"/>
         <result property="auditStatus" column="auditstatus" jdbcType="VARCHAR"/>
+        <result property="insCompany" column="insCompany" jdbcType="VARCHAR"/>
     </resultMap>
 
-
     <select id="queryHxOrdersCount" resultMap="hxOrderCountMap">
         select
             operatorid,
@@ -1625,45 +1624,49 @@
 
     <select id="getTelemarketingAudit" resultMap="TelemarketingAuditOrderMap">
         SELECT
-            iac.id as id,
-            iac.orderno as orderno,
-            io.userid as userid,
-            io.username as username,
-            iac.product as product,
-            io.licenseno as licenseno,
-            io.orderstatus as orderstatus,
-            io.insuredname as insuredname,
-            iac.createtime as createtime,
-            ifa.auditstatus as auditstatus
+        iac.id as id,
+        iac.orderno as orderno,
+        io.userid as userid,
+        io.username as username,
+        iac.product as product,
+        io.licenseno as licenseno,
+        io.ins_company as insCompany,
+        io.orderstatus as orderstatus,
+        io.insuredname as insuredname,
+        iac.createtime as createtime,
+        ifa.auditstatus as auditstatus
         FROM
-            ins_area_company iac
-                LEFT JOIN ins_orders io ON iac.orderno = io.orderno
-                LEFT JOIN ins_fee_audit ifa ON ifa.ins_order_no = iac.id
+        ins_area_company iac
+        LEFT JOIN ins_orders io ON iac.orderno = io.orderno
+        LEFT JOIN ins_fee_audit ifa ON ifa.ins_order_no = iac.id
         WHERE
-            ifa.auditstatus in ('4', '5') AND
-            io.userid = #{userId}
+        iac.orderstatus = '3'
+        AND ifa.auditstatus IN ('4', '5')
+        AND io.userid = #{userId}
+
         <if test="telemarketingAuditOrderQueryVo.orderNo != null and telemarketingAuditOrderQueryVo.orderNo != '' ">
-            and iac.orderno = #{telemarketingAuditOrderQueryVo.orderNo}
+            AND iac.orderno = #{telemarketingAuditOrderQueryVo.orderNo}
         </if>
 
         <if test="telemarketingAuditOrderQueryVo.companyId != null and telemarketingAuditOrderQueryVo.companyId != '' ">
-            and iac.company_id = #{telemarketingAuditOrderQueryVo.companyId}
+            AND iac.company_id = #{telemarketingAuditOrderQueryVo.companyId}
         </if>
 
         <if test="telemarketingAuditOrderQueryVo.licenseNo != null and telemarketingAuditOrderQueryVo.licenseNo != '' ">
-            and io.licenseno = #{telemarketingAuditOrderQueryVo.licenseNo}
+            AND io.licenseno = #{telemarketingAuditOrderQueryVo.licenseNo}
         </if>
 
         <if test="telemarketingAuditOrderQueryVo.frameNo != null and telemarketingAuditOrderQueryVo.frameNo != '' ">
-            and io.frameno = #{telemarketingAuditOrderQueryVo.frameNo}
+            AND io.frameno = #{telemarketingAuditOrderQueryVo.frameNo}
         </if>
 
         <if test="telemarketingAuditOrderQueryVo.productId != null and telemarketingAuditOrderQueryVo.productId != '' ">
-            and io.product = #{telemarketingAuditOrderQueryVo.productId}
+            AND io.product = #{telemarketingAuditOrderQueryVo.productId}
         </if>
 
         <if test="telemarketingAuditOrderQueryVo.startDate != null and telemarketingAuditOrderQueryVo.startDate != '' and telemarketingAuditOrderQueryVo.endDate != null and telemarketingAuditOrderQueryVo.endDate != ''">
-            and iac.createtime between #{telemarketingAuditOrderQueryVo.startDate} and #{telemarketingAuditOrderQueryVo.endDate}
+            AND iac.createtime BETWEEN #{telemarketingAuditOrderQueryVo.startDate} AND
+            #{telemarketingAuditOrderQueryVo.endDate}
         </if>
 
     </select>