fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeUserMapper.java

@@ -54,6 +54,8 @@ public interface ClassGradeUserMapper extends BaseMapper<ClassGradeUser> {
 
     List<Long> selectStart(@Param("userId") Long userId,@Param("goodsId") Long goodsId,@Param("gradeId") Long gradeId);
 
+    List<Long> selectEnd(@Param("userId") Long userId,@Param("goodsId") Long goodsId,@Param("gradeId") Long gradeId);
+
     List<ClassGradeUserGoodsVo> sendClassGradeUser();
 
     Long checkSendClassGradeUser(@Param("remindId") Integer remindId,@Param("userId") Long userId,@Param("gradeId") Long gradeId);

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

@@ -1102,7 +1102,10 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 //查找开始学习时间
                 classPeriodStudentVo.setStartTime(baseMapper.selectStart(classPeriodStudentVo.getUserId(), classPeriodStudentVo.getGoodsId(), classPeriodStudentVo.getGradeId()).get(0));
             }
-
+            if (!CollectionUtils.isEmpty(baseMapper.selectEnd(classPeriodStudentVo.getUserId(), classPeriodStudentVo.getGoodsId(), classPeriodStudentVo.getGradeId()))) {
+                //查找开始学习结束
+                classPeriodStudentVo.setEndTime(baseMapper.selectEnd(classPeriodStudentVo.getUserId(), classPeriodStudentVo.getGoodsId(), classPeriodStudentVo.getGradeId()).get(0));
+            }
             //当审核状态状态为通过是采取解析身份证和一寸照
             if ("1".equals(classPeriodStudentVo.getProfileStatus()) && Validator.isNotEmpty(bo.getUserPhoto()) && bo.getUserPhoto() == 1) {
                 //解析身份证和一寸照

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

@@ -1150,6 +1150,26 @@
         ORDER BY create_time ASC
     </select>
 
+    <select id="selectEnd" parameterType="map" resultType="long">
+        SELECT
+            usr.end_time
+        FROM
+            user_study_record usr
+        WHERE
+            usr.goods_id = #{goodsId}
+          AND usr.grade_id = #{gradeId}
+          AND usr.user_id = #{userId} UNION
+        SELECT
+            ubr.update_time as end_time
+        FROM
+            user_bank_record ubr
+        WHERE
+            ubr.goods_id =#{goodsId}
+          AND ubr.grade_id = #{gradeId}
+          AND ubr.user_id = #{userId}
+        ORDER BY end_time DESC
+    </select>
+
     <select id="sendClassGradeUser"  resultMap="ClassGradeUserGoodsVoResult">
         SELECT
         cgu.user_id,