From bc2dd7ac1bbd725eb9b158f4530c99c66b9edc83 Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Fri, 31 May 2024 23:27:13 +0800 Subject: [PATCH] updates --- .../controller/WebScoreSegmentController.java | 67 +++++++++++++++++++ .../modules/web/dto/RecommendMajorDTO.java | 2 - .../modules/web/dto/WebScoreSegmentDTO.java | 22 ++++++ .../modules/yx/entity/YxScoreSegment.java | 2 + 4 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/WebScoreSegmentController.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/WebScoreSegmentDTO.java diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/WebScoreSegmentController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/WebScoreSegmentController.java new file mode 100644 index 0000000..fb57bda --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/WebScoreSegmentController.java @@ -0,0 +1,67 @@ +package org.jeecg.modules.web.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.web.dto.WebScoreSegmentDTO; +import org.jeecg.modules.yx.entity.YxScoreSegment; +import org.jeecg.modules.yx.service.IYxScoreSegmentService; +import org.jetbrains.annotations.NotNull; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.List; + +/** + * @Description: 分数段位表 + * @Author: jeecg-boot + * @Date: 2024-02-16 + * @Version: V1.0 + */ +@Api(tags = "web-分数段位表") +@RestController +@RequestMapping("/web/scoreSegment") +@Slf4j +public class WebScoreSegmentController{ + @Resource + private IYxScoreSegmentService yxScoreSegmentService; + + + @ApiOperation(value = "五分一段查询") + @GetMapping(value = "/list") + public Result queryPageList(YxScoreSegment yxScoreSegment) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(YxScoreSegment::getYear,yxScoreSegment.getYear()); + if (!yxScoreSegment.getProfessionalCategory().contains("类")) { + lambdaQueryWrapper.eq(YxScoreSegment::getProfessionalCategoryChild,yxScoreSegment.getProfessionalCategory()); + }else { + lambdaQueryWrapper.eq(YxScoreSegment::getProfessionalCategory,yxScoreSegment.getProfessionalCategory()); + } + lambdaQueryWrapper.eq(YxScoreSegment::getFixedRank,1); + lambdaQueryWrapper.select(YxScoreSegment::getScore,YxScoreSegment::getPersonNum,YxScoreSegment::getNum,YxScoreSegment::getYear); + lambdaQueryWrapper.orderByDesc(YxScoreSegment::getScore); + List list = yxScoreSegmentService.list(lambdaQueryWrapper); + List dtoList = getWebScoreSegmentDTOList(list); + return Result.OK(dtoList); + } + + @NotNull + private static List getWebScoreSegmentDTOList(List list) { + List dtoList = new ArrayList<>(); + WebScoreSegmentDTO webScoreSegmentDTO = null; + for (YxScoreSegment scoreSegment : list) { + webScoreSegmentDTO = new WebScoreSegmentDTO(); + webScoreSegmentDTO.setScore(scoreSegment.getScore()); + webScoreSegmentDTO.setNum(scoreSegment.getNum()); + webScoreSegmentDTO.setPersonNum(scoreSegment.getPersonNum()); + webScoreSegmentDTO.setYear(scoreSegment.getYear()); + dtoList.add(webScoreSegmentDTO); + } + return dtoList; + } +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/RecommendMajorDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/RecommendMajorDTO.java index a767b9f..1b9111f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/RecommendMajorDTO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/RecommendMajorDTO.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll; -import org.jeecgframework.poi.excel.annotation.Excel; - import java.io.Serializable; import java.math.BigDecimal; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/WebScoreSegmentDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/WebScoreSegmentDTO.java new file mode 100644 index 0000000..9b055f5 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/WebScoreSegmentDTO.java @@ -0,0 +1,22 @@ +package org.jeecg.modules.web.dto; + +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 返回五分一段表对象 + * @author ZhouWenTao + * @create 2024-05-31-19:57 + */ +@Data +@JsonInclude(JsonInclude.Include.NON_NULL) +public class WebScoreSegmentDTO { + private String year; + private BigDecimal score; + private Integer num; + private Integer personNum; + private String professionalCategory; + private String professionalCategoryChild; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxScoreSegment.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxScoreSegment.java index 0044525..49a1f5c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxScoreSegment.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxScoreSegment.java @@ -87,6 +87,8 @@ public class YxScoreSegment implements Serializable { @ApiModelProperty(value = "是否是固定段位") private Integer fixedRank; + @ApiModelProperty(value = "人数") + private Integer num; public YxScoreSegment() { }