Merge branch 'refs/heads/master' into 企微聊天

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

@@ -109,7 +109,8 @@ public class FsUserCourseCategoryController extends BaseController
     @GetMapping("/getCatePidList")
     public R getCatePidList()
     {
-        List<OptionsVO> list = fsUserCourseCategoryService.selectFsUserCourseCategoryPidList();
+        Integer isShow = null;
+        List<OptionsVO> list = fsUserCourseCategoryService.selectFsUserCourseCategoryPidList(isShow);
         return R.ok().put("data", list);
     }
 

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

@@ -295,6 +295,50 @@ public interface FsCourseWatchLogMapper extends BaseMapper<FsCourseWatchLog> {
             "</script>"})
     List<FsCourseWatchLogStatisticsListVO> selectFsCourseWatchLogStatisticsListVO(FsCourseWatchLogStatisticsListParam param);
 
+    @Select({"<script> " +
+            "SELECT COUNT(*) FROM (" +
+            "    SELECT 1 " +
+            "    FROM fs_course_watch_log o " +
+            "    <if test= 'sendType != 1 '> " +
+            "    LEFT JOIN qw_user qu on qu.id = o.qw_user_id " +
+            "    </if> " +
+            "    <if test= 'sendType == 1 '> " +
+            "    LEFT JOIN company_user cu on cu.user_id = o.company_user_id " +
+            "    </if> " +
+            "    WHERE o.company_id = #{companyId} " +
+            "    <if test= 'sendType != null '> " +
+            "        AND o.send_type = #{sendType} " +
+            "    </if> " +
+            "    <if test= 'sTime != null '> " +
+            "        AND o.create_time &gt;= #{sTime} " +
+            "    </if> " +
+            "    <if test='eTime != null '> " +
+            "        AND o.create_time &lt; DATE_ADD(#{eTime}, INTERVAL 1 DAY) " +
+            "    </if> " +
+            "    <if test ='sendType != 1 and nickName != null and nickName != \"\"'> " +
+            "        AND qu.qw_user_name LIKE CONCAT(#{nickName}, '%') " +
+            "    </if> " +
+            "    <if test ='sendType == 1 and nickName != null and nickName != \"\"'> " +
+            "        AND cu.nick_name LIKE CONCAT(#{nickName}, '%') " +
+            "    </if> " +
+            "    <if test ='courseId != null'> " +
+            "        AND o.course_id = #{courseId} " +
+            "    </if> " +
+            "    <if test ='videoId != null'> " +
+            "        AND o.video_id = #{videoId} " +
+            "    </if> " +
+            "    GROUP BY o.video_id, " +
+            "    <if test= 'sendType != 1 '> " +
+            "        o.qw_user_id, " +
+            "    </if> " +
+            "    <if test= 'sendType == 1 '> " +
+            "        o.company_user_id, " +
+            "    </if> " +
+            "    DATE(o.create_time) " +
+            ") t " +
+            "</script>"})
+    Long selectFsCourseWatchLogStatisticsListVOCount(FsCourseWatchLogStatisticsListParam param);
+
 
     ArrayList<FsCourseWatchLogByFinishTimeParam> selectFsCourseWatchLogByFinishTime();
 

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -528,6 +528,10 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
 //        }
         String msg = "<div style=\"color: red;margin-bottom: 15px;font-weight: bold;\">本课程为会员独享<br>请长按二维码</div>\n" +
                 "\t\t\t\t\t<div style=\"color: #999;font-size: 14px;font-weight: bold;\">添加伴学助手免费领取会员权限</div>";
+        //济南联志隐藏二维码
+        if ("济南联志健康".equals(signProjectName)) {
+            msg = "<div style=\"color: red;margin-bottom: 15px;font-weight: bold;\">本课程为会员独享<br></div>";
+        }
 //        try {
 //            new Thread(() -> {
 //                try {
@@ -916,6 +920,9 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
     }
 
     private R addCustomerService(String qwUserById,String msg){
+        if ("济南联志健康".equals(signProjectName)){
+            return R.error(400,msg).put("qrcode", "");
+        }
         String json = configService.selectConfigByKey("course.config");
         CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
         String contactWay = "";

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

@@ -152,6 +152,7 @@ public interface QwUserMapper extends BaseMapper<QwUser>
             "left join fastgpt_role fr on fr.role_id=qu.fastGpt_role_id " +
             "where qu.company_user_id is not null "+
             "            <if test=\"qwUserId != null  and qwUserId != ''\"> and qu.qw_user_id = #{qwUserId}</if>\n" +
+            "            <if test=\"loginStatus != null  and loginStatus != ''\"> and qu.ipad_status = #{loginStatus}</if>\n" +
             "            <if test=\"appKey != null  and appKey != ''\"> and qu.app_key = #{appKey}</if>\n" +
             "            <if test=\"nickName != null  and nickName != ''\"> and cu.nick_name like concat( #{nickName}, '%') </if>\n" +
             "            <if test=\"qwUserName != null  and qwUserName != ''\"> and qu.qw_user_name like concat('%', #{qwUserName}, '%') </if> " +

fs-service/src/main/java/com/fs/qw/mapper/QwWatchLogMapper.java

@@ -102,6 +102,12 @@ public interface QwWatchLogMapper extends BaseMapper<QwWatchLog>{
             "<if test ='(deptIds ==null or deptIds.size = 0) and deptId !=null and deptId!=\"\"'>\n" +
             "   and cu.dept_id = #{deptId}\n" +
             "</if>" +
+            "<if test ='companyId !=null and companyId!=\"\"'>\n" +
+            "   and qu.company_id =#{companyId} \n" +
+            "</if>" +
+            "<if test ='companyUserId !=null and companyUserId!=\"\"'>\n" +
+            "   and qu.company_user_id =#{companyUserId} \n" +
+            "</if>" +
             "<if test ='ids !=null and ids!=\"\"'>\n" +
             "   and qec.qw_user_id in (${ids})\n" +
             "</if>" +

fs-service/src/main/java/com/fs/qw/param/QwUserListParam.java

@@ -37,6 +37,11 @@ public class QwUserListParam {
     @Excel(name = "企微")
     private Integer status;
 
+    /**
+    * 登录状态
+    */
+    private Integer loginStatus;
+
     @Excel(name = "员工状态")
     private Integer isDel;
 

fs-service/src/main/java/com/fs/sop/service/impl/SopUserLogsInfoServiceImpl.java

@@ -1057,6 +1057,7 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                 break;
             case 2:
                 processQwSopLogsBySendMsg(param,param.getDraftStrategy());
+                log.info("一键群发操作日志2:{}", JSON.toJSONString(param));
                 break;
         }
 
@@ -1071,6 +1072,7 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
         }
         String[] ids = sopUserLogsIds.toArray(new String[0]);
         param.setIds(ids);
+        log.info("一键群发操作日志1:{}", JSON.toJSONString(param));
         processQwSopLogsBySendMsg(param,param.getDraftStrategy());
         return null;
     }

fs-service/src/main/resources/mapper/course/FsUserCourseCategoryMapper.xml

@@ -38,9 +38,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectFsUserCourseCategoryPidList" resultType="com.fs.his.vo.OptionsVO">
         select cate_id dict_value, cate_name dict_label  from fs_user_course_category WHERE pid = 0 and is_del=0
-        <if test="isShow != null">
-            and is_show = #{isShow}
-        </if>
+        and is_show = 1
+<!--        <if test="isShow != null">-->
+<!--            and is_show = #{isShow} -->
+<!--        </if>-->
+        order by sort asc
     </select>
 
     <insert id="insertFsUserCourseCategory" parameterType="FsUserCourseCategory" useGeneratedKeys="true" keyProperty="cateId">