updates
This commit is contained in:
parent
865099d714
commit
f0d6439314
|
|
@ -14,6 +14,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.system.vo.LoginUser;
|
import org.jeecg.common.system.vo.LoginUser;
|
||||||
import org.jeecg.common.util.AssertUtils;
|
import org.jeecg.common.util.AssertUtils;
|
||||||
|
import org.jeecg.modules.mini.dto.VipDTO;
|
||||||
|
import org.jeecg.modules.mini.service.MiniUserService;
|
||||||
import org.jeecg.modules.web.dto.ArtRecommendMajorBaseDTO;
|
import org.jeecg.modules.web.dto.ArtRecommendMajorBaseDTO;
|
||||||
import org.jeecg.modules.web.dto.RecommendMajorDTO;
|
import org.jeecg.modules.web.dto.RecommendMajorDTO;
|
||||||
import org.jeecg.modules.web.vo.QueryRecommendMajorVO;
|
import org.jeecg.modules.web.vo.QueryRecommendMajorVO;
|
||||||
|
|
@ -61,7 +63,8 @@ public class YxScoreController {
|
||||||
private IYxScoreSegmentService yxScoreSegmentService;
|
private IYxScoreSegmentService yxScoreSegmentService;
|
||||||
@Resource
|
@Resource
|
||||||
private UserScoreService userScoreService;
|
private UserScoreService userScoreService;
|
||||||
|
@Resource
|
||||||
|
private MiniUserService miniUserService;
|
||||||
@GetMapping("/userScoreList_q23f")
|
@GetMapping("/userScoreList_q23f")
|
||||||
@ApiOperation(value = "后台-用户成绩列表")
|
@ApiOperation(value = "后台-用户成绩列表")
|
||||||
public Result<?> userScoreList(QueryRecommendMajorVO queryVo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
public Result<?> userScoreList(QueryRecommendMajorVO queryVo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||||
|
|
@ -85,6 +88,11 @@ public class YxScoreController {
|
||||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
AssertUtils.notNull(sysUser, "请先登录!");
|
AssertUtils.notNull(sysUser, "请先登录!");
|
||||||
String userId = sysUser.getId();
|
String userId = sysUser.getId();
|
||||||
|
JSONObject jsonObject = userScoreService.todayOfEditScoreCount();
|
||||||
|
VipDTO userVip = miniUserService.getUserVip(userId);
|
||||||
|
if (userVip.getVipLevel() != 9) {
|
||||||
|
AssertUtils.notTrue(jsonObject.getInteger("residueCount") > 0, "已无修改次数");
|
||||||
|
}
|
||||||
String professionalCategory = userScoreUpdateDTO.getProfessionalCategory();
|
String professionalCategory = userScoreUpdateDTO.getProfessionalCategory();
|
||||||
String cognitioPolyclinic = userScoreUpdateDTO.getCognitioPolyclinic();//文科/理科
|
String cognitioPolyclinic = userScoreUpdateDTO.getCognitioPolyclinic();//文科/理科
|
||||||
BigDecimal culturalScore = userScoreUpdateDTO.getCulturalScore();
|
BigDecimal culturalScore = userScoreUpdateDTO.getCulturalScore();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue