学时数量

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/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/java/com/zhongzheng/modules/grade/vo/ClassPeriodStudentVo.java

@@ -179,4 +179,8 @@ public class ClassPeriodStudentVo {
 	private Long classEndTime;
 
 	private Integer gradePeriodStatus;
+	/** 官方学时推送次数 */
+	@Excel(name = "官方学时推送次数")
+	@ApiModelProperty("官方学时推送次数")
+	private Long periodStatusNum;
 }

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

@@ -51,6 +51,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>
 
 
@@ -103,6 +104,7 @@
         <result property="keyValue" column="key_value"/>
         <result property="classStartTime" column="class_start_time"/>
         <result property="classEndTime" column="class_end_time"/>
+        <result property="periodStatusNum" column="period_status_num"/>
 
     </resultMap>
 
@@ -305,6 +307,7 @@
         cg.class_end_time,
         cg.class_name,
         cgu.period_plush,
+        cgu.period_status_num,
         IFNULL(ge.exam_num,0) as exam_num,
         <if test="userPhoto != null and userPhoto == 1">
         up.key_value,