班级列表

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -3,6 +3,9 @@ package com.zhongzheng.controller.grade;
 import java.util.List;
 import java.util.Arrays;
 
+import com.zhongzheng.modules.grade.bo.ClassGradeInterfaceQueryBo;
+import com.zhongzheng.modules.grade.service.IClassGradeInterfaceService;
+import com.zhongzheng.modules.grade.vo.ClassGradeInterfaceVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +45,8 @@ public class ClassGradeController extends BaseController {
 
     private final IClassGradeService iClassGradeService;
 
+    private final IClassGradeInterfaceService iClassGradeInterfaceService;
+
     /**
      * 查询班级列表
      */
@@ -54,6 +59,18 @@ public class ClassGradeController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询官方接口
+     */
+    @ApiOperation("查询班级列表")
+    @PreAuthorize("@ss.hasPermi('modules.grade:grade:list')")
+    @GetMapping("/listInterfaceVo")
+    public TableDataInfo<ClassGradeInterfaceVo> list(ClassGradeInterfaceQueryBo bo) {
+        startPage();
+        List<ClassGradeInterfaceVo> list = iClassGradeInterfaceService.queryList(bo);
+        return getDataTable(list);
+    }
+
 /*    *//**
      * 导出班级列表
      *//*

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeAddBo.java

@@ -52,6 +52,10 @@ public class ClassGradeAddBo {
     /** 报考地区 */
     @ApiModelProperty("报考地区")
     private Long areasId;
+
+    /** 报考地区 */
+    @ApiModelProperty("报考地区")
+    private Long cityId;
     /** 添加时间 */
     @ApiModelProperty("添加时间")
     private Long createTime;

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeEditBo.java

@@ -96,4 +96,8 @@ public class ClassGradeEditBo {
     @ApiModelProperty("绑定商品")
     private Long[] classGradeGoodsEditBoList;
 
+    /** 报考地区 */
+    @ApiModelProperty("报考地区")
+    private Long cityId;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeInterfaceQueryBo.java

@@ -44,5 +44,5 @@ public class ClassGradeInterfaceQueryBo extends BaseEntity {
 	private String name;
 	/** 0 禁用 1启用 */
 	@ApiModelProperty("0 禁用 1启用")
-	private Integer status;
+	private List<Integer> status;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeQueryBo.java

@@ -87,4 +87,24 @@ public class ClassGradeQueryBo extends BaseEntity {
 	/** 学时推送 */
 	@ApiModelProperty("学时推送")
 	private Long interfacePeriodId;
+
+	/** 报考地区 */
+	@ApiModelProperty("报考地区")
+	private Long cityId;
+
+	/** 教育类型id */
+	@ApiModelProperty("教育类型id")
+	private Long educationTypeId;
+
+	/** 业务层次id */
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
+
+	/** 院校ID */
+	@ApiModelProperty("院校ID")
+	private Long schoolId;
+
+	/** 院校ID */
+	@ApiModelProperty("院校ID")
+	private Long majorId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/domain/ClassGrade.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.grade.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -65,4 +66,7 @@ private static final long serialVersionUID=1L;
     private Long interfaceAccountId;
     /** 学时推送 */
     private Long interfacePeriodId;
+
+    /** 报考地区 */
+    private Long cityId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeInterfaceServiceImpl.java

@@ -41,7 +41,7 @@ public class ClassGradeInterfaceServiceImpl extends ServiceImpl<ClassGradeInterf
         LambdaQueryWrapper<ClassGradeInterface> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getType() != null, ClassGradeInterface::getType, bo.getType());
         lqw.like(StrUtil.isNotBlank(bo.getName()), ClassGradeInterface::getName, bo.getName());
-        lqw.eq(bo.getStatus() != null, ClassGradeInterface::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, ClassGradeInterface::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeVo.java

@@ -118,4 +118,8 @@ public class ClassGradeVo {
 	@ApiModelProperty("官方信息推送接口名字")
 	private String interfacePushName;
 
+	/** 报考地区 */
+	@ApiModelProperty("报考地区")
+	private Long cityId;
+
 }

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -102,7 +102,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             (SELECT name FROM class_grade_interface i where g.interface_push_id = i.id) as interface_push_name,
             (SELECT name FROM class_grade_interface i where g.interface_account_id = i.id) as interface_account_name,
             (SELECT name FROM class_grade_interface i where g.interface_period_id = i.id) as interface_period_name,
-            (SELECT nick_name FROM sys_user u where g.sys_user_id = u.user_id) as nick_name
+            (SELECT nick_name FROM sys_user u where g.sys_user_id = u.user_id) as nick_name,
+            (SELECT area_name FROM apply_areas a where a.area_id = g.areas_id) as area_name,
+            (SELECT area_name FROM apply_areas a where a.area_id = g.city_id) as city_name
         FROM
             class_grade g
         where 1=1
@@ -115,6 +117,64 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="classId != null and classId !=0 ">
             AND g.class_id =  #{classId}
         </if>
+        <if test="className != null and className !='' ">
+            AND g.class_name like concat('%', #{className}, '%')
+        </if>
+        <if test="classStartTime != null and classStartTime !=0 ">
+            AND #{classStartTime} BETWEEN g.class_start_time and g.class_end_time or #{classEndTime} BETWEEN g.class_start_time and g.class_end_time
+        </if>
+        <if test="educationTypeId != null and educationTypeId !='' ">
+            AND (
+            SELECT
+            COUNT(*)
+            FROM
+            class_grade_goods s
+            LEFT JOIN goods d ON s.goods_id = d.goods_id
+            WHERE
+            1 = 1
+            AND g.class_id = s.grade_id
+            AND d.education_type_id =#{educationTypeId}
+            ) >0
+        </if>
+        <if test="businessId != null and businessId !='' ">
+            AND (
+            SELECT
+            COUNT(*)
+            FROM
+            class_grade_goods s
+            LEFT JOIN goods d ON s.goods_id = d.goods_id
+            WHERE
+            1 = 1
+            AND g.class_id = s.grade_id
+            AND d.business_id =#{businessId}
+            ) >0
+        </if>
+        <if test="schoolId != null and schoolId !='' ">
+            AND (
+            SELECT
+            COUNT(*)
+            FROM
+            class_grade_goods s
+            LEFT JOIN goods d ON s.goods_id = d.goods_id
+            WHERE
+            1 = 1
+            AND g.class_id = s.grade_id
+            AND d.school_id =#{schoolId}
+            ) >0
+        </if>
+        <if test="majorId != null and majorId !='' ">
+            AND (
+            SELECT
+            COUNT(*)
+            FROM
+            class_grade_goods s
+            LEFT JOIN goods d ON s.goods_id = d.goods_id
+            WHERE
+            1 = 1
+            AND g.class_id = s.grade_id
+            AND d.major_id =#{majorId}
+            ) >0
+        </if>
     </select>
 
     <select id="queryGoodsList" parameterType="Long" resultMap="GoodsResultVo">