he2802 3 жил өмнө
parent
commit
2a477a5ea5

+ 1 - 1
zhongzheng-api/src/main/java/com/zhongzheng/controller/cmmon/CommonController.java

@@ -120,7 +120,7 @@ public class CommonController extends BaseController {
         Map<String,Object> map = new HashMap<>();
         map.put("hide",false);
         if(Validator.isNotEmpty(bo.getVersion())){
-            if(bo.getVersion().equals("7.0.1")){
+            if(bo.getVersion().equals("1.3.12")){
                 map.put("hide",true);
             }
         }

+ 3 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -326,9 +326,9 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
             add.setVideoCurrentTime(0L);
         }
         if(Validator.isNotEmpty(add.getStudyDuration())){
-            if(add.getStudyDuration().longValue()>60L){
+           /* if(add.getStudyDuration().longValue()>60L){
                 add.setStudyDuration(60L); //前端60秒提交一次,超过60按60算
-            }
+            }*/
             add.setStartTime(DateUtils.getNowTime().longValue() - add.getStudyDuration().longValue());
         }else{
             add.setStartTime(DateUtils.getNowTime().longValue());
@@ -373,7 +373,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                 if(lastVo.getVideoCurrentTime().longValue()<=add.getVideoCurrentTime().longValue()){
                     lastVo.setStudyDuration(lastVo.getStudyDuration().longValue()+(add.getVideoCurrentTime().longValue()-lastVo.getVideoCurrentTime().longValue()));
                 }else{
-                    lastVo.setStudyDuration(lastVo.getStudyDuration()+add.getStudyDuration());
+                    lastVo.setStudyDuration(lastVo.getStudyDuration().longValue()+add.getStudyDuration().longValue());
                 }
 
                 UserStudyRecord update = BeanUtil.toBean(lastVo, UserStudyRecord.class);