体验人数，直接查student表

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleEvaluateDao.java

@@ -157,7 +157,14 @@ public interface CourseScheduleEvaluateDao extends BaseDAO<Long, CourseScheduleE
 
     /**
      * 禁止中vip和网管同时存在人数
+     *
      * @return
      */
     List<Practice4OrganDto> getPracticeAndVipTryNums();
+
+    /**
+     * 获取所有的体验人数
+     * @return
+     */
+    List<Practice4OrganDto> getAllTryNums();
 }

mec-biz/src/main/resources/config/mybatis/CourseScheduleEvaluateMapper.xml

@@ -421,4 +421,12 @@
         AND pg.buy_months_ >= 1
         GROUP BY pg.organ_id_
     </select>
+
+    <!-- 获取所有体验人数 -->
+    <select id="getAllTryNums" resultMap="practice4Organ">
+        SELECT su.organ_id_, COUNT(s.user_id_) try_num_ FROM student s
+        LEFT JOIN sys_user su ON  su.id_ = s.user_id_
+            WHERE s.operating_tag_ =1 AND su.organ_id_ >0
+        GROUP BY su.organ_id_
+    </select>
 </mapper>

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -496,10 +496,12 @@ public class StudentOrderController extends BaseController {
         Date nowDate = new Date();
         List<Organization> organs = organizationDao.findAllOrgans();
         //除去禁止的体验人数
-        List<Practice4OrganDto> organTryNums = courseScheduleEvaluateDao.getTryNums();
-        List<Practice4OrganDto> organPracticeTryNums = courseScheduleEvaluateDao.getPracticeTryNums();
-        List<Practice4OrganDto> organVipTryNums = courseScheduleEvaluateDao.getVipTryNums();
-        List<Practice4OrganDto> organPracticeAndVipTryNums = courseScheduleEvaluateDao.getPracticeAndVipTryNums();
+//        List<Practice4OrganDto> organTryNums = courseScheduleEvaluateDao.getTryNums();
+//        List<Practice4OrganDto> organPracticeTryNums = courseScheduleEvaluateDao.getPracticeTryNums();
+//        List<Practice4OrganDto> organVipTryNums = courseScheduleEvaluateDao.getVipTryNums();
+//        List<Practice4OrganDto> organPracticeAndVipTryNums = courseScheduleEvaluateDao.getPracticeAndVipTryNums();
+        List<Practice4OrganDto> allTryNums = courseScheduleEvaluateDao.getAllTryNums();
+
         List<Practice4OrganDto> practiceBuyNums = courseScheduleEvaluateDao.getPracticeBuyNums(nowDate, null);
         List<Practice4OrganDto> vipBuyNums = courseScheduleEvaluateDao.getVipBuyNums(nowDate, null);
 
@@ -532,31 +534,37 @@ public class StudentOrderController extends BaseController {
             practice4OrganDto.setOrganName(organ.getName());
             practice4OrganDto.setOrganId(organ.getId());
             //体验人数(除去禁止)
-            for (Practice4OrganDto organTryNum : organTryNums) {
-                if (organ.getId().equals(organTryNum.getOrganId())) {
-                    practice4OrganDto.setTryNum(practice4OrganDto.getTryNum() + organTryNum.getTryNum());
-                    break;
-                }
-            }
-            //网管课体验人数（禁止）
-            for (Practice4OrganDto organPracticeTryNum : organPracticeTryNums) {
-                if (organ.getId().equals(organPracticeTryNum.getOrganId())) {
-                    practice4OrganDto.setTryNum(practice4OrganDto.getTryNum() + organPracticeTryNum.getTryNum());
-                    break;
-                }
-            }
-            //vip课体验人数（禁止）
-            for (Practice4OrganDto organVipTryNum : organVipTryNums) {
-                if (organ.getId().equals(organVipTryNum.getOrganId())) {
-                    practice4OrganDto.setTryNum(practice4OrganDto.getTryNum() + organVipTryNum.getTryNum());
-                    break;
-                }
-            }
-            //减去vip中在网管课的人数
-            for (Practice4OrganDto organPracticeAndVipTryNum : organPracticeAndVipTryNums) {
-                if (organ.getId().equals(organPracticeAndVipTryNum.getOrganId())) {
-                    practice4OrganDto.setTryNum(practice4OrganDto.getTryNum() - organPracticeAndVipTryNum.getTryNum());
-                    break;
+//            for (Practice4OrganDto organTryNum : organTryNums) {
+//                if (organ.getId().equals(organTryNum.getOrganId())) {
+//                    practice4OrganDto.setTryNum(practice4OrganDto.getTryNum() + organTryNum.getTryNum());
+//                    break;
+//                }
+//            }
+//            //网管课体验人数（禁止）
+//            for (Practice4OrganDto organPracticeTryNum : organPracticeTryNums) {
+//                if (organ.getId().equals(organPracticeTryNum.getOrganId())) {
+//                    practice4OrganDto.setTryNum(practice4OrganDto.getTryNum() + organPracticeTryNum.getTryNum());
+//                    break;
+//                }
+//            }
+//            //vip课体验人数（禁止）
+//            for (Practice4OrganDto organVipTryNum : organVipTryNums) {
+//                if (organ.getId().equals(organVipTryNum.getOrganId())) {
+//                    practice4OrganDto.setTryNum(practice4OrganDto.getTryNum() + organVipTryNum.getTryNum());
+//                    break;
+//                }
+//            }
+//            //减去vip中在网管课的人数
+//            for (Practice4OrganDto organPracticeAndVipTryNum : organPracticeAndVipTryNums) {
+//                if (organ.getId().equals(organPracticeAndVipTryNum.getOrganId())) {
+//                    practice4OrganDto.setTryNum(practice4OrganDto.getTryNum() - organPracticeAndVipTryNum.getTryNum());
+//                    break;
+//                }
+//            }
+
+            for (Practice4OrganDto allTryNum : allTryNums) {
+                if (organ.getId().equals(allTryNum.getOrganId())) {
+                    practice4OrganDto.setTryNum(allTryNum.getTryNum());
                 }
             }
             //网管课转化人数