优化销售端sop任务列表展示数据

fs-company/src/main/java/com/fs/company/controller/qw/FsSopCompanyUserTaskController.java

@@ -1,13 +1,20 @@
 package com.fs.company.controller.qw;
 
 import java.text.SimpleDateFormat;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
 import com.fs.common.core.domain.R;
+import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
+import com.fs.company.mapper.CompanyUserRoleMapper;
+
+import com.fs.framework.security.LoginUser;
+import com.fs.framework.service.TokenService;
 import com.fs.qw.dto.SopCompanyUserTaskDto;
 import com.fs.qw.vo.SopCompanyUserTaskVo;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +43,7 @@ import static com.fs.his.utils.PhoneUtil.decryptPhone;
  * @author fs
  * @date 2025-12-23
  */
+@Slf4j
 @RestController
 @RequestMapping("/qw/companyUserTask")
 public class FsSopCompanyUserTaskController extends BaseController
@@ -43,6 +51,11 @@ public class FsSopCompanyUserTaskController extends BaseController
     @Autowired
     private IFsSopCompanyUserTaskService fsSopCompanyUserTaskService;
 
+    @Autowired
+    private TokenService tokenService;
+
+    @Autowired
+    private CompanyUserRoleMapper roleMapper;
     /**
      * 查询销售处理sop任务列表
      */
@@ -50,11 +63,17 @@ public class FsSopCompanyUserTaskController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(SopCompanyUserTaskDto queryDto)
     {
-        // 强制限定创建时间为今天
-        String todayStart = new SimpleDateFormat("yyyy-MM-dd 00:00:00").format(new Date());
-        String todayEnd = new SimpleDateFormat("yyyy-MM-dd 23:59:59").format(new Date());
-        queryDto.setBeginTime(todayStart);
-        queryDto.setEndTime(todayEnd);
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        if (loginUser == null){
+            log.error("未查询到当前登录用户信息");
+            return getDataTable(Collections.emptyList());
+        }
+        queryDto.setCompanyUserId(loginUser.getUser().getUserId());
+        //管理员查看所有数据
+        Long isAdmin = roleMapper.companyUserIsAdmin(loginUser.getUser().getUserId());
+        if (isAdmin != null) {
+            queryDto.setCompanyUserId(null);
+        }
         startPage();
         List<SopCompanyUserTaskVo> list = fsSopCompanyUserTaskService.selectFsSopCompanyUserTaskVoList(queryDto);
         for (SopCompanyUserTaskVo vo : list) {

fs-service/src/main/java/com/fs/qw/domain/FsSopCompanyUserTask.java

@@ -18,15 +18,11 @@ public class FsSopCompanyUserTask extends BaseEntity{
     /** 主键 */
     private Long id;
 
-    /** 外部联系人主键 */
-    @Excel(name = "外部联系人主键")
-    private Long externalId;
-
     /** 医生id */
     @Excel(name = "医生id")
     private Long doctorId;
 
-    /** 用户id */
+    /** 客户id */
     @Excel(name = "用户id")
     private Long userId;
 
@@ -34,5 +30,13 @@ public class FsSopCompanyUserTask extends BaseEntity{
     @Excel(name = "0:待处理，1:已处理")
     private Long status;
 
+    /** 套餐包Id */
+    private Long packageId;
+
+    /** 订单号 */
+    private String orderCode;
+
+    /** 销售id */
+    private Long companyUserId;
 
 }

fs-service/src/main/java/com/fs/qw/dto/SopCompanyUserTaskDto.java

@@ -13,15 +13,28 @@ public class SopCompanyUserTaskDto extends BaseEntity {
 
     /** 医生id */
     private String doctorName;
+
+
     private Long doctorId;
 
-    /** 用户id */
+    /** 用户姓名 */
     private String name;
 
+    /** 客户id */
     private Long userId;
 
+    /** 销售id */
+    private Long companyUserId;
+
+    /** 企微用户id */
     private Long qwUserId;
 
+    /** 套餐包Id */
+    private Long packageId;
+
+    /** 订单号 */
+    private String orderCode;
+
     /** 0:待处理，1:已处理 */
     private Long status;
 }

fs-service/src/main/java/com/fs/qw/service/impl/FsSopCompanyUserTaskServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fs.qw.service.impl;
 
+import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -51,6 +52,11 @@ public class FsSopCompanyUserTaskServiceImpl extends ServiceImpl<FsSopCompanyUse
     @Override
     public List<SopCompanyUserTaskVo> selectFsSopCompanyUserTaskVoList(SopCompanyUserTaskDto queryDto)
     {
+        // 强制限定创建时间为今天
+        String todayStart = new SimpleDateFormat("yyyy-MM-dd 00:00:00").format(new Date());
+        String todayEnd = new SimpleDateFormat("yyyy-MM-dd 23:59:59").format(new Date());
+        queryDto.setBeginTime(todayStart);
+        queryDto.setEndTime(todayEnd);
         return sopCompanyUserTaskMapper.selectFsSopCompanyUserTaskVoList(queryDto);
     }
 

fs-service/src/main/java/com/fs/qw/vo/SopCompanyUserTaskVo.java

@@ -19,6 +19,12 @@ public class SopCompanyUserTaskVo {
     @Excel(name = "医生姓名")
     private String doctorName;
 
+    /** 套餐包Id */
+    private Long packageId;
+
+    /** 订单号 */
+    private String orderCode;
+
     /** 用户id */
     private Long userId;
 

fs-service/src/main/resources/mapper/qw/FsSopCompanyUserTaskMapper.xml

@@ -6,7 +6,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="FsSopCompanyUserTask" id="FsSopCompanyUserTaskResult">
         <result property="id"    column="id"    />
-        <result property="externalId"    column="external_id"    />
+        <result property="packageId"    column="package_id"    />
+        <result property="orderCode"    column="order_code"    />
+        <result property="companyUserId"    column="company_user_id"    />
         <result property="doctorId"    column="doctor_id"    />
         <result property="userId"    column="user_id"    />
         <result property="status"    column="status"    />
@@ -19,6 +21,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 主键可 -->
         <result property="id"    column="id"    />
         <!-- fs_sop_company_user_task 表字段 -->
+        <result property="packageId"    column="package_id"    />
+        <result property="orderCode"    column="order_code"    />
+        <result property="companyUserId"    column="company_user_id"    />
         <result property="doctorId"     column="doctor_id" />
         <result property="userId"       column="user_id" />
         <result property="status"       column="status" />
@@ -34,13 +39,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFsSopCompanyUserTaskVo">
-        select id, external_id, doctor_id, user_id, status, create_time, update_time, remark from fs_sop_company_user_task
+        select id, package_id,order_code,company_user_id, doctor_id, user_id, status, create_time, update_time, remark from fs_sop_company_user_task
     </sql>
 
     <select id="selectFsSopCompanyUserTaskVoList" parameterType="com.fs.qw.dto.SopCompanyUserTaskDto" resultMap="SopCompanyUserTaskVoResult">
         SELECT
         sct.id,
         sct.user_id,
+        sct.package_id,
+        sct.order_code,
+        sct.company_user_id,
         qwec.name,
         qwec.avatar,
         fu.phone,
@@ -49,7 +57,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sct.STATUS,
         sct.create_time,
         sct.update_time,
-        sct.external_id,
         sct.remark
         FROM
         fs_sop_company_user_task sct
@@ -60,6 +67,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="id != null "> and sct.id = #{id}</if>
             <if test="doctorId != null "> and sct.doctor_id = #{doctorId}</if>
             <if test="userId != null "> and sct.user_id = #{userId}</if>
+            <if test="packageId != null "> and sct.package_id = #{packageId}</if>
+            <if test="orderCode != null "> and sct.order_code = #{orderCode}</if>
+            <if test="companyUserId != null "> and sct.company_user_id = #{companyUserId}</if>
             <if test="status != null "> and sct.status = #{status}</if>
             <if test="qwUserId != null "> and qwec.qw_user_id = #{qwUserId}</if>
             <if test="name != null "> and qwec.name like concat('%', #{name}, '%')</if>
@@ -78,6 +88,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             sct.id,
             sct.user_id,
+            sct.package_id,
+            sct.order_code,
+            sct.company_user_id,
             qwec.name,
             qwec.avatar,
             fu.phone,
@@ -86,7 +99,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sct.STATUS,
             sct.create_time,
             sct.update_time,
-            sct.external_id,
             sct.remark
         FROM
             fs_sop_company_user_task sct
@@ -144,7 +156,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertFsSopCompanyUserTask" parameterType="FsSopCompanyUserTask" useGeneratedKeys="true" keyProperty="id">
         insert into fs_sop_company_user_task
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="externalId != null">external_id,</if>
+            <if test="packageId != null">package_id,</if>
+            <if test="orderCode != null">order_code,</if>
+            <if test="companyUserId != null">company_user_id,</if>
             <if test="doctorId != null">doctor_id,</if>
             <if test="userId != null">user_id,</if>
             <if test="status != null">status,</if>
@@ -153,7 +167,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="externalId != null">#{externalId},</if>
+            <if test="packageId != null">#{packageId},</if>
+            <if test="orderCode != null">#{orderCode},</if>
+            <if test="companyUserId != null">#{companyUserId},</if>
             <if test="doctorId != null">#{doctorId},</if>
             <if test="userId != null">#{userId},</if>
             <if test="status != null">#{status},</if>
@@ -166,7 +182,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateFsSopCompanyUserTask" parameterType="FsSopCompanyUserTask">
         update fs_sop_company_user_task
         <trim prefix="SET" suffixOverrides=",">
-            <if test="externalId != null">external_id = #{externalId},</if>
+            <if test="packageId != null">package_id = #{packageId},</if>
+            <if test="orderCode != null">order_code = #{orderCode},</if>
+            <if test="companyUserId != null">company_user_id = #{companyUserId},</if>
             <if test="doctorId != null">doctor_id = #{doctorId},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="status != null">status = #{status},</if>