fix 排班

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

@@ -82,4 +82,27 @@ public class OrderQueryBo extends BaseEntity {
 	/** 订单来源 1业务员录单 */
 	@ApiModelProperty("订单来源 1业务员录单")
 	private Integer orderFrom;
+	/** 教育类型id */
+	@ApiModelProperty("教育类型id")
+	private Long educationTypeId;
+	/** 业务层次id */
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
+	/** 所属院校 */
+	@ApiModelProperty("所属院校")
+	private Long schoolId;
+	/** 所属专业 */
+	@ApiModelProperty("所属专业")
+	private Long majorId;
+	/** 开始时间 */
+	@ApiModelProperty("开始时间")
+	private Long startTime;
+	/** 结束时间 */
+	@ApiModelProperty("结束时间")
+	private Long endTime;
+
+	@ApiModelProperty("支付状态 1未收费 2部分收费 3完全收费")
+	private Integer payStatus;
+	@ApiModelProperty("退款状态 0无  1退款中 2已退款 3拒绝退款")
+	private Integer refundStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -268,7 +268,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             List<ClassGradeVo> classGradeVoList =  iClassGradeService.queryList(bo);
             for(int i = 0; i < classGradeVoList.size(); i++){
                 ClassGradeVo classGradeVo = classGradeVoList.get(i);
-                if(classGradeVo.getStudentUpper()>classGradeVo.getStudentNum()){
+                //无指定班预留2空位避免超人数
+                if(classGradeVo.getStudentUpper()-classGradeVo.getStudentNum()>3){
                     //有空位则进入班级
                     gradeId = classGradeVo.getGradeId();
                     //班级还有剩位,直接加入班级

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

@@ -97,6 +97,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN course_business cb ON g.business_id = cb.id
                 LEFT JOIN school s ON s.id = g.school_id
                 LEFT JOIN major m ON g.major_id = m.id
+        <if test="educationTypeId != null and educationTypeId != ''">
+            AND g.education_type_id = #{educationTypeId}
+        </if>
+        <if test="businessId != null and businessId != ''">
+            AND g.business_id = #{businessId}
+        </if>
+        <if test="schoolId != null and schoolId != ''">
+            AND g.school_id = #{schoolId}
+        </if>
+        <if test="majorId != null and majorId != ''">
+            AND g.major_id = #{majorId}
+        </if>
+        <if test="orderStatus != null">
+            AND o.order_status = #{orderStatus}
+        </if>
+        <if test="startTime != null">
+            AND o.create_time >= #{startTime}
+        </if>
+        <if test="endTime != null">
+            AND #{endTime} >= o.create_time
+        </if>
+        <if test="payStatus != null">
+            AND og.pay_status = #{payStatus}
+        </if>
+        <if test="refundStatus != null">
+            AND og.refund_status = #{refundStatus}
+        </if>
         ORDER BY o.order_id DESC
     </select>