fix 合并

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

@@ -461,7 +461,7 @@ public class ClassGradeController extends BaseController {
     @ApiOperation("查询班级信息推送数量")
     @PreAuthorize("@ss.hasPermi('grade:grade:list')")
     @GetMapping("/officialInfoCount")
-    public AjaxResult<Long> officialInfoCount(ClassGradeUserQueryBo bo) {
+    public AjaxResult<Map<String,Object>> officialInfoCount(ClassGradeUserQueryBo bo) {
         return AjaxResult.success(iClassGradeUserService.selectOfficialInfoCount(bo));
     }
 

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

@@ -13,6 +13,7 @@ import com.zhongzheng.modules.user.domain.User;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 学员记录Service接口
@@ -102,7 +103,7 @@ public interface IClassGradeUserService extends IService<ClassGradeUser> {
 
 	List<CourseChapterVo> findChapterList(ClassGradeUserQueryBo bo);
 
-	Long selectOfficialInfoCount(ClassGradeUserQueryBo bo);
+	Map<String,Object> selectOfficialInfoCount(ClassGradeUserQueryBo bo);
 
 	Long selectOfficialPeriodCount(ClassGradeUserQueryBo bo);
 

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

@@ -1594,8 +1594,11 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     }
 
     @Override
-    public Long selectOfficialInfoCount(ClassGradeUserQueryBo bo) {
-        return baseMapper.selectOfficialInfoCount(bo);
+    public Map<String,Object> selectOfficialInfoCount(ClassGradeUserQueryBo bo) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("officialInfoCount",baseMapper.selectOfficialInfoCount(bo));
+        map.put("learnStatus",baseMapper.selectLearnStatusCount(bo));
+        return map;
     }
 
     @Override