fix 学时

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

@@ -70,5 +70,7 @@ private static final long serialVersionUID=1L;
     private Long officialStatusNum;
     /** 是否学时推送 0未推送 1推送 */
     private Integer periodPlush;
+    /** 官方学时推送次数 */
+    private Long periodStatusNum;
 }
 

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

@@ -568,7 +568,6 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         params.put("ksrq",DateUtils.timestampToDate(firstVo.getFirstStartTime()));
         params.put("jsrq",DateUtils.timestampToDate(userVo.getPeriodWaitTime()));
         String  dataTxt = params.get("zh")+params.get("bh")+params.get("xm")+params.get("sfz")+params.get("ksrq")+params.get("jsrq");
-        System.out.println(dataTxt+"学时");
         String encrypted = dataSign(dataTxt,OFFICIALPUSH_TOKEN);
         params.put("SignMsg",encrypted);
         String respone = "";
@@ -586,6 +585,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 objectLambdaUpdateWrapper.set(ClassGradeUser::getPeriodPlushMsg, respone);
                 objectLambdaUpdateWrapper.set(ClassGradeUser::getUpdateTime,DateUtils.getNowTime());
                 objectLambdaUpdateWrapper.set(ClassGradeUser::getPeriodPlushTime,DateUtils.getNowTime());
+                objectLambdaUpdateWrapper.set(ClassGradeUser::getPeriodStatusNum,userVo.getPeriodStatusNum()+1);
                 this.update(null, objectLambdaUpdateWrapper);
                 return null;
             }else {

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

@@ -154,4 +154,7 @@ public class ClassGradeStudentVo {
 	@Excel(name = "官方信息推送接口")
 	@ApiModelProperty("官方信息推送接口")
 	private Long interfacePushId;
+	/** 是否学时推送 0未推送 1推送 */
+	@ApiModelProperty("是否学时推送 0未推送 1推送")
+	private Integer periodPlush;
 }

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

@@ -117,4 +117,8 @@ public class ClassGradeUserVo {
 	private Integer periodStatus;
 	@ApiModelProperty("学时变为待审核时间")
 	private Long periodWaitTime;
+	/** 官方学时推送次数 */
+	@Excel(name = "官方学时推送次数")
+	@ApiModelProperty("官方学时推送次数")
+	private Long periodStatusNum;
 }

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

@@ -149,6 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="officialStatusNum" column="official_status_num"/>
         <result property="officialStatusTime" column="official_status_time"/>
         <result property="interfacePushId" column="interface_push_id"/>
+        <result property="periodPlush" column="period_plush"/>
     </resultMap>
 
 
@@ -309,6 +310,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cg.interface_push_id,
         cgu.official_status,
         cgu.learn_status,
+        cgu.period_plush,
         (SELECT COUNT(m.id) FROM course_menu_exam m LEFT JOIN goods_course c on m.course_id=c.course_id LEFT JOIN class_grade_goods cgg on cgg.goods_id = c.goods_id where cg.grade_id=cgg.grade_id and m.type = 1 ) as exam_num,
         (SELECT COUNT(DISTINCT ubr.module_id,ubr.chapter_id,ubr.exam_id) FROM user_bank_record ubr LEFT JOIN class_grade_goods cgg on cgg.goods_id = ubr.goods_id where ubr.`status`=1 and ubr.user_id = u.user_id and ubr.grade_id = cgu.grade_id and ubr.report_status=1 and ubr.current_status = 1) as record_num,
         (og.study_count) as study_count,

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

@@ -21,6 +21,7 @@
         <result property="officialStatusTime" column="official_status_time"/>
         <result property="periodPlushTime" column="period_plush_time"/>
         <result property="officialStatusNum" column="official_status_num"/>
+        <result property="periodStatusNum" column="period_status_num"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassGradeUserVo" id="ClassGradeUserVoResult">
@@ -44,6 +45,7 @@
         <result property="periodTime" column="period_time"/>
         <result property="periodWaitTime" column="period_wait_time"/>
         <result property="periodStatus" column="period_status"/>
+        <result property="periodStatusNum" column="period_status_num"/>
     </resultMap>