Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_java

fs-admin/src/main/java/com/fs/company/controller/CompanyUserController.java

@@ -56,6 +56,19 @@ public class CompanyUserController extends BaseController
         return util.exportExcel(list, "companyUser");
     }
 
+    /**
+     * 获取所有的销售列表
+     * @param companyId
+     * @return
+     */
+    @GetMapping("/getUserList")
+    public R getUserList(@RequestParam("companyId") Long companyId)
+    {
+        CompanyUser map=new CompanyUser();
+        map.setCompanyId(companyId);
+        List<CompanyUser> list = companyUserService.selectCompanyUserList(map);
+        return  R.ok().put("data",list);
+    }
     /**
      * 获取企业员工信息详细信息
      */

fs-admin/src/main/java/com/fs/course/controller/FsCourseTrafficLogController.java

@@ -51,18 +51,6 @@ public class FsCourseTrafficLogController extends BaseController
     public TableDataInfo list(FsCourseTrafficLogParam param)
     {
         startPage();
-        if(ObjectUtils.isNotNull(param.getTime())){
-
-            YearMonth yearMonth = param.getTime();
-            LocalDateTime startOfMonth = yearMonth.atDay(1).atStartOfDay();
-
-            LocalDateTime startOfNextMonth = yearMonth.plusMonths(1).atDay(1).atStartOfDay()
-                    .minusDays(1).withHour(23).withMinute(59).withSecond(59);
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-
-            param.setStartDate(startOfMonth.format(formatter));
-            param.setEndDate(startOfNextMonth.format(formatter));
-        }
         List<FsCourseTrafficLogListVO> list = fsCourseTrafficLogService.selectTrafficNew(param);
         return getDataTable(list);
     }

fs-admin/src/main/java/com/fs/course/controller/FsCourseWatchLogController.java

@@ -60,7 +60,6 @@ public class FsCourseWatchLogController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(FsCourseWatchLogListParam param)
     {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVONew(param);
         TableDataInfo rspData = new TableDataInfo();
         rspData.setCode(HttpStatus.SUCCESS);
@@ -74,11 +73,14 @@ public class FsCourseWatchLogController extends BaseController
     @GetMapping("/statisticsList")
     public TableDataInfo statisticsList(FsCourseWatchLogStatisticsListParam param)
     {
+        // 如果看指定用户就不用设置公司
         if(param.getCompanyId() == null){
-            throw new CustomException("必须选择公司!");
+            if(param.getUserId() == null) {
+                throw new CustomException("查看公司或者用户必填！");
+            }
         }
         if (param.getSTime()==null||param.getETime()==null){
-            return getDataTable(new ArrayList<>());
+            throw new CustomException("必须选择开始时间和结束时间！");
         }
         List<FsCourseWatchLogStatisticsListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogStatisticsListVONew(param);
         TableDataInfo rspData = new TableDataInfo();
@@ -138,7 +140,6 @@ public class FsCourseWatchLogController extends BaseController
     public TableDataInfo watchLogStatistics(FsCourseOverParam param)
     {
         startPage();
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         if (param.getSTime()==null||param.getETime()==null){
             return getDataTable(new ArrayList<>());
         }
@@ -148,7 +149,6 @@ public class FsCourseWatchLogController extends BaseController
     @GetMapping("/watchLogStatisticsExport")
     public AjaxResult watchLogStatisticsExport(FsCourseOverParam param)
     {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         if (param.getSTime()==null||param.getETime()==null){
             return AjaxResult.error("请选择时间");
         }
@@ -163,7 +163,6 @@ public class FsCourseWatchLogController extends BaseController
     public TableDataInfo userStatisticsList(FsCourseUserStatisticsListParam param)
     {
         startPage();
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         if (param.getSTime()==null||param.getETime()==null){
             return getDataTable(new ArrayList<>());
         }
@@ -180,7 +179,6 @@ public class FsCourseWatchLogController extends BaseController
     @GetMapping("/myList")
     public TableDataInfo myList(FsCourseWatchLogListParam param)
     {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVONew(param);
         TableDataInfo rspData = new TableDataInfo();
         rspData.setCode(HttpStatus.SUCCESS);
@@ -211,7 +209,6 @@ public class FsCourseWatchLogController extends BaseController
     @GetMapping("/myExport")
     public AjaxResult myExport(FsCourseWatchLogListParam param)
     {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVO(param);
         ExcelUtil<FsCourseWatchLogListVO> util = new ExcelUtil<FsCourseWatchLogListVO>(FsCourseWatchLogListVO.class);
         return util.exportExcel(list, "短链课程看课记录数据");

fs-admin/src/main/java/com/fs/course/controller/qw/QwFsCourseWatchLogController.java

@@ -75,7 +75,6 @@ public class QwFsCourseWatchLogController extends BaseController
     public TableDataInfo statisticsList(FsCourseWatchLogStatisticsListParam param)
     {
         startPage();
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         if (param.getSTime()==null||param.getETime()==null){
             return getDataTable(new ArrayList<>());
         }

fs-admin/src/main/java/com/fs/store/controller/FsUserController.java

@@ -80,7 +80,18 @@ public class FsUserController extends BaseController
     {
         return AjaxResult.success(fsUserService.selectFsUserByUserId(userId));
     }
-
+    /**
+     * 查询企业内的用户，每次只返回5条
+     * @param fsUser 查询参数
+     * @return R
+     */
+    @GetMapping("/getUserListLimit")
+    public R getUserListLimit( FsUser fsUser)
+    {
+        fsUser.setIsDel(0);
+        List<FsUser> list=fsUserService.getUserListLimit(fsUser);
+        return R.ok().put("data", list);
+    }
     /**
      * 新增用户
      */

fs-company/src/main/java/com/fs/course/controller/FsCourseTrafficLogController.java

@@ -54,21 +54,6 @@ public class FsCourseTrafficLogController extends BaseController
     public TableDataInfo list(FsCourseTrafficLogParam param)
     {
         startPage();
-        if(ObjectUtils.isNotNull(param.getTime())){
-
-            YearMonth yearMonth = param.getTime();
-            LocalDateTime startOfMonth = yearMonth.atDay(1).atStartOfDay();
-
-            LocalDateTime startOfNextMonth = yearMonth.plusMonths(1).atDay(1).atStartOfDay()
-                    .minusDays(1).withHour(23).withMinute(59).withSecond(59);
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-
-            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-            param.setCompanyId( loginUser.getCompany().getCompanyId());
-
-            param.setStartDate(startOfMonth.format(formatter));
-            param.setEndDate(startOfNextMonth.format(formatter));
-        }
         List<FsCourseTrafficLogListVO> list = fsCourseTrafficLogService.selectTrafficNew(param);
         return getDataTable(list);
     }

fs-service-system/src/main/java/com/fs/course/mapper/FsCourseWatchLogMapper.java

@@ -201,7 +201,7 @@ public interface FsCourseWatchLogMapper extends BaseMapper<FsCourseWatchLog> {
             "LEFT JOIN qw_user qu on qu.id=o.qw_user_id\n" +
             "LEFT JOIN fs_user_course_video v on v.video_id=o.video_id \n" +
             "LEFT JOIN fs_user_course uc on uc.course_id=v.course_id\n" +
-            "where o.company_id=#{companyId}  " +
+            "where o.company_id=#{companyId} AND send_type=2 " +
             "<if test= 'sTime != null '> " +
             "       and DATE(o.create_time) &gt;= DATE(#{sTime})\n" +
             "</if>\n" +

fs-service-system/src/main/java/com/fs/course/service/impl/FsCourseTrafficLogServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.Collections;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.fs.common.exception.CustomException;
 import com.fs.common.utils.DateUtils;
 import com.fs.common.utils.DictUtils;
 import com.fs.company.cache.ICompanyCacheService;
@@ -138,6 +139,9 @@ public class FsCourseTrafficLogServiceImpl implements IFsCourseTrafficLogService
 
     @Override
     public List<FsCourseTrafficLogListVO> selectTrafficNew(FsCourseTrafficLogParam param) {
+        if(StringUtils.isBlank(param.getStartDate()) && StringUtils.isBlank(param.getEndDate())){
+            throw new CustomException("搜索必须要一个时间范围!");
+        }
         List<FsCourseTrafficLogListVO> fsCourseTrafficLogListVOS = fsCourseTrafficLogMapper.selectTrafficNew(param);
         for (FsCourseTrafficLogListVO log : fsCourseTrafficLogListVOS) {
             if (ObjectUtils.isNotNull(log.getProject())) {

fs-service-system/src/main/java/com/fs/qw/service/impl/QwWatchLogServiceImpl.java

@@ -166,13 +166,20 @@ public class QwWatchLogServiceImpl extends ServiceImpl<QwWatchLogMapper, QwWatch
 
     @Override
     public TableDataInfo selectQwWatchLogStatisticsListVONew(QwWatchLogStatisticsListParam param) {
+        List<Long> userIds = null;
         // 获取当前公司下的所有销售
-        List<CompanyUser> companyUsers = companyUserMapper.selectCompanyUserByCompanyId(param.getCompanyId());
+        if(param.getCompanyUserId()  == null){
+            List<CompanyUser> companyUsers = companyUserMapper.selectCompanyUserByCompanyId(param.getCompanyId());
+
+            userIds = companyUsers.stream()
+                    .map(CompanyUser::getUserId)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toList());
+        } else {
+            userIds = new ArrayList<>();
+            userIds.add(param.getCompanyUserId());
+        }
 
-        List<Long> userIds = companyUsers.stream()
-                .map(CompanyUser::getUserId)
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
 
         List<QwWatchLogStatisticsListVO> list = new ArrayList<>();
 

fs-service-system/src/main/java/com/fs/store/domain/FsStoreProduct.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 商品对象 fs_store_product
@@ -11,6 +12,7 @@ import lombok.Data;
  * @author fs
  * @date 2022-03-15
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class FsStoreProduct extends BaseEntity
 {

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

@@ -251,6 +251,7 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService
             product.setIntegral(Long.parseLong(countDto.getMinIntegral().toString()));
             product.setStock(Long.parseLong(countDto.getStock().toString()));
             product.setCompanyIds(param.getCompanyIds());
+            product.setVideo(param.getVideo());
             fsStoreProductMapper.updateFsStoreProduct(product);
             if (param.getSpecType().equals(0)) {
                 ProductArrtDTO fromatDetailDto = ProductArrtDTO.builder()
@@ -274,6 +275,7 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService
             product.setIntegral(Long.parseLong(countDto.getMinIntegral().toString()));
             product.setStock(Long.parseLong(countDto.getStock().toString()));
             product.setCompanyIds(param.getCompanyIds());
+            product.setVideo(param.getVideo());
             fsStoreProductMapper.insertFsStoreProduct(product);
             if (param.getSpecType().equals(0)) {
                 ProductArrtDTO fromatDetailDto = ProductArrtDTO.builder()

fs-service-system/src/main/resources/mapper/course/FsCourseTrafficLogMapper.xml

@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectTrafficNew" resultType="com.fs.course.vo.FsCourseTrafficLogListVO">
         select company_id,project,course_id,SUM(internet_traffic) AS total_internet_traffic
-        ,DATE_FORMAT(create_time, '%Y-%m') AS `month`  from fs_course_traffic_log
+        ,DATE_FORMAT(create_time, '%Y-%m-%d') AS `month`  from fs_course_traffic_log
         <where>
             <if test="startDate != null and endDate != null">
                 and create_time between #{startDate} AND #{endDate}
@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="courseId != null">
                 and course_id = ${courseId}
             </if>
-            <if test="project">
+            <if test="project != null">
                 and project = ${project}
             </if>
         </where>

fs-service-system/src/main/resources/mapper/course/FsCourseWatchLogMapper.xml

@@ -460,8 +460,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         o.video_id as video_id
         FROM fs_course_watch_log o
         <where>
+            send_type=1
             <if test="companyId != null">
-                o.company_id=#{companyId}
+               and o.company_id=#{companyId}
             </if>
             <if test= 'sTime != null '>
                 and o.create_time &gt;= #{sTime}
@@ -683,8 +684,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT 1
         FROM fs_course_watch_log o
         <where>
+            send_type=2
             <if test="companyId != null">
-                o.company_id=#{companyId}
+                and o.company_id=#{companyId}
             </if>
             <if test= 'sTime != null '>
                 and o.create_time &gt;= #{sTime}