fix

zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -273,7 +273,7 @@ public class CommonController extends BaseController {
     @ApiOperation("获取某场考试信息")
     @PostMapping("common/apply/detail")
     public AjaxResult examApplyDetail(@RequestBody ExamApplyDetailBo bo) {
-        List<ExamApplyDetailVo> voList = iExamApplyService.examApplyDetail(bo);                                                                                                                                                                                                                                                                                                examApplyDetail(bo);
+        List<ExamApplyDetailVo> voList = iExamApplyService.examApplyDetail(bo);
         return AjaxResult.success(voList);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsAddBo.java

@@ -194,4 +194,7 @@ public class GoodsAddBo {
     /** 提交官方审核备注说明 */
     @ApiModelProperty("提交官方审核备注说明")
     private String commitPeriodRemark;
+    /** 班级类型 1基础班 2强化班 3私塾班 */
+    @ApiModelProperty("班级类型 1基础班 2强化班 3私塾班")
+    private Integer gradeType;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsEditBo.java

@@ -228,4 +228,7 @@ public class GoodsEditBo {
     /** 提交官方审核备注说明 */
     @ApiModelProperty("提交官方审核备注说明")
     private String commitPeriodRemark;
+    /** 班级类型 1基础班 2强化班 3私塾班 */
+    @ApiModelProperty("班级类型 1基础班 2强化班 3私塾班")
+    private Integer gradeType;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsQueryBo.java

@@ -210,5 +210,8 @@ public class GoodsQueryBo extends BaseEntity {
 	/** 提交官方审核备注说明 */
 	@ApiModelProperty("提交官方审核备注说明")
 	private String commitPeriodRemark;
+	/** 班级类型 1基础班 2强化班 3私塾班 */
+	@ApiModelProperty("班级类型 1基础班 2强化班 3私塾班")
+	private Integer gradeType;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/Goods.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.goods.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -156,4 +157,6 @@ private static final long serialVersionUID=1L;
     private Integer commitPeriodStatus;
     /** 提交官方审核备注说明 */
     private String commitPeriodRemark;
+    /** 班级类型 1基础班 2强化班 3私塾班 */
+    private Integer gradeType;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsVo.java

@@ -361,4 +361,7 @@ public class GoodsVo {
 	private String commitPeriodRemark;
 	@ApiModelProperty("是否是二建二造")
 	private Boolean erJianErZao;
+	/** 班级类型 1基础班 2强化班 3私塾班 */
+	@ApiModelProperty("班级类型 1基础班 2强化班 3私塾班")
+	private Integer gradeType;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderBusinessConfigAddBo.java

@@ -33,4 +33,7 @@ public class OrderBusinessConfigAddBo {
     /** 状态 1有效 0无效 */
     @ApiModelProperty("状态 1有效 0无效")
     private Integer status;
+    /** 班级类型 1基础班 2强化班 3私塾班 */
+    @ApiModelProperty("班级类型 1基础班 2强化班 3私塾班")
+    private Integer gradeType;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderBusinessConfigEditBo.java

@@ -36,5 +36,9 @@ public class OrderBusinessConfigEditBo {
     /** 状态 1有效 0无效 */
     @ApiModelProperty("状态 1有效 0无效")
     private Integer status;
+    /** 班级类型 1基础班 2强化班 3私塾班 */
+    @ApiModelProperty("班级类型 1基础班 2强化班 3私塾班")
+    private Integer gradeType;
+
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderBusinessConfigQueryBo.java

@@ -50,4 +50,10 @@ public class OrderBusinessConfigQueryBo extends BaseEntity {
 	/** 状态 1有效 0无效 */
 	@ApiModelProperty("状态 1有效 0无效")
 	private List<Integer> status;
+	/** 班级类型 1基础班 2强化班 3私塾班 */
+	@ApiModelProperty("班级类型 1基础班 2强化班 3私塾班")
+	private Integer gradeType;
+	/** 科目ID */
+	@ApiModelProperty("科目ID")
+	private Long subjectId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderBusinessConfig.java

@@ -38,4 +38,6 @@ private static final long serialVersionUID=1L;
     private Long updateTime;
     /** 状态 1有效 0无效 */
     private Integer status;
+    /** 班级类型 1基础班 2强化班 3私塾班 */
+    private Integer gradeType;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderBusinessConfigVo.java

@@ -46,4 +46,7 @@ public class OrderBusinessConfigVo {
 	private String educationName;
 	@ApiModelProperty("项目名称")
 	private String projectName;
+	/** 班级类型 1基础班 2强化班 3私塾班 */
+	@ApiModelProperty("班级类型 1基础班 2强化班 3私塾班")
+	private Integer gradeType;
 }

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -53,6 +53,7 @@
         <result property="certificateTpId" column="certificate_tp_id"/>
         <result property="commitPeriodStatus" column="commit_period_status"/>
         <result property="commitPeriodRemark" column="commit_period_remark"/>
+        <result property="gradeType" column="grade_type"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.goods.vo.GoodsVo" id="GoodsResultVo">
@@ -139,6 +140,7 @@
         <result property="goodsLearningOrder" column="goods_learning_order"/>
         <result property="commitPeriodStatus" column="commit_period_status"/>
         <result property="commitPeriodRemark" column="commit_period_remark"/>
+        <result property="gradeType" column="grade_type"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo" id="ExamNumberGoodsVoResult">

zhongzheng-system/src/main/resources/mapper/modules/order/OrderBusinessConfigMapper.xml

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="status" column="status"/>
+        <result property="gradeType" column="grade_type"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.order.vo.OrderBusinessConfigVo" id="OrderBusinessConfigVoResult">
@@ -21,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="businessName" column="business_name"/>
         <result property="educationName" column="education_name"/>
         <result property="projectName" column="project_name"/>
+        <result property="gradeType" column="grade_type"/>
     </resultMap>
 
     <select id="getList" parameterType="com.zhongzheng.modules.order.bo.OrderBusinessConfigQueryBo" resultMap="OrderBusinessConfigVoResult">
@@ -37,6 +39,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN course_education_type cet ON cet.id = cpt.education_id
         WHERE
         obc.`status` = 1
+        <if test="gradeType != null and gradeType != ''">
+            and obc.grade_type = #{gradeType}
+        </if>
         <if test="businessId != null and businessId != ''">
             and obc.business_id = #{businessId}
         </if>
@@ -46,6 +51,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="educationId != null and educationId != ''">
             and cet.id = #{educationId}
         </if>
+        <if test="subjectId != null and subjectId != ''">
+            and (SELECT COUNT(obcg.id) FROM order_business_config_goods obcg  where obcg.subject_id = #{subjectId} AND obcg.config_id = obc.id AND obcg.`status` = 1) > 0
+        </if>
     </select>
 
     <select id="getDetail" parameterType="com.zhongzheng.modules.order.bo.OrderBusinessConfigQueryBo" resultMap="OrderBusinessConfigVoResult">