fix 学时审核资料状态

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

@@ -57,4 +57,7 @@ public class ClassGradeUserAddBo {
     /** 官方学习账号推送状态 0否 1是 */
     @ApiModelProperty("官方学习账号推送状态 0否 1是 ")
     private Integer learnStatus;
+    /** 学时变为待审核时间 */
+    @ApiModelProperty("学时变为待审核时间")
+    private Long periodWaitTime;
 }

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

@@ -62,5 +62,7 @@ public class ClassGradeUserEditBo {
     @ApiModelProperty("官方学习账号推送状态 0否 1是")
     private Integer learnStatus;
 
-
+    /** 学时变为待审核时间 */
+    @ApiModelProperty("学时变为待审核时间")
+    private Long periodWaitTime;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/domain/ClassGradeUser.java

@@ -52,5 +52,7 @@ private static final long serialVersionUID=1L;
     private Integer officialStatus;
     /** 官方学习账号推送状态 0否 1是 */
     private Integer learnStatus;
+    /** 学时变为待审核时间 */
+    private Long periodWaitTime;
 }
 

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

@@ -130,5 +130,8 @@ public class ClassGradeVo {
 	@ApiModelProperty("学员人数")
 	private Integer studentNum;
 
-
+	/** 学时变为待审核时间 */
+	@Excel(name = "学时变为待审核时间")
+	@ApiModelProperty("学时变为待审核时间")
+	private Long periodWaitTime;
 }

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

@@ -201,6 +201,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                 classGradeUser.eq(ClassGradeUser::getGradeId, bo.getGradeId());
                 ClassGradeUser classGradeUser1 = new ClassGradeUser();
                 classGradeUser1.setPeriodStatus(2);
+                classGradeUser1.setPeriodWaitTime(DateUtils.getNowTime());
                 classGradeUser1.setUpdateTime(DateUtils.getNowTime());
                 List<ClassGradeUser> list1 = iClassGradeUserService.list(classGradeUser);
                 iClassGradeUserService.update(classGradeUser1, classGradeUser);

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

@@ -13,6 +13,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="fromType" column="from_type"/>
         <result property="orderGoodsId" column="order_goods_id"/>
+        <result property="periodWaitTime" column="period_wait_time"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassGradeUserVo" id="ClassGradeUserVoResult">
@@ -245,7 +246,12 @@
         <if test="periodStatus != null ">
             and cgu.period_status = #{periodStatus}
         </if>
-        order by cgu.update_time desc
+        <if test="periodStatus == 2 ">
+            order by cgu.period_wait_time,cgu.update_time desc
+        </if>
+        <if test="periodStatus != 2 ">
+            order by cgu.update_time desc
+        </if>
     </select>
 
     <select id="listPeriod" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo"