小程序生成链接代码提交

fs-admin/src/main/java/com/fs/his/task/Task.java

@@ -1582,7 +1582,14 @@ public class Task {
         List<FsUserCoursePeriodDays> periodDaysList = fsUserCoursePeriodDaysMapper.getExecuteInformation();
         if(!periodDaysList.isEmpty()){
             //提取销售公司ID
-            String companyIds = periodDaysList.stream().map(FsUserCoursePeriodDays::getCompanyId).distinct().collect(Collectors.joining(","));
+            Set<String> companyIds = periodDaysList.stream()
+                    .map(FsUserCoursePeriodDays::getCompanyId)
+                    .filter(Objects::nonNull)
+                    .flatMap(ids -> Arrays.stream(ids.split(",")))  // 拆分逗号分隔的字符串
+                    .map(String::trim)  // 去除空格
+                    .filter(s -> !s.isEmpty())  // 过滤空字符串
+                    .collect(Collectors.toSet());
+
             //获取销售公司以及对应员工信息
             List<CompanyUser> companyUserList = companyUserMapper.getPeroidInformation(companyIds);
             if(!companyUserList.isEmpty()){
@@ -1593,26 +1600,29 @@ public class Task {
                 periodDaysList.forEach(p->{
                     String[] companyIdList= p.getCompanyId().split(",");
                     for (String companyId: companyIdList){
-                        List<CompanyUser> userList = companyUserMap.get(companyId);
-                        userList.forEach(u->{
-                            //组装请求数据
-                            JSONObject jsonObject= new JSONObject();
-                            jsonObject.put("id",p.getId());
-                            jsonObject.put("projectCode","YJB");
-                            jsonObject.put("videoId",p.getVideoId());
-                            jsonObject.put("periodId",p.getPeriodId());
-                            jsonObject.put("courseId",p.getCourseId());
-                            jsonObject.put("projectId",p.getProjectId());
-                            jsonObject.put("companyId",u.getCompanyId());
-                            jsonObject.put("companyUserId",u.getUserId());
+                        if(companyUserMap.containsKey(companyId)){
+                            List<CompanyUser> userList = companyUserMap.get(companyId);
+                            userList.forEach(u->{
+                                //组装请求数据
+                                JSONObject jsonObject= new JSONObject();
+                                jsonObject.put("id",p.getId());
+                                jsonObject.put("projectCode","YJB");
+                                jsonObject.put("videoId",p.getVideoId());
+                                jsonObject.put("periodId",p.getPeriodId());
+                                jsonObject.put("courseId",p.getCourseId());
+                                jsonObject.put("projectId",p.getProjectId());
+                                jsonObject.put("companyId",u.getCompanyId());
+                                jsonObject.put("companyUserId",u.getUserId());
+                                System.out.println("打印对应生成链接信息-----------------》："+jsonObject.toJSONString());
                                 //生成看课链接
                                 fsCourseLinkService.getGotoWxAppLink("/pages_course/videovip?course="+jsonObject.toJSONString(),config.getLoginMiniAppId());
-                              try {
-                                Thread.sleep(300);
-                             } catch (InterruptedException e) {
-                                throw new RuntimeException(e);
-                             }
-                        });
+                                try {
+                                    Thread.sleep(300);
+                                } catch (InterruptedException e) {
+                                    throw new RuntimeException(e);
+                                }
+                            });
+                        }
                     }
                 });
             }

fs-service/src/main/java/com/fs/company/mapper/CompanyUserMapper.java

@@ -287,18 +287,26 @@ public interface CompanyUserMapper
 
     /**
      * 获取营期销售公司信息
-     * @param userIds
-     * **/
-    @Select("SELECT\n" +
-            "\tcu.user_id,\n" +
-            "\tcu.company_id \n" +
-            "FROM\n" +
-            "\tcompany c\n" +
-            "\tINNER JOIN company_user cu ON c.company_id = cu.company_id \n" +
-            "WHERE\n" +
-            "\tc.company_id IN (#{userIds})\n" +
-            "\tc.dept_id NOT IN (136,123,121)\n"+
-            "\tAND c.`status` = 1 \n" +
-            "\tAND cu.`status` = 0")
-    List<CompanyUser> getPeroidInformation(@Param("userIds")String userIds);
+     * @param companyIds
+     * @return
+     **/
+    @Select({
+            "<script>",
+            "SELECT",
+            "    cu.user_id,",
+            "    cu.company_id",
+            "FROM",
+            "    company c",
+            "    INNER JOIN company_user cu ON c.company_id = cu.company_id",
+            "WHERE",
+            "    c.company_id IN",
+            "    <foreach collection='companyIds' item='companyId' open='(' separator=',' close=')'>",
+            "        #{companyId}",
+            "    </foreach>",
+            "    AND c.status = 1",
+            "    AND cu.status = 0",
+            "LIMIT 10",
+            "</script>"
+    })
+    List<CompanyUser> getPeroidInformation(@Param("companyIds") Set<String> companyIds);
 }

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

@@ -140,7 +140,7 @@ public interface FsUserCoursePeriodDaysMapper extends BaseMapper<FsUserCoursePer
 
     @Select("SELECT\n" +
             "\tpd.id,\n" +
-            "\tuc.project_id,\n" +
+            "\tuc.project,\n" +
             "\tep.period_id,\n" +
             "\tep.company_id,\n" +
             "\tpd.course_id,\n" +