submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -1243,8 +1243,11 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
             UserStudyRecord startRecord = iUserStudyRecordService.getStudyRecord(item.getUserId(), item.getGradeId(), "ASC");
             if (ObjectUtils.isNotNull(startRecord)) {
                 item.setBeginTime(DateUtils.timestampToDateFormat(startRecord.getCreateTime(), date));
-                UserStudyRecord endRecord = iUserStudyRecordService.getStudyRecord(item.getUserId(), item.getGradeId(), "DESC");
-                item.setApplyTime(DateUtils.timestampToDateFormat(endRecord.getCreateTime(), date));
+                if (ObjectUtils.isNotNull(item.getFinishStatus()) && item.getFinishStatus() == 1){
+                    //已学完
+                    UserStudyRecord endRecord = iUserStudyRecordService.getStudyRecord(item.getUserId(), item.getGradeId(), "DESC");
+                    item.setApplyTime(DateUtils.timestampToDateFormat(endRecord.getCreateTime(), date));
+                }
             }
             //科目名称
             if (StringUtils.isNotBlank(item.getSubjectIds())) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassNpUserInfoVo.java

@@ -19,6 +19,8 @@ public class ClassNpUserInfoVo implements Serializable {
 
     private Long gradeId;
 
+    private Integer finishStatus;
+
     private String subjectIds;
 
     /// 机构id

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

@@ -201,6 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="doTimeLong" column="doTimeLong"/>
         <result property="reportStatu" column="reportStatu"/>
         <result property="studyQueueStatus" column="studyQueueStatus"/>
+        <result property="finishStatus" column="finishStatus"/>
         <result property="applyTimeLong" column="applyTimeLong"/>
         <result property="userId" column="user_id"/>
         <result property="subjectIds" column="subject_ids"/>
@@ -949,6 +950,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cgu.official_status as reportStatu,
             cgu.period_plush as studyQueueStatus,
             cgu.period_wait_time as applyTimeLong,
+            cgu.finish_status as finishStatus,
             u.user_id,
             cg.grade_id,
             g.subject_ids