update

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/RecommendMajorDTO.java

@@ -129,4 +129,10 @@ public class RecommendMajorDTO implements Serializable {
     private String schoolId;
     @ApiModelProperty(value = "标签")
     private Set<String> tagsList;
+
+    /**
+     * 考试类型(统考/校考)
+     */
+    @ApiModelProperty(value = "考试类型(统考/校考)")
+    private String kslx;
 }

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

@@ -66,22 +66,9 @@ public class QueryRecommendMajorVO extends ArtBaseDTO {
 
     @ApiModelProperty(value = "录取方式List")
     private List<String> rulesEnrollProbabilityList;
-
     @ApiModelProperty(value = "成绩id")
     private String scoreId;
-    /*public void setBatch(String batch) {
-        if (StringUtils.isNotBlank(batch)) {
-            if ("本科".equals(batch)) {
-                this.batchList = Arrays.asList("本科","高职高专");
-            }else if("高职高专".equals(batch)){
-                this.batchList = Collections.singletonList("高职高专");
-            }else if("本科A段".equals(batch)){
-                this.batchList = Arrays.asList("本科提前批","本科A段","本科B段","高职高专");
-            }else if("本科B段".equals(batch)){
-                this.batchList = Arrays.asList("本科B段","高职高专");
-            }else{
-                this.batchList = null;
-            }
-        }
-    }*/
+
+    @ApiModelProperty(value = "考试类型")
+    private String kslx;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java

@@ -12,13 +12,12 @@ import org.jeecg.modules.art.dto.ArtRecommendMajorBaseDTO;
 import org.jeecg.modules.art.vo.QueryRecommendMajorVO;
 import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll;
 import org.jeecg.modules.yx.entity.YxMajor;
+import org.jeecg.modules.yx.entity.YxSchoolExamMajor;
 import org.jeecg.modules.yx.entity.YxSchoolMajor;
-import org.jeecg.modules.yx.service.IYxCalculationMajorService;
-import org.jeecg.modules.yx.service.IYxHistoryMajorEnrollService;
-import org.jeecg.modules.yx.service.IYxMajorService;
-import org.jeecg.modules.yx.service.IYxSchoolMajorService;
+import org.jeecg.modules.yx.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -38,11 +37,9 @@ public class MiniMajorController {
     @Autowired
     private IYxMajorService yxMajorService;
     @Autowired
-    private IYxSchoolMajorService yxSchoolMajorService;
-    @Autowired
     private IYxCalculationMajorService yxCalculationMajorService;
     @Autowired
-    private IYxHistoryMajorEnrollService yxHistoryMajorEnrollService;
+    private IYxSchoolExamMajorService yxSchoolExamMajorService;
     @Autowired
     private RedisUtil redisUtil;
 
@@ -77,37 +74,6 @@ public class MiniMajorController {
     @ApiOperation(value = "小程序端查专业列表")
     @GetMapping("/miniMajorList")
     public Result<?> miniMajorList(QueryRecommendMajorVO queryRecommendMajorVO) {
-        /*LambdaQueryWrapper<YxHistoryMajorEnroll> yxHistoryMajorEnrollLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        yxHistoryMajorEnrollLambdaQueryWrapper.eq(YxHistoryMajorEnroll::getBatch,"本科B段");
-        yxHistoryMajorEnrollLambdaQueryWrapper.likeRight(YxHistoryMajorEnroll::getMajorCode,"3");
-        *//*LambdaQueryWrapper<YxSchoolMajor> yxSchoolMajorLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        yxSchoolMajorLambdaQueryWrapper.eq(YxSchoolMajor::getBatch,"本科B段");
-        yxSchoolMajorLambdaQueryWrapper.likeRight(YxSchoolMajor::getMajorCode,"35");*//*
-        LambdaQueryWrapper<YxMajor> yxMajorLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        yxMajorLambdaQueryWrapper.eq(YxMajor::getEducationalLevel,"1");
-        yxMajorLambdaQueryWrapper.notLikeRight(YxMajor::getMajorCode,"35");
-        List<YxMajor> majorList = yxMajorService.list(yxMajorLambdaQueryWrapper);
-        Map<String, YxMajor> yxMajorMap = majorList.stream().collect(Collectors.toMap(m -> m.getMajorName(), m -> m));
-
-//        List<YxSchoolMajor> list = yxSchoolMajorService.list(yxSchoolMajorLambdaQueryWrapper);
-        String majroName = null;
-        YxMajor yxMajor=null;
-        int i = 0;
-        List<YxHistoryMajorEnroll> list = yxHistoryMajorEnrollService.list(yxHistoryMajorEnrollLambdaQueryWrapper);
-        for (YxHistoryMajorEnroll yxSchoolMajor : list) {
-            majroName = yxSchoolMajor.getMajorName();
-            i = majroName.indexOf("（");
-            if (i!=-1) {
-                majroName= majroName.substring(0,i);
-            }
-            yxMajor = yxMajorMap.get(majroName);
-            if (yxMajor!=null) {
-                yxSchoolMajor.setMajorCode(yxMajor.getMajorCode());
-            }
-
-            System.out.println(majroName+":"+yxSchoolMajor.getMajorCode());
-        }
-        yxHistoryMajorEnrollService.updateBatchById(list);*/
         return Result.OK(yxMajorService.miniMajorList(queryRecommendMajorVO));
     }
 
@@ -151,4 +117,5 @@ public class MiniMajorController {
         }
         return Result.OK(dataList);
     }
+
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniSchoolDTO.java

@@ -201,4 +201,15 @@ public class MiniSchoolDTO implements Serializable {
      */
     @ApiModelProperty(value = "学校科研教学")
     private YxSchoolResearchTeaching schoolResearchTeaching;
+    /**
+     * 考试类型(统考/校考)
+     */
+    @ApiModelProperty(value = "考试类型(统考/校考)")
+    private String kslx="统考";
+
+    /**
+     * 录取人数年份
+     */
+    @ApiModelProperty(value = "录取人数年份")
+    private String luquYear="2023";
 }

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

@@ -0,0 +1,178 @@
+package org.jeecg.modules.yx.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.yx.entity.YxSchoolExamMajor;
+import org.jeecg.modules.yx.service.IYxSchoolExamMajorService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: 校考专业数据表
+ * @Author: jeecg-boot
+ * @Date:   2024-04-04
+ * @Version: V1.0
+ */
+@Api(tags="校考专业数据表")
+@RestController
+@RequestMapping("/yx/yxSchoolExamMajor")
+@Slf4j
+public class YxSchoolExamMajorController extends JeecgController<YxSchoolExamMajor, IYxSchoolExamMajorService> {
+	@Autowired
+	private IYxSchoolExamMajorService yxSchoolExamMajorService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param yxSchoolExamMajor
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "校考专业数据表-分页列表查询")
+	@ApiOperation(value="校考专业数据表-分页列表查询", notes="校考专业数据表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<YxSchoolExamMajor>> queryPageList(YxSchoolExamMajor yxSchoolExamMajor,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<YxSchoolExamMajor> queryWrapper = QueryGenerator.initQueryWrapper(yxSchoolExamMajor, req.getParameterMap());
+		Page<YxSchoolExamMajor> page = new Page<YxSchoolExamMajor>(pageNo, pageSize);
+		IPage<YxSchoolExamMajor> pageList = yxSchoolExamMajorService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param yxSchoolExamMajor
+	 * @return
+	 */
+	@AutoLog(value = "校考专业数据表-添加")
+	@ApiOperation(value="校考专业数据表-添加", notes="校考专业数据表-添加")
+	@RequiresPermissions("yx:yx_school_exam_major:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody YxSchoolExamMajor yxSchoolExamMajor) {
+		yxSchoolExamMajorService.save(yxSchoolExamMajor);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param yxSchoolExamMajor
+	 * @return
+	 */
+	@AutoLog(value = "校考专业数据表-编辑")
+	@ApiOperation(value="校考专业数据表-编辑", notes="校考专业数据表-编辑")
+	@RequiresPermissions("yx:yx_school_exam_major:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody YxSchoolExamMajor yxSchoolExamMajor) {
+		yxSchoolExamMajorService.updateById(yxSchoolExamMajor);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "校考专业数据表-通过id删除")
+	@ApiOperation(value="校考专业数据表-通过id删除", notes="校考专业数据表-通过id删除")
+	@RequiresPermissions("yx:yx_school_exam_major:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		yxSchoolExamMajorService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "校考专业数据表-批量删除")
+	@ApiOperation(value="校考专业数据表-批量删除", notes="校考专业数据表-批量删除")
+	@RequiresPermissions("yx:yx_school_exam_major:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.yxSchoolExamMajorService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "校考专业数据表-通过id查询")
+	@ApiOperation(value="校考专业数据表-通过id查询", notes="校考专业数据表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<YxSchoolExamMajor> queryById(@RequestParam(name="id",required=true) String id) {
+		YxSchoolExamMajor yxSchoolExamMajor = yxSchoolExamMajorService.getById(id);
+		if(yxSchoolExamMajor==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(yxSchoolExamMajor);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param yxSchoolExamMajor
+    */
+    @RequiresPermissions("yx:yx_school_exam_major:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, YxSchoolExamMajor yxSchoolExamMajor) {
+        return super.exportXls(request, yxSchoolExamMajor, YxSchoolExamMajor.class, "校考专业数据表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("yx:yx_school_exam_major:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, YxSchoolExamMajor.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxCalculationMajor.java

@@ -125,4 +125,11 @@ public class YxCalculationMajor implements Serializable {
 	@Excel(name = "其他分数限制", width = 15)
     @ApiModelProperty(value = "其他分数限制")
     private java.lang.String otherScoreLimitation="";
+
+    /**
+     * 考试类型(统考/校考)
+     */
+    @Excel(name = "考试类型(统考/校考)", width = 15)
+    @ApiModelProperty(value = "考试类型(统考/校考)")
+    private String kslx;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolExamMajor.java

@@ -0,0 +1,75 @@
+package org.jeecg.modules.yx.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 校考专业数据表
+ * @Author: jeecg-boot
+ * @Date:   2024-04-04
+ * @Version: V1.0
+ */
+@Data
+@TableName("yx_school_exam_major")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="yx_school_exam_major对象", description="校考专业数据表")
+public class YxSchoolExamMajor implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**院校编码*/
+	@Excel(name = "院校编码", width = 15)
+    @ApiModelProperty(value = "院校编码")
+    private java.lang.String schoolCode;
+	/**院校专业id*/
+	@Excel(name = "院校专业id", width = 15)
+    @ApiModelProperty(value = "院校专业id")
+    private java.lang.String schoolMajorId;
+	/**校考分数*/
+	@Excel(name = "校考分数", width = 15)
+    @ApiModelProperty(value = "校考分数")
+    private java.math.BigDecimal schoolExamScore;
+	/**校考排名*/
+	@Excel(name = "校考排名", width = 15)
+    @ApiModelProperty(value = "校考排名")
+    private java.math.BigDecimal schoolExamRanking;
+	/**年份*/
+	@Excel(name = "年份", width = 15)
+    @ApiModelProperty(value = "年份")
+    private java.lang.String year;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMajor.java

@@ -157,4 +157,11 @@ public class YxSchoolMajor implements Serializable {
      */
     @ApiModelProperty(value = "外语成绩限制")
     private BigDecimal englishScoreLimitation;
+
+    /**
+     * 考试类型(统考/校考)
+     */
+    @Excel(name = "考试类型(统考/校考)", width = 15)
+    @ApiModelProperty(value = "考试类型(统考/校考)")
+    private String kslx;
 }

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

@@ -0,0 +1,17 @@
+package org.jeecg.modules.yx.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.yx.entity.YxSchoolExamMajor;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 校考专业数据表
+ * @Author: jeecg-boot
+ * @Date:   2024-04-04
+ * @Version: V1.0
+ */
+public interface YxSchoolExamMajorMapper extends BaseMapper<YxSchoolExamMajor> {
+
+}

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

@@ -5,7 +5,7 @@
         INSERT INTO ${tableName} (id, score_id, school_code, major_code, major_name, enrollment_code, tuition,
         detail, category, rules_enroll_probability, batch, student_old_converted_score, student_converted_score,
         enroll_probability, probability_operator, create_time, major_type, major_type_child, plan_num, main_subjects,
-        limitation, other_score_limitation,rules_enroll_probability_sx)
+        limitation, other_score_limitation,rules_enroll_probability_sx,kslx)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
             (
@@ -13,7 +13,7 @@
             #{item.enrollmentCode}, #{item.tuition}, #{item.detail}, #{item.category}, #{item.rulesEnrollProbability},
             #{item.batch}, #{item.studentOldConvertedScore}, #{item.studentConvertedScore}, #{item.enrollProbability},
             #{item.probabilityOperator}, #{item.createTime}, #{item.majorType}, #{item.majorTypeChild}, #{item.planNum},
-            #{item.mainSubjects}, #{item.limitation}, #{item.otherScoreLimitation},#{item.rulesEnrollProbabilitySx}
+            #{item.mainSubjects}, #{item.limitation}, #{item.otherScoreLimitation},#{item.rulesEnrollProbabilitySx},#{item.kslx}
             )
         </foreach>
     </insert>
@@ -47,7 +47,8 @@
         LEFT JOIN yx_school_child sc ON sc.school_code = cm.school_code
         LEFT JOIN yx_school_research_teaching srt ON srt.school_id = sc.school_id
         LEFT JOIN yx_school s ON s.id = sc.school_id
-        WHERE cm.rules_enroll_probability is not null
+        WHERE 1=1
+        /*cm.rules_enroll_probability is not null*/
         <!--成绩单-->
         <if test="queryvo.scoreId!=null and queryvo.scoreId!=''">
             AND cm.score_id = #{queryvo.scoreId}
@@ -189,6 +190,9 @@
         <if test="queryvo.schoolNature!=null and queryvo.schoolNature!=''">
             AND s.school_nature= #{queryvo.schoolNature}
         </if>
+        <if test="queryvo.kslx!=null and queryvo.kslx!=''">
+            AND cm.kslx = #{queryvo.kslx}
+        </if>
         ORDER BY enroll_probability desc
     </select>
 </mapper>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.yx.mapper.YxSchoolExamMajorMapper">
+
+</mapper>

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

@@ -38,6 +38,7 @@
         sm.enrollment_code as enrollmentCode,
         sm.major_code,
         sm.tuition as studyCost,
+        sm.kslx,
         sm.plan_num as planNum
         FROM yx_school_major sm
         LEFT JOIN ( SELECT major_code,major_desc,semester,first_level_discipline FROM yx_major GROUP BY major_code ORDER
@@ -45,7 +46,8 @@
         LEFT JOIN (SELECT school_id,school_code FROM yx_school_child group by school_code) sc ON sc.school_code = sm.school_code
         LEFT JOIN yx_school s ON s.id = sc.school_id
         LEFT JOIn yx_first_level_disciplines fld ON fld.id = m.first_level_discipline
-        WHERE sm.rules_enroll_probability is not null
+        WHERE 1=1
+        /*sm.rules_enroll_probability is not null*/
         <if test="queryvo.schoolName!=null and queryvo.schoolName!=''">
             AND (s.school_name like concat('%',#{queryvo.schoolName},'%') or sc.schooL_code like concat('%',#{queryvo.schoolName},'%') or sm.major_name like
             concat('%',#{queryvo.schoolName},'%'))

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.yx.service;
+
+import org.jeecg.modules.yx.entity.YxSchoolExamMajor;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 校考专业数据表
+ * @Author: jeecg-boot
+ * @Date:   2024-04-04
+ * @Version: V1.0
+ */
+public interface IYxSchoolExamMajorService extends IService<YxSchoolExamMajor> {
+
+}

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

@@ -76,6 +76,7 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
                 yxHistoryMajorEnrollService.recommendMajorDTOListSetHistoryInfo(recommendMajorDTOList);
                 this.checkEnrollProbability(recommendMajorDTOList, userScore);
             }
+            recommendMajorDTOList.stream().filter(r->r.getSchoolCode().equals("1470")).collect(Collectors.toList());
             long endTime = new Date().getTime();
             log.warn("测算专业录取率-耗费时长:" + (endTime - startTime));
             //保存结果到用户的专业结果表

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

@@ -160,9 +160,7 @@ public class YxMajorServiceImpl extends ServiceImpl<YxMajorMapper, YxMajor> impl
             recommendMajorDTO.setMajorName(yxSchoolMajor.getMajorName());
             recommendMajorDTO.setMajorCode(yxSchoolMajor.getMajorCode());
             recommendMajorDTO.setBatch(yxSchoolMajor.getBatch());
-            /*recommendMajorDTO.setProbabilityOperator(yxSchoolMajor.getProbabilityOperator());
-            recommendMajorDTO.setRulesEnrollProbability(yxSchoolMajor.getRulesEnrollProbability());*/
-            /*recommendMajorDTO.setMajorDetail(yxSchoolMajor.getDetail());*/
+            recommendMajorDTO.setKslx(yxSchoolMajor.getKslx());
             lambdaQueryWrapper.clear();
             lambdaQueryWrapper.orderByDesc(YxHistoryMajorEnroll::getYear);
             lambdaQueryWrapper.eq(YxHistoryMajorEnroll::getSchoolCode,queryRecommendMajorVO.getSchoolCode());
@@ -170,7 +168,7 @@ public class YxMajorServiceImpl extends ServiceImpl<YxMajorMapper, YxMajor> impl
             lambdaQueryWrapper.eq(YxHistoryMajorEnroll::getBatch,yxSchoolMajor.getBatch());
             lambdaQueryWrapper.eq(YxHistoryMajorEnroll::getCategory,queryRecommendMajorVO.getCognitioPolyclinic());
             historyMajorEnrollList = yxHistoryMajorEnrollService.list(lambdaQueryWrapper);
-            if (CollectionUtils.isEmpty(historyMajorEnrollList)) {
+            if ((StringUtils.isNotBlank(yxSchoolMajor.getKslx()) && "统考".equals(yxSchoolMajor.getKslx())) && CollectionUtils.isEmpty(historyMajorEnrollList)) {
                 continue;
             }
             historyMajorEnrollList = historyMajorEnrollList.stream().filter(h->StringUtils.isNotBlank(h.getRulesEnrollProbability())).collect(Collectors.toList());

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.yx.service.impl;
+
+import org.jeecg.modules.yx.entity.YxSchoolExamMajor;
+import org.jeecg.modules.yx.mapper.YxSchoolExamMajorMapper;
+import org.jeecg.modules.yx.service.IYxSchoolExamMajorService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 校考专业数据表
+ * @Author: jeecg-boot
+ * @Date:   2024-04-04
+ * @Version: V1.0
+ */
+@Service
+public class YxSchoolExamMajorServiceImpl extends ServiceImpl<YxSchoolExamMajorMapper, YxSchoolExamMajor> implements IYxSchoolExamMajorService {
+
+}

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

@@ -84,7 +84,13 @@ public class YxSchoolServiceImpl extends ServiceImpl<YxSchoolMapper, YxSchool> i
             //获取 院校下的上一年招生信息
             List<String> schoolCodeList = dtoPage.getRecords().stream().map(MiniSchoolDTO::getSchoolCode).collect(Collectors.toList());
             Map<String, YxHistoryMajorEnroll> historyMajorEnrollMap = yxHistoryMajorEnrollService.getDataGroupBySchoolCodeAndMaxYear(schoolCodeList);
-
+            //获取校考数据
+            LambdaQueryWrapper<YxSchoolMajor> schoolMajorLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            schoolMajorLambdaQueryWrapper.select(YxSchoolMajor::getSchoolCode);
+            schoolMajorLambdaQueryWrapper.eq(YxSchoolMajor::getKslx, "校考");
+            schoolMajorLambdaQueryWrapper.groupBy(YxSchoolMajor::getSchoolCode);
+            List<YxSchoolMajor> xkList = yxSchoolMajorService.list(schoolMajorLambdaQueryWrapper);
+            Set<String> schoolCodeSet = xkList.stream().map(YxSchoolMajor::getSchoolCode).collect(Collectors.toSet());
             //获取 院校的招生数量
             Map<String, Integer> planNumMap = yxSchoolMajorService.getSchoolMajorPlanSumByTypeAndCode(currentUserScore.getProfessionalCategory(), schoolCodeList);
 
@@ -93,6 +99,9 @@ public class YxSchoolServiceImpl extends ServiceImpl<YxSchoolMapper, YxSchool> i
             Integer planNum=0;
             YxHistoryMajorEnroll yxHistoryMajorEnroll = null;
             for (MiniSchoolDTO record : dtoPage.getRecords()) {
+                if (schoolCodeSet.contains(record.getSchoolCode())) {
+                    record.setKslx("校考");
+                }
                 //关联录取分数
                 yxHistoryMajorEnroll = historyMajorEnrollMap.get(record.getSchoolCode());
                 if (yxHistoryMajorEnroll != null) {