调整详情统计数据

fs-company-app/src/main/java/com/fs/app/controller/FsUserController.java

@@ -110,8 +110,9 @@ public class FsUserController extends AppBaseController {
     @GetMapping("/details")
     @ApiOperation("用户会员详情")
     public ResponseResult<UserDetailsVO> getUserDetails(@ApiParam(value = "用户id", required = true) @RequestParam Long userId,
+                                                        @ApiParam(value = "用户项目关联id", required = true) @RequestParam Long userCompanyId,
                                                         @ApiParam(value = "时间tab，不传表示查询全部，分别是：今天、昨天、前天、近七天", required = true) @RequestParam(required = false) String dateTag) {
-        UserDetailsVO userDetails = fsUserService.getUserDetails(Long.parseLong(getUserId()), userId, dateTag);
+        UserDetailsVO userDetails = fsUserService.getUserDetails(Long.parseLong(getUserId()), userId, dateTag,userCompanyId);
         return ResponseResult.ok(userDetails);
     }
 

fs-service-system/src/main/java/com/fs/store/mapper/FsUserMapper.java

@@ -224,7 +224,7 @@ public interface FsUserMapper
 
     int getRepeatUserNumber(@Param("userId") Long userId);
 
-    UserDetailsVO getCountWatchCourse (@Param("userId") Long userId, @Param("fsUserId") Long fsUserId, @Param("dateTag") String dateTag);
+    UserDetailsVO getCountWatchCourse (@Param("userId") Long userId, @Param("fsUserId") Long fsUserId, @Param("dateTag") String dateTag,@Param("userCompanyId")  Long userCompanyId);
 
     UserDetailsVO getCountAnswer (@Param("userId") Long userId, @Param("fsUserId") Long fsUserId, @Param("dateTag") String dateTag);
 

fs-service-system/src/main/java/com/fs/store/service/IFsUserService.java

@@ -147,7 +147,7 @@ public interface IFsUserService
 
     UserListPageVO getUserNumber(Long userId);
 
-    UserDetailsVO getUserDetails(Long userId, Long fsUserId, String dateTag);
+    UserDetailsVO getUserDetails(Long userId, Long fsUserId, String dateTag, Long userCompanyId);
 
     /**
      * 查询重粉用户是否存在

fs-service-system/src/main/java/com/fs/store/service/impl/FsUserServiceImpl.java

@@ -2,7 +2,6 @@ package com.fs.store.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fs.common.constant.HttpStatus;
 import com.fs.common.core.domain.R;
@@ -478,7 +477,6 @@ public class FsUserServiceImpl implements IFsUserService
 
     @Override
     public PageInfo<FsUserPageListVO> selectFsUserPageList(FsUserPageListParam param) {
-        System.out.println("参数：" + JSON.toJSONString(param));
         CompanyUser companyUser = companyUserMapper.selectCompanyUserById(param.getUserId());
         if (companyUser!=null && companyUser.isAdmin()){
             param.setUserId(0L);
@@ -671,8 +669,8 @@ public class FsUserServiceImpl implements IFsUserService
     }
 
     @Override
-    public UserDetailsVO getUserDetails(Long userId, Long fsUserId, String dateTag) {
-        UserDetailsVO countWatchCourse = fsUserMapper.getCountWatchCourse(userId, fsUserId, dateTag);
+    public UserDetailsVO getUserDetails(Long userId, Long fsUserId, String dateTag, Long userCompanyId) {
+        UserDetailsVO countWatchCourse = fsUserMapper.getCountWatchCourse(userId, fsUserId, dateTag,userCompanyId);
         UserDetailsVO countAnswer = fsUserMapper.getCountAnswer(userId, fsUserId, dateTag);
         UserDetailsVO countRedPacket = fsUserMapper.getCountRedPacket(userId, fsUserId, dateTag);
         UserDetailsVO vo = new UserDetailsVO();

fs-service-system/src/main/resources/mapper/store/FsUserMapper.xml

@@ -628,7 +628,7 @@
         FROM
         fs_user
         INNER JOIN fs_user_company_user ON fs_user_company_user.user_id = fs_user.user_id
-        LEFT JOIN fs_user_course_count ON fs_user.user_id = fs_user_course_count.user_id
+        LEFT JOIN fs_user_course_count ON fs_user_company_user.user_id = fs_user_course_count.user_id and fs_user_company_user.project_id = fs_user_course_count.project_id
         left join fs_user_project_tag upt ON upt.user_company_user_id = fs_user_company_user.id
         LEFT JOIN company_tag ON company_tag.tag_id = upt.tag_id
         LEFT JOIN company_user ON company_user.user_id = fs_user_company_user.company_user_id
@@ -741,7 +741,7 @@
             and fs_user_company_user.company_id = #{companyId}
         </if>
         GROUP BY
-            fs_user.`status`,fs_user_company_user.project_id
+        fs_user_company_user.`status`,fs_user_company_user.project_id
     </select>
 
     <select id="getRepeatUserNumber" resultType="int">
@@ -771,6 +771,7 @@
         FROM
         fs_user_course_count
         LEFT JOIN fs_user ON fs_user.user_id = fs_user_course_count.user_id
+        inner JOIN fs_user_company_user cu ON cu.user_id = fs_user.user_id and cu.project_id = fs_user_course_count.project_id
         <where>
         <if test="dateTag != null and dateTag !='' ">
             <choose>
@@ -789,6 +790,9 @@
             </choose>
         </if>
            and fs_user.user_id = #{fsUserId}
+            <if test="userCompanyId!=null">
+                and cu.id = #{userCompanyId}
+            </if>
         </where>
         GROUP BY
         fs_user.user_id