fix 学时推送

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

@@ -535,6 +535,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 return "班级有效期已结束";
             }
         }
+        if(userVo.getPeriodStatus()!=1){
+            return "学时审核没通过";
+        }
 
         OrderGoodsQueryBo goodsQueryBo = new OrderGoodsQueryBo();
         goodsQueryBo.setUserId(bo.getUserId());
@@ -563,8 +566,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         params.put("xm",userVo.getRealName());
         params.put("sfz",userVo.getIdCard());
         params.put("ksrq",DateUtils.timestampToDate(firstVo.getFirstStartTime()));
-        params.put("jsrq",DateUtils.timestampToDate(userVo.getPeriodTime()));
+        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 = "";

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

@@ -113,4 +113,8 @@ public class ClassGradeUserVo {
 	@Excel(name = "是否学时推送 0未推送 1推送")
 	@ApiModelProperty("是否学时推送 0未推送 1推送")
 	private Integer periodPlush;
+	@ApiModelProperty("学时审批状态 0 未通过 1通过 2待审核 -1 不可审核 3审核中")
+	private Integer periodStatus;
+	@ApiModelProperty("学时变为待审核时间")
+	private Long periodWaitTime;
 }

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

@@ -42,6 +42,8 @@
         <result property="classEndTime" column="class_end_time"/>
         <result property="officialStatusNum" column="official_status_num"/>
         <result property="periodTime" column="period_time"/>
+        <result property="periodWaitTime" column="period_wait_time"/>
+        <result property="periodStatus" column="period_status"/>
     </resultMap>
 
 
@@ -190,7 +192,9 @@
         cg.class_start_time,
         cg.class_end_time,
         g.official_status_num,
-        g.period_time
+        g.period_time,
+        g.period_wait_time,
+        g.period_status
         FROM
         class_grade_user g
         LEFT JOIN `user` u ON g.user_id = u.user_id