班级学时推送数量

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -436,4 +436,24 @@ public class ClassGradeController extends BaseController {
         return AjaxResult.success(iUserPeriodService.checkGoodsChange(bo));
     }
 
+    /**
+     * 查询班级信息推送数量
+     */
+    @ApiOperation("查询班级信息推送数量")
+    @PreAuthorize("@ss.hasPermi('grade:grade:list')")
+    @GetMapping("/officialInfoCount")
+    public AjaxResult<Long> officialInfoCount(ClassGradeUserQueryBo bo) {
+        return AjaxResult.success(iClassGradeUserService.selectOfficialInfoCount(bo));
+    }
+
+    /**
+     * 查询班级学时推送数量
+     */
+    @ApiOperation("查询班级学时推送数量")
+    @PreAuthorize("@ss.hasPermi('grade:grade:list')")
+    @GetMapping("/officialPeriodCount")
+    public AjaxResult<Long> officialPeriodCount(ClassGradeUserQueryBo bo) {
+        return AjaxResult.success(iClassGradeUserService.selectOfficialPeriodCount(bo));
+    }
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeUserMapper.java

@@ -56,4 +56,8 @@ public interface ClassGradeUserMapper extends BaseMapper<ClassGradeUser> {
     Long selectUserCount(User bo);
 
     List<CourseChapterVo> findChapterList(ClassGradeUserQueryBo bo);
+
+    Long selectOfficialInfoCount(ClassGradeUserQueryBo bo);
+
+    Long selectOfficialPeriodCount(ClassGradeUserQueryBo bo);
 }

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

@@ -95,4 +95,8 @@ public interface IClassGradeUserService extends IService<ClassGradeUser> {
 	Long selectList(User bo);
 
 	List<CourseChapterVo> findChapterList(ClassGradeUserQueryBo bo);
+
+	Long selectOfficialInfoCount(ClassGradeUserQueryBo bo);
+
+	Long selectOfficialPeriodCount(ClassGradeUserQueryBo bo);
 }

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

@@ -439,6 +439,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
              objectLambdaUpdateWrapper.set(ClassGradeUser::getOfficialStatusTime,DateUtils.getNowTime());
              objectLambdaUpdateWrapper.set(ClassGradeUser::getOfficialStatusNum,userVo.getOfficialStatusNum()+1);
              this.update(null, objectLambdaUpdateWrapper);
+
+             //修改资料变更状态
+
              return null;
          }else {
              //推送失败
@@ -1452,6 +1455,16 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         return baseMapper.findChapterList(bo);
     }
 
+    @Override
+    public Long selectOfficialInfoCount(ClassGradeUserQueryBo bo) {
+        return baseMapper.selectOfficialInfoCount(bo);
+    }
+
+    @Override
+    public Long selectOfficialPeriodCount(ClassGradeUserQueryBo bo) {
+        return baseMapper.selectOfficialPeriodCount(bo);
+    }
+
     /**
      * 实体类转化成视图对象
      *

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserUpdateAddBo.java

@@ -39,4 +39,5 @@ public class UserUpdateAddBo {
     /** 1已读 2未读 */
     @ApiModelProperty("1已读 2未读")
     private Integer status;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserUpdateEditBo.java

@@ -43,6 +43,8 @@ public class UserUpdateEditBo {
     /** 1已读 2未读 */
     @ApiModelProperty("1已读 2未读")
     private Integer status;
-
+    /** 1已推送 2未推送 */
+    @ApiModelProperty("1已推送 2未推送")
+    private Integer pushStatus;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserUpdateQueryBo.java

@@ -52,4 +52,8 @@ public class UserUpdateQueryBo extends BaseEntity {
 	/** 1已读 2未读 */
 	@ApiModelProperty("1已读 2未读")
 	private Integer status;
+
+	/** 1已推送 2未推送 */
+	@ApiModelProperty("1已推送 2未推送")
+	private Integer pushStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserUpdate.java

@@ -43,4 +43,5 @@ private static final long serialVersionUID=1L;
 
     /** 1已读 2未读 */
     private Integer status;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserUpdateVo.java

@@ -47,4 +47,5 @@ public class UserUpdateVo {
 	/** 1已读 2未读 */
 	@ApiModelProperty("创建时间")
 	private Long createTime;
+
 }

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

@@ -966,4 +966,24 @@
             gc.goods_id = #{goodsId}
           AND m.type IN ( 2 )
     </select>
+
+    <select id="selectOfficialInfoCount" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo" resultType="long">
+        SELECT
+            count(*)
+        FROM
+            class_grade_user cgu
+        WHERE
+            cgu.grade_id = #{gradeId}
+          AND cgu.official_status = 1
+    </select>
+
+    <select id="selectOfficialPeriodCount" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo" resultType="long">
+        SELECT
+            count(*)
+        FROM
+            class_grade_user cgu
+        WHERE
+            cgu.grade_id = #{gradeId}
+          AND cgu.period_plush = 1
+    </select>
 </mapper>