updates

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/vo/QueryRecommendMajorVO.java

@@ -73,4 +73,6 @@ public class QueryRecommendMajorVO extends ArtBaseDTO {
     private String kslx;
     @ApiModelProperty(value = "专业类型")
     private String majorType;
+
+    public String phone;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java

@@ -4,17 +4,21 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.AssertUtils;
 import org.jeecg.modules.web.dto.ArtRecommendMajorBaseDTO;
 import org.jeecg.modules.web.dto.RecommendMajorDTO;
+import org.jeecg.modules.web.vo.QueryRecommendMajorVO;
 import org.jeecg.modules.yx.constant.YxConstant;
+import org.jeecg.modules.yx.dto.UserScoreManageDTO;
 import org.jeecg.modules.yx.dto.UserScoreUpdateDTO;
 import org.jeecg.modules.yx.dto.VolunteerDTO;
 import org.jeecg.modules.yx.entity.*;
@@ -26,10 +30,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description
@@ -56,6 +62,24 @@ public class YxScoreController {
     @Resource
     private UserScoreService userScoreService;
 
+    @GetMapping("/userScoreList_q23f")
+    @ApiOperation(value = "后台-用户成绩列表")
+    public Result<?> userScoreList(QueryRecommendMajorVO queryVo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                   HttpServletRequest req) {
+        Page<UserScoreManageDTO> page = new Page<>(pageNo, pageSize);
+        return Result.OK(yxUserScoreService.queryUserScoreList(page, queryVo));
+    }
+
+    @PostMapping(value = "/userScoreSave_5rew")
+    @RequiresPermissions("yx:yx_user_score:edit")
+    public Result<?> save5rew(@NotNull @RequestBody UserScoreManageDTO userScoreUpdateDTO) {
+        AssertUtils.notEmpty(userScoreUpdateDTO.getId(), "参数错误!");
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        AssertUtils.notNull(sysUser, "请先登录!");
+        return Result.OK();
+    }
+
     @PostMapping(value = "/save")
     public Result<?> save(@NotNull @RequestBody UserScoreUpdateDTO userScoreUpdateDTO) {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/UserScoreManageDTO.java

@@ -0,0 +1,118 @@
+package org.jeecg.modules.yx.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author ZhouWenTao
+ * @create 2025-06-26 20:16
+ */
+@Data
+public class UserScoreManageDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String id;
+    private String username;
+    /**使用状态(0-未使用,1-使用中)*/
+    @ApiModelProperty(value = "使用状态(0-未使用,1-使用中,2-草表)")
+    private java.lang.String state;
+    @ApiModelProperty(value = "填报类型(1-普通类 2-艺术类)")
+    private java.lang.String type;
+    /**文理分科*/
+    @Excel(name = "文理分科", width = 15)
+    @ApiModelProperty(value = "文理分科")
+    private java.lang.String cognitioPolyclinic;
+    /**专业类别(美术类/...)*/
+    @Excel(name = "专业类别(美术类/...)", width = 15)
+    @ApiModelProperty(value = "专业类别(美术类/...)")
+    private java.lang.String professionalCategory;
+    /**子级专业类别*/
+    @Excel(name = "子级专业类别", width = 15)
+    @ApiModelProperty(value = "子级专业类别")
+    private java.lang.String professionalCategoryChildren;
+    /**专业成绩分(语文,数学,英语...)*/
+    @Excel(name = "专业成绩分", width = 15)
+    @ApiModelProperty(value = "专业成绩分")
+    private java.math.BigDecimal professionalScore;
+    /**文化成绩分*/
+    @Excel(name = "文化成绩分", width = 15)
+    @ApiModelProperty(value = "文化成绩分")
+    private java.math.BigDecimal culturalScore;
+    /**创建人*/
+    @ApiModelProperty(value = "创建人")
+    @JsonIgnore
+    private String createBy;
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+    /**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**更新日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+    /**高考省份*/
+    @ApiModelProperty(value = "高考省份")
+    private String province;
+
+    /**录取批次*/
+    @ApiModelProperty(value = "录取批次")
+    private String batch;
+
+    @JsonIgnore
+    private String subjects;
+
+    /**语文成绩*/
+    @Excel(name = "语文成绩", width = 15)
+    @ApiModelProperty(value = "语文成绩")
+    private java.math.BigDecimal chineseScore;
+
+    /**英语成绩*/
+    @Excel(name = "英语成绩", width = 15)
+    @ApiModelProperty(value = "英语成绩")
+    private java.math.BigDecimal englishScore;
+    /**音乐表演声乐*/
+    @ApiModelProperty(value = "音乐表演声乐")
+    private BigDecimal yybysy;
+    /**音乐表演器乐*/
+    @ApiModelProperty(value = "音乐表演器乐")
+    private BigDecimal yybyqy;
+    /**音乐教育 */
+    @ApiModelProperty(value = "音乐教育")
+    private BigDecimal yyjy;
+    /**服装表演 */
+    @ApiModelProperty(value = "服装表演")
+    private BigDecimal fzby;
+    /**戏剧影视导演 */
+    @ApiModelProperty(value = "戏剧影视导演")
+    private BigDecimal xjysdy;
+    /**戏剧影视表演 */
+    @ApiModelProperty(value = "戏剧影视表演")
+    private BigDecimal xjysby;
+    @ApiModelProperty(value = "可保底专业数量")
+    private Integer kbdNum;
+    @ApiModelProperty(value = "较稳妥专业数量")
+    private Integer jwtNum;
+    @ApiModelProperty(value = "可冲击专业数量")
+    private Integer kcjNum;
+    @ApiModelProperty(value = "难录取专业数量")
+    private Integer nlqNum;
+    @ApiModelProperty(value = "记录结果表的表名")
+    private String calculationTableName;
+    private String phone;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxUserScoreMapper.java

@@ -1,7 +1,11 @@
 package org.jeecg.modules.yx.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.web.vo.QueryRecommendMajorVO;
 import org.jeecg.modules.yx.dto.UserScoreInfo;
+import org.jeecg.modules.yx.dto.UserScoreManageDTO;
 import org.jeecg.modules.yx.entity.YxUserScore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -19,4 +23,6 @@ public interface YxUserScoreMapper extends BaseMapper<YxUserScore> {
      * @return
      */
     UserScoreInfo getByCreateByLast1(@Param(value = "createBy") String createBy);
+
+    IPage<UserScoreManageDTO> queryUserScoreList(@Param("page") Page<UserScoreManageDTO> page,@Param("qvo") QueryRecommendMajorVO queryVo);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxUserScoreMapper.xml

@@ -6,4 +6,13 @@
         SELECT * FROM yx_user_score WHERE create_by = #{createBy} AND state = 1
         limit 0,1
     </select>
+    <select id="queryUserScoreList" resultType="org.jeecg.modules.yx.dto.UserScoreManageDTO">
+        select us.*,u.phone,u.username from yx_user_score us
+             LEFT JOIN sys_user u ON u.id = us.create_by
+        WHERE us.state = 1
+        <if test="qvo.phone !=null and qvo.phone!=''">
+            and u.phone like concat('%',#{qvo.phone},'%')
+        </if>
+        order by us.create_time desc
+    </select>
 </mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxUserScoreService.java

@@ -1,5 +1,9 @@
 package org.jeecg.modules.yx.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.web.vo.QueryRecommendMajorVO;
+import org.jeecg.modules.yx.dto.UserScoreManageDTO;
 import org.jeecg.modules.yx.dto.UserScoreUpdateDTO;
 import org.jeecg.modules.yx.entity.YxUserScore;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -56,4 +60,6 @@ public interface IYxUserScoreService extends IService<YxUserScore> {
     void closeUserScore(String userId);
 
     YxUserScore saveUserScore(UserScoreUpdateDTO userScoreUpdateDTO);
+
+    IPage<UserScoreManageDTO> queryUserScoreList(Page<UserScoreManageDTO> page, QueryRecommendMajorVO queryVo);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/UserScoreService.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.yx.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -11,9 +12,11 @@ import org.jeecg.common.util.RedisUtil;
 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.vo.QueryRecommendMajorVO;
 import org.jeecg.modules.yx.constant.YxConstant;
 import org.jeecg.modules.yx.dto.UserScoreInfo;
 import org.jeecg.modules.yx.dto.UserScoreDTO;
+import org.jeecg.modules.yx.dto.UserScoreManageDTO;
 import org.jeecg.modules.yx.entity.YxUserScore;
 import org.jeecg.modules.yx.entity.YxVolunteer;
 import org.jeecg.modules.yx.mapper.YxUserScoreMapper;
@@ -188,4 +191,5 @@ public class UserScoreService {
         }
         return resultDataList;
     }
+
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java

@@ -247,7 +247,7 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
             }else if ("表演类".equals(recommendMajorDTO.getMajorType())) {
                 key =  key +"-表演类-"+ recommendMajorDTO.getMajorTypeChild();
             }else{
-                key = activeCurrentUserScore.getBatch();
+                key = recommendMajorDTO.getBatch();
             }
             yxHistoryScoreControlLine = historyScoreControlLineMap.get(key);
             if (yxHistoryScoreControlLine!=null) {
@@ -609,7 +609,7 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
                         recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0);
                         continue;
                     }
-                    if("6195".equals(recommendMajorDTO.getSchoolCode()) && "高职高专".equals(recommendMajorDTO.getBatch())){
+                    if("9879".equals(recommendMajorDTO.getSchoolCode()) && "高职高专".equals(recommendMajorDTO.getBatch())){
                         System.out.println("qvq");
                     }
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxUserScoreServiceImpl.java

@@ -4,14 +4,18 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.AssertUtils;
 import org.jeecg.common.util.RedisUtil;
+import org.jeecg.modules.web.vo.QueryRecommendMajorVO;
 import org.jeecg.modules.yx.constant.YxConstant;
 import org.jeecg.modules.yx.dto.ProfessionalCategoryChildrenDTO;
+import org.jeecg.modules.yx.dto.UserScoreManageDTO;
 import org.jeecg.modules.yx.dto.UserScoreUpdateDTO;
 import org.jeecg.modules.yx.entity.YxCalculationMajor;
 import org.jeecg.modules.yx.entity.YxUserScore;
@@ -194,4 +198,9 @@ public class YxUserScoreServiceImpl extends ServiceImpl<YxUserScoreMapper, YxUse
         return yxUserScore;
     }
 
+    @Override
+    public IPage<UserScoreManageDTO> queryUserScoreList(Page<UserScoreManageDTO> page, QueryRecommendMajorVO queryVo) {
+        return baseMapper.queryUserScoreList(page,queryVo);
+    }
+
 }