updates

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

@@ -70,8 +70,8 @@ public class MiniVipController {
         }else{*/
         LambdaQueryWrapper<YxVipSku> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(YxVipSku::getSaleable, "1");
-        queryWrapper.orderByDesc(YxVipSku::getSkuPrice);
         queryWrapper.ne(YxVipSku::getSkuName, "测试体验卡");
+        queryWrapper.orderByAsc(YxVipSku::getCreateTime);
         List<YxVipSku> list = yxVipSkuService.list(queryWrapper);
         return Result.OK(list);
 //        }

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

@@ -40,38 +40,66 @@ public class YxSchoolMajor implements Serializable {
     @Dict(dictTable = "yx_school",dicCode = "school_code",dicText = "school_name")
     private java.lang.String schoolCode;
 	/**专业代码*/
-	@Excel(name = "专业代码", width = 15)
     @ApiModelProperty(value = "专业代码")
     @Dict(dictTable = "yx_major",dicCode = "major_code",dicText = "major_name")
     private java.lang.String majorCode;
+
+
+    @ApiModelProperty(value = "批次")
+    @Excel(name = "批次", width = 15)
+    private String batch;
+
+    @Excel(name = "专业代码", width = 15)
+    @ApiModelProperty(value = "招生代码")
+    private String enrollmentCode;
+
     /**专业名称*/
     @Excel(name = "专业名称", width = 15)
     @ApiModelProperty(value = "专业名称")
     private java.lang.String majorName;
+
+    /**
+     * 专业类型
+     */
+    @ApiModelProperty(value = "专业类型")
+    @Excel(name = "专业类型", width = 15)
+    private String majorType;
+
+    /**
+     * 主考科目
+     */
+    @ApiModelProperty(value = "主考科目")
+    @Excel(name = "主考科目", width = 15)
+    private String mainSubjects;
+
+    /**
+     * 二级专业类型
+     */
+    @ApiModelProperty(value = "二级专业类型")
+    @Excel(name = "专业子级类别", width = 15)
+    private String majorTypeChild;
+
+
 	/**学费*/
-	@Excel(name = "学费", width = 15)
     @ApiModelProperty(value = "学费")
     private java.math.BigDecimal tuition;
     /**学制*/
-    @Excel(name = "学制", width = 15)
     @ApiModelProperty(value = "学制")
     private java.lang.String semester;
+
 	/**备注*/
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private java.lang.String detail;
+
     /**科类(文科/理科)*/
     @Excel(name = "科类(文科/理科)", width = 15)
     @ApiModelProperty(value = "科类(文科/理科)")
     private java.lang.String category;
 
-
-
-    @Excel(name = "文化分省控线", width = 15)
     @ApiModelProperty(value = "文化分省控线")
     private BigDecimal culturalControlLine;
 
-    @Excel(name = "专项分数线", width = 15)
     @ApiModelProperty(value = "专项分数线")
     private BigDecimal specialControlLine;
 
@@ -92,29 +120,10 @@ public class YxSchoolMajor implements Serializable {
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
 
-    @ApiModelProperty(value = "批次")
-    private String batch;
-    @ApiModelProperty(value = "招生代码")
-    private String enrollmentCode;
-    /**
-     * 专业类型
-     */
-    @ApiModelProperty(value = "专业类型")
-    private String majorType;
-    /**
-     * 二级专业类型
-     */
-    @ApiModelProperty(value = "二级专业类型")
-    private String majorTypeChild;
-
-    /**
-     * 主考科目
-     */
-    @ApiModelProperty(value = "主考科目")
-    private String mainSubjects;
     /**
      * 计划招生人数
      */
+    @Excel(name = "计划招生人数", width = 15)
     @ApiModelProperty(value = "计划招生人数")
     private Integer planNum;
 
@@ -151,26 +160,27 @@ public class YxSchoolMajor implements Serializable {
     /**
      * 考试类型(统考/校考)
      */
-    @Excel(name = "考试类型(统考/校考)", width = 15)
     @ApiModelProperty(value = "考试类型(统考/校考)")
     private String kslx;
 
     /**录取方式缩写*/
-    @Excel(name = "录取方式缩写", width = 15)
+    @Excel(name = "录取方式缩写(用于筛选条件)", width = 15)
-    @ApiModelProperty(value = "录取方式缩写")
+    @ApiModelProperty(value = "录取方式缩写(用于筛选条件)")
     private String rulesEnrollProbabilitySx;
+
     /**录取概率规则*/
-    @Excel(name = "录取方式", width = 15)
+    @Excel(name = "对外录取方式", width = 15)
     @ApiModelProperty(value = "录取方式")
     private String rulesEnrollProbability;
 
-    @Excel(name = "录取方式运算符", width = 15)
+    @Excel(name = "对外录取方式运算符", width = 15)
     @ApiModelProperty(value = "录取方式运算符")
     private String probabilityOperator;
 
     @Excel(name = "内部录取方式", width = 15)
     @ApiModelProperty(value = "内部录取方式")
     private String privateRulesEnrollProbability;
+
     @Excel(name = "内部录取方式运算符", width = 15)
     @ApiModelProperty(value = "内部录取方式运算符")
     private String privateProbabilityOperator;

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

@@ -60,7 +60,10 @@ public class YxVipSku implements Serializable {
 	@Excel(name = "介绍", width = 15)
     @ApiModelProperty(value = "介绍")
     private java.lang.String skuDetail;
-	/**创建人*/
+    /**商品图片*/
+    @ApiModelProperty(value = "商品图片")
+    private java.lang.String skuImg;
+    /**创建人*/
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
 	/**创建日期*/
@@ -79,4 +82,6 @@ public class YxVipSku implements Serializable {
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
+
+
 }

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

@@ -103,6 +103,9 @@ public class BiaoyanService {
                     probabilityOperator = recommendMajorDTO.getPrivateProbabilityOperator();
                     culturalControlLine = batchControlLineMaps.get(recommendMajorDTO.getBatch()).getCulturalScore();
                     specialControlLine = batchControlLineMaps.get(recommendMajorDTO.getBatch()).getSpecialScore();
+                    if (!recommendMajorDTO.getBatch().equals("高职高专")) {
+                        System.out.println("1");
+                    }
                     //没有计算方式 或 没有往年录取分数线信息 ，或者没有过该批次 时跳过
                     if (StringUtils.isBlank(rulesEnrollProbability)
                             || StringUtils.isBlank(probabilityOperator)