Browse Source

资料审核

change 3 years ago
parent
commit
1d6ac6adcf

+ 12 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserPlanServiceImpl.java

@@ -183,6 +183,10 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
             for (CalendarStudyVo clCalendarStudyVo : clCalendarStudyVos) {
                 for (DayStudyVo dayStudyVo : clCalendarStudyVo.getDayStudyList()) {
                     if (Arrays.asList(bo.getStudyCount()).contains(dayStudyVo.getStudyDay())){
+                        if (allNum.equals(0)){
+                            break;
+                        }
+                        allNum -= Sec;
                         if (dayStudyVo.getStudyCourseKnob() != null) {
                             dayStudyVo.setStudyCourseKnob(dayStudyVo.getStudyCourseKnob() + Sec);
                         }else {
@@ -254,6 +258,10 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
             for (CalendarStudyVo clCalendarStudyVo : clCalendarStudyVos) {
                 for (DayStudyVo dayStudyVo : clCalendarStudyVo.getDayStudyList()) {
                     if (Arrays.asList(bo.getStudyCount()).contains(dayStudyVo.getStudyDay())){
+                        if (allNum.equals(0)){
+                            break;
+                        }
+                        allNum -= Sec;
                         if (dayStudyVo.getStudyCourseKnob() != null) {
                             dayStudyVo.setStudyCourseKnob(dayStudyVo.getStudyCourseKnob() + Sec);
                         }else {
@@ -347,6 +355,10 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
             for (CalendarStudyVo clCalendarStudyVo : clCalendarStudyVos) {
                 for (DayStudyVo dayStudyVo : clCalendarStudyVo.getDayStudyList()) {
                     if (Arrays.asList(bo.getStudyCount()).contains(dayStudyVo.getStudyDay())){
+                        if (allNum.equals(0)){
+                            break;
+                        }
+                        allNum -= Sec;
                         if (dayStudyVo.getStudyCourseKnob() != null) {
                             dayStudyVo.setStudyCourseKnob(dayStudyVo.getStudyCourseKnob() + Sec);
                         }else {

+ 2 - 1
zhongzheng-system/src/main/resources/mapper/modules/user/UserPlanMapper.xml

@@ -95,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         COUNT(up.plan_id)
         FROM
         user_plan up
-        LEFT JOIN user_plan_goods upg ON up.plan_id = upg.plan_id
+        LEFT JOIN user_plan_goods upg ON up.plan_id = upg.plan_id where 1=1
         <if test="goodsId != null and goodsId !=''">
             and upg.source_id in
             <foreach collection="goodsId" open="(" separator="," close=")" item="goodsId">
@@ -105,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="userId != null and userId !=''">
             and up.user_id = #{userId}
         </if>
+        and `status` =1
     </select>
 
     <select id="selectGoods" parameterType="long"  resultType="Long">