fix 答疑

zhongzheng-api/src/main/java/com/zhongzheng/controller/system/SysDictDataController.java

@@ -45,6 +45,14 @@ public class SysDictDataController extends BaseController
         return AjaxResult.success(list);
     }
 
+    @ApiOperation("获取系统时间")
+    @GetMapping("/sys/time")
+    public AjaxResult<Long> sysTime()
+    {
+        return AjaxResult.success(System.currentTimeMillis()/1000);
+    }
+
+
     /**
      * 查询字典数据详细
      */

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserStudyRecordController.java

@@ -5,9 +5,11 @@ import java.util.Arrays;
 
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.framework.web.service.WxTokenService;
+import com.zhongzheng.modules.grade.domain.UserPeriodStatus;
 import com.zhongzheng.modules.user.bo.UserStudyRecordAddBo;
 import com.zhongzheng.modules.user.bo.UserStudyRecordEditBo;
 import com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo;
+import com.zhongzheng.modules.user.domain.UserStudyRecord;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.modules.user.service.IUserStudyRecordService;
 import com.zhongzheng.modules.user.vo.UserStudyRecordVo;
@@ -101,4 +103,5 @@ public class UserStudyRecordController extends BaseController {
     }
 
 
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserQueryBo.java

@@ -105,4 +105,6 @@ public class ClassGradeUserQueryBo extends BaseEntity {
 	/** 班级有效期结束时间 */
 	@ApiModelProperty("班级有效期结束时间")
 	private Long classEndTime;
+	@ApiModelProperty("剩余学习次数大于0")
+	private Integer studyCountMore;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserStudyRecordAddBo.java

@@ -62,5 +62,4 @@ public class UserStudyRecordAddBo {
     /** 照片添加 */
     @ApiModelProperty("照片添加")
     private String photo;
-
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserStudyRecord.java

@@ -57,4 +57,5 @@ private static final long serialVersionUID=1L;
 
     /** 绑定计划ID */
     private Long planId;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserStudyRecordService.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.user.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.grade.domain.UserPeriodStatus;
 import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.domain.UserStudyRecord;
 import com.zhongzheng.modules.user.vo.*;
@@ -31,6 +32,8 @@ public interface IUserStudyRecordService extends IService<UserStudyRecord> {
 
 	List<UserStudyRecordVo> selectList(UserStudyRecordQueryBo bo);
 
+	UserPeriodStatus selectPeriodCount(UserStudyRecordQueryBo entity);
+
 	/**
 	 * 根据新增业务对象插入用户学习记录
 	 * @param bo 用户学习记录新增业务对象

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

@@ -12,6 +12,8 @@ import com.microsoft.schemas.office.visio.x2012.main.SectionType;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.bank.domain.Exam;
 import com.zhongzheng.modules.course.bo.CourseQueryBo;
+import com.zhongzheng.modules.course.service.ICourseSectionService;
+import com.zhongzheng.modules.course.vo.CourseSectionVo;
 import com.zhongzheng.modules.face.service.IFaceService;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsUserVo;
@@ -99,7 +101,8 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
     @Value("${aliyun.sms.completionReminderCode}")
     private String completionReminderCode;
 
-
+    @Autowired
+    private ICourseSectionService iCourseSectionService;
 
     @Override
     public UserStudyRecordVo queryById(Long recordId) {
@@ -140,6 +143,12 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         return userStudyRecordMapper.selectList(bo);
     }
 
+    @Override
+    public UserPeriodStatus selectPeriodCount(UserStudyRecordQueryBo bo) {
+        UserStudyRecord entity = BeanUtil.toBean(bo, UserStudyRecord.class);
+        return this.baseMapper.selectPeriodCount(entity);
+    }
+
     /**
      * 实体类转化成视图对象
      *
@@ -163,6 +172,10 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Integer insertByAddBo(UserStudyRecordAddBo bo) {
+        CourseSectionVo courseSectionVo =iCourseSectionService.queryById(bo.getSectionId());
+        if(courseSectionVo.getSectionType()==2&&Validator.isNotEmpty(bo.getPhoto())){  //直播有拍照即学完
+            bo.setStatus(1);
+        }
         UserStudyRecord add = BeanUtil.toBean(bo, UserStudyRecord.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
@@ -360,7 +373,6 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
             userStudyRecordPhotoAddBo.setPhoto(bo.getPhoto());
             userStudyRecordPhotoAddBo.setRecordId(entity.getRecordId());
             userStudyRecordPhotoAddBo.setPeriodId(periodId);
-            System.out.println(bo.getPhoto());
             userStudyRecordPhotoService.insertByAddBo(userStudyRecordPhotoAddBo);
         }
     }

zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionChapterExamMapper.xml

@@ -47,9 +47,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                3 as type
         <if test="userId != null ">
                 ,
-            ifnull( (select `status` from user_exam_record uer where uer.exam_id = e.exam_id and uer.user_id = #{userId} ORDER BY uer.record_id desc limit 1),-1) record_status
+            ifnull( (select `status` from user_exam_record uer where uer.exam_id = e.exam_id and uer.user_id = #{userId} and uer.goods_id = #{goodsId} ORDER BY uer.record_id desc limit 1),-1) record_status
             ,
-            ifnull( (select record_id from user_exam_record uer where uer.exam_id = e.exam_id and uer.user_id = #{userId} ORDER BY uer.record_id desc limit 1),-1) record_id
+            ifnull( (select record_id from user_exam_record uer where uer.exam_id = e.exam_id and uer.user_id = #{userId} and uer.goods_id = #{goodsId} ORDER BY uer.record_id desc limit 1),-1) record_id
         </if>
         FROM
             question_chapter_exam qce

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -439,7 +439,7 @@
                 LEFT JOIN goods_course gc ON gc.course_id = c.course_id
         where 1=1
           and gc.goods_id =#{goodsId}
-
+        order by gc.sort asc
     </select>
 
     <select id="rebuildNext" parameterType="Long"  resultType="Long">

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -301,11 +301,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cgu.official_status,
         cgu.learn_status,
         (SELECT COUNT(m.id) FROM course_menu_exam m LEFT JOIN goods_course c on m.course_id=c.course_id LEFT JOIN class_grade_goods cgg on cgg.goods_id = c.goods_id where cg.grade_id=cgg.grade_id and m.type = 1 ) as exam_num,
-        (SELECT COUNT(DISTINCT ubr.exam_id) FROM user_bank_record ubr LEFT JOIN class_grade_goods cgg on cgg.goods_id = ubr.goods_id where ubr.`status`=1 and ubr.user_id = u.user_id and ubr.grade_id = cgu.grade_id and ubr.report_status=1) as record_num
+        (SELECT COUNT(DISTINCT ubr.exam_id) FROM user_bank_record ubr LEFT JOIN class_grade_goods cgg on cgg.goods_id = ubr.goods_id where ubr.`status`=1 and ubr.user_id = u.user_id and ubr.grade_id = cgu.grade_id and ubr.report_status=1) as record_num,
+        (g.study_count-1) as study_count
         FROM
         class_grade_user cgu
         LEFT JOIN class_grade cg ON cgu.grade_id = cg.grade_id
         LEFT JOIN `user` u ON u.user_id = cgu.user_id
+        LEFT JOIN order_goods og on cgu.order_goods_id = og.order_goods_id
+        LEFT JOIN goods g on og.goods_id = g.goods_id
         where 1=1
         and cgu.`status` =1
         <if test="gradeId != null and gradeId !='' ">
@@ -321,6 +324,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and cge.`status`=1 and cgur.`status` =1)> 0
             AND (SELECT COUNT(cgde.grade_id) FROM class_grade cgde where cgde.grade_id = cg.grade_id and (unix_timestamp(now()) &lt; cgde.class_end_time or cgde.class_start_time is null)) =0
         </if>
+        <if test="studyCountMore != null and studyCountMore == 1 ">
+            AND g.study_count > 1
+        </if>
         order by cgu.create_time desc
     </select>