fix 推送

zhongzheng-admin/src/main/java/com/zhongzheng/controller/schedule/ScheduleController.java

@@ -145,7 +145,7 @@ public class ScheduleController extends BaseController {
      * 官方信息推送
      * @return
      */
-    @ApiOperation("官方信息推送")
+    @ApiOperation("定时官方信息推送")
     @GetMapping("/officialInfoPush")
     public AjaxResult officialInfoPush(UserQueryBo bo){
         iScheduleService.officialInfoPush(bo);
@@ -156,7 +156,7 @@ public class ScheduleController extends BaseController {
      * 官方学时推送
      * @return
      */
-    @ApiOperation("官方学时推送")
+    @ApiOperation("定时官方学时推送")
     @GetMapping("/officialPeriodPush")
     public AjaxResult officialPeriodPush(UserQueryBo bo){
         iScheduleService.officialPeriodPush(bo);

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsVo.java

@@ -249,4 +249,8 @@ public class GoodsVo {
 	@Excel(name = "服务期数值")
 	@ApiModelProperty("服务期数值")
 	private Long serviceTimeNum;
+
+	@ApiModelProperty("班级数量")
+	private Long gradeNum;
+
 }

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -101,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sectionNum" column="section_num"/>
         <result property="serviceTimeType" column="service_time_type"/>
         <result property="serviceTimeNum" column="service_time_num"/>
+        <result property="gradeNum" column="grade_num"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo" id="ExamNumberGoodsVoResult">
@@ -135,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         <if test="goodsType ==1">
         , (SELECT count(*) FROM goods_course where goods_id =g.goods_id ) as course_num
+        , (SELECT count(*) FROM class_grade_goods where goods_id =g.goods_id ) as grade_num
         </if>
         FROM
         goods g

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

@@ -1038,7 +1038,7 @@
           AND g.`status` = 1
           AND gu.`status` = 1
           AND gu.change_grade = 0
-          AND gu.official_status !=1
+          AND IFNULL(gu.official_status,0) != 1
     </select>
 
     <select id="selectPeriodNotPush" parameterType="com.zhongzheng.modules.user.bo.UserQueryBo" resultMap="ClassGradeUserGoodsVoResult">
@@ -1052,7 +1052,7 @@
           AND g.`status` = 1
           AND gu.`status` = 1
           AND gu.change_grade = 0
-          AND gu.period_plush !=1
+          AND IFNULL(gu.period_plush,0) != 1
           AND gu.period_status = 1
     </select>
 </mapper>