he2802 2 年之前
父节点
当前提交
270cd721de

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

@@ -1248,7 +1248,6 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                     UserStudyRecord endRecord = iUserStudyRecordService.getStudyRecord(item.getUserId(), item.getGradeId(), "DESC");
                     item.setApplyTime(DateUtils.timestampToDateFormat(endRecord.getCreateTime(), date));
                 }
-
             }
             //科目名称
             if (StringUtils.isNotBlank(item.getSubjectIds())) {

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

@@ -21,6 +21,7 @@ public class ClassNpUserInfoVo implements Serializable {
 
     private Long gradeId;
 
+
     private String subjectIds;
 
     /// 机构id

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

@@ -202,6 +202,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reportStatu" column="reportStatu"/>
         <result property="finishStatus" column="finishStatus"/>
         <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"/>
@@ -951,6 +952,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cgu.finish_status as finishStatus,
             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