Merge remote-tracking branch 'origin/master'

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

@@ -350,7 +350,7 @@
                  LEFT JOIN student s ON s.user_id_ = cssp.user_id_
         WHERE vg.organ_id_ >= 1
           AND s.operating_tag_ = 0
-          AND cs.is_lock_ != 1
+          AND (cs.is_lock_ IS NULL OR cs.is_lock_=0)
           AND cs.teach_mode_ = 'ONLINE'
         GROUP BY vg.organ_id_
     </select>
@@ -365,7 +365,7 @@
         <if test="endDate != null">
             <![CDATA[AND CONCAT(cs.class_date_, ' ', cs.end_class_time_) < #{endDate}]]>
         </if>
-        AND cs.is_lock_ != 1
+        AND (cs.is_lock_ IS NULL OR cs.is_lock_=0)
         AND cs.teach_mode_ = 'ONLINE'
         GROUP BY vg.organ_id_
     </select>
@@ -384,7 +384,7 @@
             AND FIND_IN_SET(cssp.user_id_,#{studentIds})
         </if>
         AND pg.buy_months_ >= 1
-        AND cs.is_lock_ != 1
+        AND (cs.is_lock_  IS NULL OR cs.is_lock_=0)
         GROUP BY pg.organ_id_
     </select>
 </mapper>

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

@@ -577,7 +577,6 @@ public class StudentOrderController extends BaseController {
             for (Practice4OrganDto practiceBuyNum : practiceBuyNums) {
                 if (organ.getId().equals(practiceBuyNum.getOrganId())) {
                     practice4OrganDto.setPracticeNum(practiceBuyNum.getPracticeNum());
-                    practice4OrganDto.setTotalNum(practice4OrganDto.getTotalNum() + practiceBuyNum.getPracticeNum());
                     break;
                 }
             }
@@ -585,17 +584,16 @@ public class StudentOrderController extends BaseController {
             for (Practice4OrganDto vipBuyNum : vipBuyNums) {
                 if (organ.getId().equals(vipBuyNum.getOrganId())) {
                     practice4OrganDto.setVipNum(vipBuyNum.getVipNum());
-                    practice4OrganDto.setTotalNum(practice4OrganDto.getTotalNum() + vipBuyNum.getVipNum());
                     break;
                 }
             }
             for (Practice4OrganDto practiceAndVipBuyNum : practiceAndVipBuyNums) {
                 if (organ.getId().equals(practiceAndVipBuyNum.getOrganId())) {
                     practice4OrganDto.setVipNum(practice4OrganDto.getVipNum() - practiceAndVipBuyNum.getPracticeNum());
-                    practice4OrganDto.setTotalNum(practice4OrganDto.getTotalNum() - practiceAndVipBuyNum.getVipNum());
                     break;
                 }
             }
+            practice4OrganDto.setTotalNum(practice4OrganDto.getPracticeNum() + practice4OrganDto.getVipNum());
 
             //当月新增网管课人数
             for (PracticeGroupsDto monthOrganPracticeBuyMoney : monthOrganPracticeBuyMoneys) {