修改订单记录

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

@@ -162,17 +162,28 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
             userPeriodStatusAddBo.setStatus(2);
             userPeriodStatusAddBo.setPeriodId(userPeriod.getId());
             iUserPeriodStatusService.save(userPeriodStatusAddBo);
-        }
-        //待审有结束时间跳过下面两步
-        if (baseMapper.selectPeriod(entity) < 1){
-        //有学习记录时审核记录或0作弊或3待重修更改为待审核，完整播放也添加结束时间
-            UserPeriodStatus userPeriodStatus = baseMapper.selectPeriodCount(entity);
-            if (userPeriodStatus.getStatus() == 0){
-
-            }else {
+        }else {
+            //待审有结束时间跳过下面两步
+            if (baseMapper.selectPeriod(entity) < 1) {
+                //有学习记录时审核记录或0作弊或3待重修更改为待审核，完整播放也添加结束时间
+                UserPeriodStatus userPeriodStatus = baseMapper.selectPeriodCount(entity);
+                if (userPeriodStatus.getStatus() == 0) {
+                    userPeriodStatus.setPeriodStatus(0);
+                    iUserPeriodStatusService.updateById(userPeriodStatus);
+                    UserPeriodStatus userPeriodStatusAddBo = new UserPeriodStatus();
+                    userPeriodStatusAddBo.setPeriodStatus(1);
+                    userPeriodStatusAddBo.setStatus(2);
+                    userPeriodStatusAddBo.setPeriodId(userPeriodStatus.getId());
+                    userPeriodStatusAddBo.setRecordStartTime(entity.getStartTime());
+                    if (entity.getStatus() ==1) {
+                        userPeriodStatusAddBo.setRecordEndTime(entity.getEndTime());
+                    }
+                    iUserPeriodStatusService.save(userPeriodStatusAddBo);
+                } else {
 
+                }
+                //有学习记录完整播放且为待审添加结束时间
             }
-        //有学习记录完整播放且为待审添加结束时间
         }
         //记录照片
         UserStudyRecordPhotoAddBo userStudyRecordPhotoAddBo = new UserStudyRecordPhotoAddBo();

zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -92,16 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="recordNum" column="record_num"/>
     </resultMap>
 
-    <resultMap type="com.zhongzheng.modules.user.domain.UserPeriodStatus" id="UserPeriodStatusResult">
-        <result property="status" column="status"/>
-        <result property="recordStartTime" column="record_start_time"/>
-        <result property="recordEndTime" column="record_end_time"/>
-        <result property="id" column="id"/>
-        <result property="periodId" column="period_id"/>
-        <result property="periodStatus" column="period_status"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateTime" column="update_time"/>
-    </resultMap>
+
 
     <select id="selectList" parameterType="com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo"  resultMap="UserStudyRecordResult">
         SELECT DISTINCT
@@ -565,7 +556,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     AND ups.record_end_time is NOT NULL
     </select>
 
-    <select id="selectPeriodCount" parameterType="com.zhongzheng.modules.user.domain.UserStudyRecord" resultMap="">
+    <resultMap type="com.zhongzheng.modules.grade.vo.UserPeriodStatusVo" id="UserPeriodStatusVo">
+        <result property="status" column="status"/>
+        <result property="recordStartTime" column="record_start_time"/>
+        <result property="recordEndTime" column="record_end_time"/>
+        <result property="id" column="id"/>
+        <result property="periodId" column="period_id"/>
+        <result property="periodStatus" column="period_status"/>
+        <result property="auditTime" column="audit_time"/>
+        <result property="type" column="type"/>
+        <result property="typeName" column="type_name"/>
+        <result property="realName" column="realname"/>
+    </resultMap>
+
+    <select id="selectPeriodCount" parameterType="com.zhongzheng.modules.user.domain.UserStudyRecord" resultMap="UserPeriodStatusVo">
         SELECT
         ups.*
         FROM