feat: 统计

fs-service-system/src/main/java/com/fs/qw/mapper/QwUserMapper.java

@@ -374,4 +374,11 @@ public interface QwUserMapper extends BaseMapper<QwUser>
     @Select("select qw_user_id from qw_user where company_user_id = ${companyUserId}")
     List<String> findQwUserIdListByCompanyUserId(@Param("companyUserId") Long companyUserId);
 
+    /**
+     * 根据企微用户id查询对应得销售id
+     * @param qwUserId
+     * @return
+     */
+    @Select("select company_user_id from qw_user where qw_user_id=${qwUserId}")
+    Long selectCompanyIdByQwUserId(@Param("qwUserId") String qwUserId);
 }

fs-service-system/src/main/java/com/fs/statis/domain/FsStatisPeriodWatch.java

@@ -1,9 +1,13 @@
 package com.fs.statis.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
+
+import java.time.LocalDate;
 import java.util.Date; // 或者使用 java.time.LocalDateTime
 
 /**
@@ -21,12 +25,13 @@ public class FsStatisPeriodWatch {
     /**
      * 主键ID (虽然注释中没有，但通常id为主键)
      */
+    @TableId(type = IdType.AUTO)
     private Integer id;
 
     /**
      * 训练营id
      */
-    private Integer periodId;
+    private String periodId;
 
     /**
      * 训练营人数
@@ -96,7 +101,7 @@ public class FsStatisPeriodWatch {
     /**
      * 数据日期
      */
-    private Date dataDate;
+    private LocalDate dataDate;
 
 
     /**

fs-service-system/src/main/java/com/fs/statis/mapper/FsStatisPeriodWatchMapper.java

@@ -103,5 +103,5 @@ public interface FsStatisPeriodWatchMapper {
      * 获取每个sop任务对应的营期记录
      * @return
      */
-    List<String> selectRecords(@Param("previousDay") LocalDate previousDay);
+    List<SopUserLogs> selectRecords(@Param("previousDay") LocalDate previousDay);
 }

fs-service-system/src/main/java/com/fs/statis/service/impl/FsStatisPeriodWatchServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fs.statis.service.impl; // 假设Service实现类放在此包下
 
 import com.fs.company.domain.CompanyUser;
+import com.fs.qw.mapper.QwUserMapper;
 import com.fs.sop.domain.SopUserLogs;
 import com.fs.statis.domain.FsStatisPeriodWatch;
 import com.fs.statis.domain.FsStatisSalerWatch;
@@ -24,13 +25,16 @@ public class FsStatisPeriodWatchServiceImpl implements FsStatisPeriodWatchServic
 
     private final FsStatisPeriodWatchMapper fsStatisPeriodWatchMapper;
 
+    private final QwUserMapper qwUserMapper;
+
     /**
      * 通过构造函数注入Mapper
      * @param fsStatisPeriodWatchMapper 训练营周期统计数据Mapper
      */
     @Autowired
-    public FsStatisPeriodWatchServiceImpl(FsStatisPeriodWatchMapper fsStatisPeriodWatchMapper) {
+    public FsStatisPeriodWatchServiceImpl(FsStatisPeriodWatchMapper fsStatisPeriodWatchMapper, QwUserMapper qwUserMapper) {
         this.fsStatisPeriodWatchMapper = fsStatisPeriodWatchMapper;
+        this.qwUserMapper = qwUserMapper;
     }
 
     /**
@@ -87,16 +91,24 @@ public class FsStatisPeriodWatchServiceImpl implements FsStatisPeriodWatchServic
 
     @Override
     public void writeData() {
-        LocalDate previousDay = LocalDate.now().minusDays(1);
-
-        // 获取每个sop任务对应的营期记录(执行记录) 当天的记录
-        List<String> list = fsStatisPeriodWatchMapper.selectRecords(previousDay);
-        for (String id : list) {
-            // 根据sop营期id 获取当前任务的企微id列表
-
-            // 转换企微id列表为对应的销售
-
-        }
+//        LocalDate previousDay = LocalDate.now().minusDays(1);
+//
+//        // 获取每个sop任务
+//        List<SopUserLogs> list = fsStatisPeriodWatchMapper.selectRecords(previousDay);
+//        for (SopUserLogs logs : list) {
+//            // 根据sop任务营期id 获取当前任务的企微id列表
+//            String qwUserId = logs.getQwUserId();
+//            // 转换企微id列表为对应的销售
+//            Long companyUserId = qwUserMapper.selectCompanyIdByQwUserId(qwUserId);
+//            FsStatisPeriodWatch fsStatisPeriodWatch = new FsStatisPeriodWatch();
+//            fsStatisPeriodWatch.setPeriodId(logs.getId());
+//            fsStatisPeriodWatch.setDataDate(previousDay);
+//
+//            // 获取当前的训练营人数
+//
+//
+//            // for 获取
+//        }
 
     }
 }

fs-service-system/src/main/resources/mapper/statis/FsStatisPeriodWatchMapper.xml

@@ -56,11 +56,11 @@
             </if>
         </where>
     </select>
-    <select id="selectRecords" resultType="java.lang.String">
-        select id from sop_user_logs
+    <select id="selectRecords" resultType="com.fs.sop.domain.SopUserLogs">
+        select id,qw_user_id from sop_user_logs
         <where>
             <if test="status != null">
-               AND status = 1
+                AND status = 1
             </if>
             <if test="previousDay != null">
                 AND start_time = #{previousDay}
@@ -68,4 +68,5 @@
         </where>
     </select>
 
+
 </mapper>