updates

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<YxScoreSegment> 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<YxScoreSegment> list = yxScoreSegmentService.list(lambdaQueryWrapper);
+        List<WebScoreSegmentDTO> dtoList = getWebScoreSegmentDTOList(list);
+        return Result.OK(dtoList);
+    }
+
+    @NotNull
+    private static List<WebScoreSegmentDTO> getWebScoreSegmentDTOList(List<YxScoreSegment> list) {
+        List<WebScoreSegmentDTO> 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;
+    }
+}

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;

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;
+}

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() {
     }