Browse Source

计划修改

change 4 năm trước cách đây
mục cha
commit
bf44608240

+ 5 - 0
zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -397,6 +397,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         return null;
     }
 
+    @Override
+    public Integer selectUserNum(Integer grade) {
+        return baseMapper.selectUserNum(grade);
+    }
+
     /**
      * 获取当前月第一天
      * @param month

+ 10 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityGradeServiceImpl.java

@@ -16,6 +16,7 @@ import com.zhongzheng.modules.activity.service.IActivityGradePrivilegeCouresServ
 import com.zhongzheng.modules.activity.service.IActivityGradePrivilegeService;
 import com.zhongzheng.modules.activity.service.IActivityGradeService;
 import com.zhongzheng.modules.activity.vo.ActivityGradeVo;
+import com.zhongzheng.modules.user.service.IUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -50,6 +51,9 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
     @Autowired
     private ActivityGradePrivilegeMapper activityGradePrivilegeMapper;
 
+    @Autowired
+    private IUserService userService;
+
     @Override
     public ActivityGradeVo queryById(Long id){
         ActivityGrade db = this.baseMapper.selectById(id);
@@ -69,7 +73,12 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
         lqw.orderByDesc(ActivityGrade::getUpdateTime);
         List<ActivityGrade> list = this.list(lqw);
         List<ActivityGradeVo> activityGradeVos = selectGradeCourse(list);
-        return entity2Vo(activityGradeVos);
+        List<ActivityGradeVo> activityGradeVos1 = entity2Vo(activityGradeVos);
+        for (ActivityGradeVo activityGradeVo : activityGradeVos1) {
+            Integer num = userService.selectUserNum(activityGradeVo.getGrade());
+            activityGradeVo.setUserNum(num);
+        }
+        return activityGradeVos1;
     }
 
     /**

+ 6 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityGradeVo.java

@@ -48,6 +48,12 @@ public class ActivityGradeVo {
 	@ApiModelProperty("说明备注")
 	private String remarks;
 
+
+	/** 说明备注 */
+	@Excel(name = "说明备注")
+	@ApiModelProperty("说明备注")
+	private Integer userNum;
+
 	/** 创建时间 */
 	@TableField(fill = FieldFill.INSERT)
 	private Long createTime;

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserMapper.java

@@ -22,4 +22,6 @@ public interface UserMapper extends BaseMapper<User> {
     Integer selectByRankOne(Integer hourse);
 
     RanKingUser selectByOneRank(RanKingUserQuery query);
+
+    Integer selectUserNum(Integer grade);
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserService.java

@@ -67,4 +67,6 @@ public interface IUserService extends IService<User> {
     Integer getIssue(Long userId);
 
 	BigDecimal getMoney(Long userId);
+
+    Integer selectUserNum(Integer grade);
 }

+ 7 - 1
zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -100,6 +100,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         GROUP BY u.user_id
     </select>
-
+    <select id="selectUserNum" parameterType="integer" resultType="int">
+        SELECT
+            COUNT(user_id)
+        FROM
+            `user`
+        WHERE 1=1 and user_level = #{grade}
+    </select>
 
 </mapper>