抽签新规则

web/src/main/java/com/ynfy/buss/exam/chouqian/controller/CqXxxqController.java

@@ -40,6 +40,18 @@ public class CqXxxqController extends JeecgController<CqXxxq, ICqXxxqService> {
     private ICqYcqxxService cqYcqxxService;
     @Autowired
     private ICqCqksService cqCqksService;
+    /**
+     * 根据区等级年级获取所有学校
+     *
+     * @param cqXxxq
+     * @return
+     */
+    @AutoLog(value = "根据区等级年级获取所有学校")
+    @ApiOperation(value = "根据区等级年级获取所有学校", notes = "根据区等级年级获取所有学校")
+    @GetMapping(value = "/hqxx")
+    public Result<List<CqXxxq>> hqxx(CqXxxq cqXxxq) {
+        return Result.OK(cqXxxqService.hqxx(cqXxxq));
+    }
     /**
      * 学校抽签
      *
@@ -49,7 +61,7 @@ public class CqXxxqController extends JeecgController<CqXxxq, ICqXxxqService> {
     @AutoLog(value = "抽签")
     @ApiOperation(value = "抽签", notes = "抽签")
     @GetMapping(value = "/cqxx")
-    public Result<String> cqxx(CqXxxq cqXxxq) {
+    public Result<List<CqXxxq>> cqxx(CqXxxq cqXxxq) {
 //        //先自己赋值
 //        cqXxxq.setDistrictname("市中区");
 //        cqXxxq.setNianji("五年级");
@@ -58,6 +70,31 @@ public class CqXxxqController extends JeecgController<CqXxxq, ICqXxxqService> {
 //        cqXxxq.setStudentamount("45");
         return Result.OK(cqXxxqService.cqxx(cqXxxq));
     }
+    /**
+     * 班级抽签 抽签
+     *
+     * @param
+     * @return
+     */
+    @AutoLog(value = "班级抽签")
+    @ApiOperation(value = "班级抽签", notes = "班级抽签")
+    @GetMapping(value = "/bjcq")
+    public Result<String> bjcq(String districtname) {
+        return Result.OK(cqXxxqService.bjcq(districtname));
+    }
+    /**
+     * 班级抽签 抽签
+     *
+     * @param
+     * @return
+     */
+    @AutoLog(value = "人员抽签")
+    @ApiOperation(value = "人员抽签", notes = "人员抽签")
+    @GetMapping(value = "/rycq")
+    public Result<String> rycq(CqXxxq cqXxxq) {
+        cqXxxqService.rycq(cqXxxq);
+        return Result.OK("抽签完成");
+    }
     //获取有几个地市
     /**
      * 获取有几个地市
@@ -107,10 +144,14 @@ public class CqXxxqController extends JeecgController<CqXxxq, ICqXxxqService> {
         QueryWrapper<CqYcqxx> queryWrapper = QueryGenerator.initQueryWrapper(cqYcqxx, req.getParameterMap());
         Page<CqYcqxx> page = new Page<CqYcqxx>(pageNo, pageSize);
         IPage<CqYcqxx> pageList = cqYcqxxService.page(page, queryWrapper);
+//        //测试添加
+//        System.err.println("显示查询条件："+cqYcqxx);
+//        cqXxxqService.bjcq(cqYcqxx.getDistrictname());
+
         return Result.OK(pageList);
     }
     /**
-     * 分页以学生学校查询
+     * 分页以抽签学生查询
      *
      * @param cqCqks
      * @param pageNo
@@ -127,6 +168,11 @@ public class CqXxxqController extends JeecgController<CqXxxq, ICqXxxqService> {
         QueryWrapper<CqCqks> queryWrapper = QueryGenerator.initQueryWrapper(cqCqks, req.getParameterMap());
         Page<CqCqks> page = new Page<CqCqks>(pageNo, pageSize);
         IPage<CqCqks> pageList = cqCqksService.page(page, queryWrapper);
+//        //测试添加
+//        CqXxxq cqXxxq=new CqXxxq();
+//        cqXxxq.setDistrictname("市中区");
+//        cqXxxq.setEstate("优");
+//        cqXxxqService.rycq(cqXxxq);
         return Result.OK(pageList);
     }
     /**
@@ -168,4 +214,15 @@ public class CqXxxqController extends JeecgController<CqXxxq, ICqXxxqService> {
         mv.addObject(NormalExcelConstants.DATA_LIST,pageList);
         return mv;
     }
+    /**
+     *一键清除所有抽签记录
+     *
+     */
+    @AutoLog(value = "清除所有抽签记录")
+    @ApiOperation(value = "清除所有抽签记录", notes = "清除所有抽签记录")
+    @GetMapping(value = "/qccqxx")
+    public Result<String> qccqxx() {
+
+        return Result.OK("清楚成功");
+    }
 }

web/src/main/java/com/ynfy/buss/exam/chouqian/entity/CqCqbjxq.java

@@ -0,0 +1,70 @@
+package com.ynfy.buss.exam.chouqian.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("cq_cqbjxq")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "cq_cqbjxq对象", description = "cq_cqbjxq")
+public class CqCqbjxq implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @Excel(name = "县区学校id", width = 15)
+    @ApiModelProperty(value = "县区学校id")
+    private String ycqxxId;
+
+    @Excel(name = "班级", width = 15)
+    @ApiModelProperty(value = "班级")
+    private String classname;
+
+    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    /**
+     * createTime
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "createTime")
+    private Date createTime;
+    /**
+     * createBy
+     */
+    @ApiModelProperty(value = "createBy")
+    private String createBy;
+    /**
+     * updateTime
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "updateTime")
+    private Date updateTime;
+    /**
+     * updateBy
+     */
+    @ApiModelProperty(value = "updateBy")
+    private String updateBy;
+
+}

web/src/main/java/com/ynfy/buss/exam/chouqian/entity/CqCqbjxx.java

@@ -30,17 +30,17 @@ public class CqCqbjxx implements Serializable {
     @ApiModelProperty(value = "id")
     private String id;
 
-    @Excel(name = "抽取学校id", width = 15)
-    @ApiModelProperty(value = "抽取学校id")
-    private String ycqxxId;
+    @Excel(name = "县区名称", width = 15)
+    @ApiModelProperty(value = "县区名称")
+    private String districtname;
 
     @Excel(name = "班级", width = 15)
     @ApiModelProperty(value = "班级")
     private String classname;
 
-    @Excel(name = "班级随机数", width = 15)
-    @ApiModelProperty(value = "班级随机数")
-    private String classsjs;
+    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String bz;
 
     /**
      * createTime

web/src/main/java/com/ynfy/buss/exam/chouqian/entity/CqCqks.java

@@ -30,12 +30,12 @@ public class CqCqks implements Serializable {
     @ApiModelProperty(value = "id")
     private String id;
 
-    @Excel(name = "username", width = 15)
-    @ApiModelProperty(value = "username")
+    @Excel(name = "考生账号", width = 15)
+    @ApiModelProperty(value = "考生账号")
     private String username;
 
-    @Excel(name = "realname", width = 15)
-    @ApiModelProperty(value = "realname")
+    @Excel(name = "考生姓名", width = 15)
+    @ApiModelProperty(value = "考生姓名")
     private String realname;
 
     @Excel(name = "区名称", width = 15)

web/src/main/java/com/ynfy/buss/exam/chouqian/entity/CqXxxq.java

@@ -30,10 +30,18 @@ public class CqXxxq implements Serializable {
     @ApiModelProperty(value = "区名称")
     private String districtname;
 
+    @Excel(name = "学校编号", width = 15)
+    @ApiModelProperty(value = "学校编号")
+    private String schoolcode;
+
     @Excel(name = "学校名称", width = 15)
     @ApiModelProperty(value = "学校名称")
     private String schoolname;
 
+    @Excel(name = "班级数量", width = 15)
+    @ApiModelProperty(value = "班级数量")
+    private String classcode;
+
     @Excel(name = "年级", width = 15)
     @ApiModelProperty(value = "年级")
     private String nianji;

web/src/main/java/com/ynfy/buss/exam/chouqian/entity/CqYcqxx.java

@@ -32,10 +32,18 @@ public class CqYcqxx implements Serializable {
     @ApiModelProperty(value = "区名称")
     private String districtname;
 
+    @Excel(name = "学校编号", width = 15)
+    @ApiModelProperty(value = "学校编号")
+    private String schoolcode;
+
     @Excel(name = "学校名称", width = 15)
     @ApiModelProperty(value = "学校名称")
     private String schoolname;
 
+    @Excel(name = "班级数量", width = 15)
+    @ApiModelProperty(value = "班级数量")
+    private String classcode;
+
     @Excel(name = "年级", width = 15)
     @ApiModelProperty(value = "年级")
     private String nianji;

web/src/main/java/com/ynfy/buss/exam/chouqian/mapper/CqCqbjxqMapper.java

@@ -0,0 +1,9 @@
+package com.ynfy.buss.exam.chouqian.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ynfy.buss.exam.chouqian.entity.CqCqbjxq;
+
+
+public interface CqCqbjxqMapper extends BaseMapper<CqCqbjxq> {
+
+}

web/src/main/java/com/ynfy/buss/exam/chouqian/mapper/CqKsxxMapper.java

@@ -13,4 +13,6 @@ public interface CqKsxxMapper extends BaseMapper<CqKsxx> {
     Integer chaclassrs(String schoolname);
     //获取指定学校指定班级的人数
     List<CqKsxx> chacqksxx(@Param("schoolname")String schoolname, @Param("classname")String classname);
+    //获取指定学校指定班级的人数
+    List<CqKsxx> chaxxksxx(@Param("districtname")String districtname, @Param("schoolname")String schoolname);
 }

web/src/main/java/com/ynfy/buss/exam/chouqian/mapper/CqXxxqMapper.java

@@ -10,6 +10,10 @@ import java.util.List;
 public interface CqXxxqMapper extends BaseMapper<CqXxxq> {
     //获取抽签学校详情
     List<CqXxxq> cqxxxq(@Param("cqXxxq")CqXxxq cqXxxq);
+    //获取市直属抽签学校详情
+    List<CqXxxq> cqxxxqszs(@Param("cqXxxq")CqXxxq cqXxxq);
+    //获取未抽签的学校
+    List<CqXxxq> wcqxx(@Param("cqXxxq")CqXxxq cqXxxq);
 
     List<String>  huoquds();
 

web/src/main/java/com/ynfy/buss/exam/chouqian/mapper/CqYcqxxMapper.java

@@ -11,4 +11,6 @@ public interface CqYcqxxMapper extends BaseMapper<CqYcqxx> {
     //获取抽取不足指定人数的院校
     List<CqYcqxx> chabzrsxx(@Param("districtname")String districtname ,@Param("estate")String estate ,@Param("studentamount")int studentamount);
     List<CqYcqxx> chabzrsxxbz(@Param("districtname")String districtname ,@Param("estate")String estate ,@Param("studentamount")int studentamount,@Param("schoolname")String schoolname);
+    //获取指定地市抽取到的学校最多班级数
+    String chabanjishu(String districtname );
 }

web/src/main/java/com/ynfy/buss/exam/chouqian/mapper/xml/CqCqbjxqMapper.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="com.ynfy.buss.exam.chouqian.mapper.CqCqbjxqMapper">
+
+</mapper>

web/src/main/java/com/ynfy/buss/exam/chouqian/mapper/xml/CqKsxxMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.ynfy.buss.exam.chouqian.mapper.CqKsxxMapper">
 
     <select id="chaclassname" resultType="java.lang.String">
-        select distinct classname from cq_ksxx where schoolname=#{schoolname} and classname  not in (select a.classname from cq_cqbjxx a,cq_ycqxx b where a.ycqxx_id=b.id and schoolname=#{schoolname})
+        select distinct classname from cq_ksxx where schoolname=#{schoolname} and classname  not in (select a.classname from cq_cqbjxq a,cq_ycqxx b where a.ycqxx_id=b.id and schoolname=#{schoolname})
     </select>
     <select id="chaclassnameqc" resultType="java.lang.String">
         select distinct classname from cq_ksxx where schoolname=#{schoolname}
@@ -12,7 +12,10 @@
         select * from cq_ksxx where schoolname=#{schoolname} and classname=#{classname}
     </select>
     <select id="chaclassrs" resultType="java.lang.Integer">
-        select count(0) from cq_ksxx where schoolname=#{schoolname} and classname  not in (select a.classname from cq_cqbjxx a,cq_ycqxx b where a.ycqxx_id=b.id and schoolname=#{schoolname})
+        select count(0) from cq_ksxx where schoolname=#{schoolname} and classname  not in (select a.classname from cq_cqbjxq a,cq_ycqxx b where a.ycqxx_id=b.id and schoolname=#{schoolname})
+    </select>
+    <select id="chaxxksxx" resultType="com.ynfy.buss.exam.chouqian.entity.CqKsxx">
+        select * from cq_ksxx where  districtname=#{districtname} and schoolname=#{schoolname}
     </select>
 
 </mapper>

web/src/main/java/com/ynfy/buss/exam/chouqian/mapper/xml/CqXxxqMapper.xml

@@ -2,8 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ynfy.buss.exam.chouqian.mapper.CqXxxqMapper">
     <select id="cqxxxq" resultType="com.ynfy.buss.exam.chouqian.entity.CqXxxq">
-    select * from cq_xxxq where districtname=#{cqXxxq.districtname} and nianji=#{cqXxxq.nianji} and estate=#{cqXxxq.estate} and
-                                schoolname not in(select schoolname from cq_ycqxx where districtname=#{cqXxxq.districtname} )
+    select * from cq_xxxq where districtname=#{cqXxxq.districtname} and nianji=#{cqXxxq.nianji} and estate=#{cqXxxq.estate}
     </select>
     <select id="huoquds" resultType="java.lang.String">
         select distinct districtname from cq_xxxq
@@ -14,4 +13,11 @@
     <select id="huoqudsxxnj" resultType="java.lang.String">
         select distinct nianji from cq_xxxq where districtname=#{districtname}
     </select>
+    <select id="wcqxx" resultType="com.ynfy.buss.exam.chouqian.entity.CqXxxq">
+        select * from cq_xxxq where districtname=#{cqXxxq.districtname} and nianji=#{cqXxxq.nianji} and estate=#{cqXxxq.estate} and
+            schoolname not in(select schoolname from cq_ycqxx where districtname=#{cqXxxq.districtname} )
+    </select>
+    <select id="cqxxxqszs" resultType="com.ynfy.buss.exam.chouqian.entity.CqXxxq">
+        select * from cq_xxxq where districtname=#{cqXxxq.districtname} and nianji=#{cqXxxq.nianji}
+    </select>
 </mapper>

web/src/main/java/com/ynfy/buss/exam/chouqian/mapper/xml/CqYcqxxMapper.xml

@@ -11,4 +11,8 @@
     <select id="chabzrsxxbz" resultType="com.ynfy.buss.exam.chouqian.entity.CqYcqxx">
         select * from cq_ycqxx where districtname=#{districtname} and schoolpopulation &gt; #{studentamount} and schoolname!=#{schoolname} and state="0"
     </select>
+    <select id="chabanjishu" resultType="java.lang.String">
+        select MAX(classcode) from cq_ycqxx
+    </select>
+
 </mapper>

web/src/main/java/com/ynfy/buss/exam/chouqian/service/ICqXxxqService.java

@@ -9,11 +9,18 @@ import java.util.List;
 
 public interface ICqXxxqService extends IService<CqXxxq> {
    //学校抽签
-    String cqxx(CqXxxq cqXxxq);
-    String cqxxbcf(CqXxxq cqXxxq);
+   List<CqXxxq> cqxx(CqXxxq cqXxxq);
+   //根据区等级年级获取所有学校
+
+   List<CqXxxq> hqxx(CqXxxq cqXxxq);
+//    String cqxxbcf(CqXxxq cqXxxq);
+   //班级抽签
+    String bjcq(String districtname);
+    //人员抽签
+    String rycq(CqXxxq cqXxxq);
 
     List<String>  huoquds();
     List<String>  huoqudsxxdj(String districtname);
     List<String>  huoqudsxxnj(String districtname);
-
+    String qccqxx();
 }

web/src/main/java/com/ynfy/buss/exam/chouqian/service/impl/CqXxxqServiceImpl.java

@@ -7,8 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ynfy.buss.exam.chouqian.entity.*;
 import com.ynfy.buss.exam.chouqian.mapper.*;
 import com.ynfy.buss.exam.chouqian.service.ICqXxxqService;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.system.entity.SysDepart;
+import org.jeecg.common.exception.JeecgBootException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,6 +33,8 @@ public class CqXxxqServiceImpl extends ServiceImpl<CqXxxqMapper, CqXxxq> impleme
     @Autowired
     private CqCqbjxxMapper cqCqbjxxMapper ;
     @Autowired
+    private CqCqbjxqMapper cqCqbjxqMapper ;
+    @Autowired
   
     //指定区间内抽取随机数
     public static int getRandomNumber(int min, int max) {
@@ -108,25 +109,25 @@ public class CqXxxqServiceImpl extends ServiceImpl<CqXxxqMapper, CqXxxq> impleme
 
         return winners;
     }
+    //学校抽签
     @Override
-    public String cqxx(CqXxxq cqXxxq) {
-        int studentamount=Integer.parseInt(cqXxxq.getStudentamount());
-        //根据县区名称、年级、层次获取符合的学校
-        List<CqXxxq> cqXxxqList=cqXxxqMapper.cqxxxq(cqXxxq);
-//        System.out.println("显示要抽签的学校。");
+    public List<CqXxxq> cqxx(CqXxxq cqXxxq) {
         List<CqXxxq> cqXxList=new ArrayList<>();//被抽签到到学校
-        if(cqXxxqList.isEmpty()){
-            return "没有可抽签的学校";
-        }else if(cqXxxqList.size()<Integer.parseInt(cqXxxq.getSchooamount())) {
-            return "可抽签的学数量不能大于以抽签学校数量";
-        }else {
-            cqXxList=chouschool(cqXxxqList, Integer.parseInt(cqXxxq.getSchooamount()));
-            CqYcqxx cqYcqxx=new CqYcqxx();//添加抽取记录的对象
-
+        List<CqXxxq> cqXxxqList=new ArrayList<>();
+        CqYcqxx cqYcqxx=new CqYcqxx();//添加抽取记录的对象
+        //判断是否是市直属学校
+        if (cqXxxq.getDistrictname().equals("市直属")) {
+            cqXxList=cqXxxqMapper.cqxxxqszs(cqXxxq);
+            if(cqXxList.isEmpty()){
+                throw new JeecgBootException("没有可抽签的学校！");
+            }else {
+            //保存被抽签的学校
             for (CqXxxq xxxq : cqXxList) {
                 cqYcqxx.setId(null);
                 cqYcqxx.setDistrictname(xxxq.getDistrictname());
                 cqYcqxx.setSchoolname(xxxq.getSchoolname());
+                cqYcqxx.setSchoolcode(xxxq.getSchoolcode());
+                cqYcqxx.setClasscode(xxxq.getClasscode());
                 cqYcqxx.setNianji(xxxq.getNianji());
                 cqYcqxx.setEstate(xxxq.getEstate());
                 //获取抽签学校的考生数
@@ -135,45 +136,33 @@ public class CqXxxqServiceImpl extends ServiceImpl<CqXxxqMapper, CqXxxq> impleme
                         .eq(CqKsxx::getSchoolname, xxxq.getSchoolname());
                 cqYcqxx.setSchoolpopulation(Math.toIntExact(cqKsxxMapper.selectCount(query1)));
                 cqYcqxxMapper.insert(cqYcqxx);
-                //抽签班级
-                this.cqbanji(cqYcqxx,xxxq.getSchoolname(),studentamount);
             }
-//            //正常情况抽取完成，开始抽取学校不足指定人数的规则
-            this.bcxxbanjiry(cqXxxq.getDistrictname(),cqXxxq.getEstate(),studentamount);
-            return "抽签完成！";
-        }
-
-    }
-    //抽签不允许抽已经抽取的区
-    @Override
-    public String cqxxbcf(CqXxxq cqXxxq) {
-        int studentamount=Integer.parseInt(cqXxxq.getStudentamount());
+                return cqXxList;
+            }
+        }else {
         //根据县区名称、年级、层次获取符合的学校
-        List<CqXxxq> cqXxxqList=cqXxxqMapper.cqxxxq(cqXxxq);
-
+        cqXxxqList=cqXxxqMapper.cqxxxq(cqXxxq);
         if(cqXxxqList.isEmpty()){
-            return "没有可抽签的学校";
+            throw new JeecgBootException("没有可抽签的学校！");
         }else if(cqXxxqList.size()<Integer.parseInt(cqXxxq.getSchooamount())) {
-            return "可抽签的学数量不能大于以抽签学校数量";
-        }else{
-            //        System.out.println("显示要抽签的学校。");
-            List<CqXxxq> cqXxList=new ArrayList<>();//被抽签到到学校
-            cqXxList=chouschool(cqXxxqList, Integer.parseInt(cqXxxq.getSchooamount()));
-//        System.out.println("抽取到的学校"+cqXxList);
-            CqYcqxx cqYcqxx=new CqYcqxx();//添加抽取记录的对象
+            throw new JeecgBootException("可抽签的学数量不能大于以抽签学校数量！");
+        }else {
             //检查当前区是否已经抽签
             LambdaQueryWrapper<CqYcqxx> query = new LambdaQueryWrapper<>();
-            query.eq(CqYcqxx::getDistrictname, cqXxxq.getDistrictname());
+            query.eq(CqYcqxx::getDistrictname, cqXxxq.getDistrictname())
+                 .eq(CqYcqxx::getEstate, cqXxxq.getEstate());
             Long count = cqYcqxxMapper.selectCount(query);
-//        System.out.println("显示count："+count);
             if (Integer.parseInt(count+"") >0) {
-                System.out.println("该区已经有抽签记录无法重复抽签");
+                throw new JeecgBootException("该区当前等级已经有抽签记录无法重复抽签！");
             }else if(Integer.parseInt(count+"") ==0){
+                cqXxList=chouschool(cqXxxqList, Integer.parseInt(cqXxxq.getSchooamount()));
                 //保存被抽签的学校
                 for (CqXxxq xxxq : cqXxList) {
                     cqYcqxx.setId(null);
                     cqYcqxx.setDistrictname(xxxq.getDistrictname());
                     cqYcqxx.setSchoolname(xxxq.getSchoolname());
+                    cqYcqxx.setSchoolcode(xxxq.getSchoolcode());
+                    cqYcqxx.setClasscode(xxxq.getClasscode());
                     cqYcqxx.setNianji(xxxq.getNianji());
                     cqYcqxx.setEstate(xxxq.getEstate());
                     //获取抽签学校的考生数
@@ -182,94 +171,182 @@ public class CqXxxqServiceImpl extends ServiceImpl<CqXxxqMapper, CqXxxq> impleme
                             .eq(CqKsxx::getSchoolname, xxxq.getSchoolname());
                     cqYcqxx.setSchoolpopulation(Math.toIntExact(cqKsxxMapper.selectCount(query1)));
                     cqYcqxxMapper.insert(cqYcqxx);
-                    //抽签班级
-                    this.cqbanji(cqYcqxx,xxxq.getSchoolname(),studentamount);
                 }
-//            //正常情况抽取完成，开始抽取学校不足指定人数的规则
-                this.bcxxbanjiry(cqXxxq.getDistrictname(),cqXxxq.getEstate(),studentamount);
             }else {
                 System.out.println("异常");
             }
-            return "抽签完成！";
+            return cqXxList;
+        }
         }
     }
 
     @Override
-    public List<String> huoquds() {
-        return cqXxxqMapper.huoquds();
+    public List<CqXxxq> hqxx(CqXxxq cqXxxq) {
+        LambdaQueryWrapper<CqXxxq> query = new LambdaQueryWrapper<>();
+        query.eq(CqXxxq::getDistrictname, cqXxxq.getDistrictname())
+             .eq(CqXxxq::getEstate, cqXxxq.getEstate())
+             .eq(CqXxxq::getNianji, cqXxxq.getNianji());
+        List<CqXxxq> cqXxxqList=cqXxxqMapper.selectList(query);
+        return cqXxxqList;
     }
 
+    //    //抽签不允许抽已经抽取的区
+//    @Override
+//    public String cqxxbcf(CqXxxq cqXxxq) {
+//        int studentamount=Integer.parseInt(cqXxxq.getStudentamount());
+//        //根据县区名称、年级、层次获取符合的学校
+//        List<CqXxxq> cqXxxqList=cqXxxqMapper.cqxxxq(cqXxxq);
+//
+//        if(cqXxxqList.isEmpty()){
+//            return "没有可抽签的学校";
+//        }else if(cqXxxqList.size()<Integer.parseInt(cqXxxq.getSchooamount())) {
+//            return "可抽签的学数量不能大于以抽签学校数量";
+//        }else{
+//            //        System.out.println("显示要抽签的学校。");
+//            List<CqXxxq> cqXxList=new ArrayList<>();//被抽签到到学校
+//            cqXxList=chouschool(cqXxxqList, Integer.parseInt(cqXxxq.getSchooamount()));
+////        System.out.println("抽取到的学校"+cqXxList);
+//            CqYcqxx cqYcqxx=new CqYcqxx();//添加抽取记录的对象
+//            //检查当前区是否已经抽签
+//            LambdaQueryWrapper<CqYcqxx> query = new LambdaQueryWrapper<>();
+//            query.eq(CqYcqxx::getDistrictname, cqXxxq.getDistrictname());
+//            Long count = cqYcqxxMapper.selectCount(query);
+////        System.out.println("显示count："+count);
+//            if (Integer.parseInt(count+"") >0) {
+//                System.out.println("该区已经有抽签记录无法重复抽签");
+//            }else if(Integer.parseInt(count+"") ==0){
+//                //保存被抽签的学校
+//                for (CqXxxq xxxq : cqXxList) {
+//                    cqYcqxx.setId(null);
+//                    cqYcqxx.setDistrictname(xxxq.getDistrictname());
+//                    cqYcqxx.setSchoolname(xxxq.getSchoolname());
+//                    cqYcqxx.setNianji(xxxq.getNianji());
+//                    cqYcqxx.setEstate(xxxq.getEstate());
+//                    //获取抽签学校的考生数
+//                    LambdaQueryWrapper<CqKsxx> query1 = new LambdaQueryWrapper<>();
+//                    query1.eq(CqKsxx::getDistrictname, xxxq.getDistrictname())
+//                            .eq(CqKsxx::getSchoolname, xxxq.getSchoolname());
+//                    cqYcqxx.setSchoolpopulation(Math.toIntExact(cqKsxxMapper.selectCount(query1)));
+//                    cqYcqxxMapper.insert(cqYcqxx);
+//                    //抽签班级
+////                    this.cqbanji(cqYcqxx,xxxq.getSchoolname(),studentamount);
+//                }
+////            //正常情况抽取完成，开始抽取学校不足指定人数的规则
+////                this.bcxxbanjiry(cqXxxq.getDistrictname(),cqXxxq.getEstate(),studentamount);
+//            }else {
+//                System.out.println("异常");
+//            }
+//            return "抽签完成！";
+//        }
+//    }
+    //班级抽签
     @Override
-    public List<String> huoqudsxxdj(String districtname) {
-        return cqXxxqMapper.huoqudsxxdj(districtname);
+    public String bjcq(String districtname) {
+        String banji="";
+//        判断是否抽班级
+        LambdaQueryWrapper<CqCqbjxx> query = new LambdaQueryWrapper<>();
+        query.eq(CqCqbjxx::getDistrictname, districtname);
+        Long count = cqCqbjxxMapper.selectCount(query);
+        if (Integer.parseInt(count+"") >0) {
+//            throw new JeecgBootException("该区已经有抽签班级记录无法重复抽签！");
+            System.out.println("该区已经有抽签班级记录无法重复抽签");
+        }else if(Integer.parseInt(count+"") ==0){
+            //获取当前区内班级数量最大的学校的班级数量
+            String zuidashuliang =cqYcqxxMapper.chabanjishu(districtname);
+            int sjs =getRandomNumber(Integer.parseInt(zuidashuliang));
+            banji=convertNumberToChinese(sjs)+"班";
+            System.out.println(banji);
+            //添加到数据库
+            CqCqbjxx cqCqbjxx= new CqCqbjxx();
+            cqCqbjxx.setDistrictname(districtname);
+            cqCqbjxx.setClassname(banji);
+            cqCqbjxx.setBz(sjs+"");
+            cqCqbjxxMapper.insert(cqCqbjxx);
+        }
+        return banji;
     }
-
+//人员抽签
     @Override
-    public List<String> huoqudsxxnj(String districtname) {
-        return cqXxxqMapper.huoqudsxxnj(districtname);
+    public String rycq(CqXxxq cqXxxq) {
+        //获取地市抽取的随机数
+        LambdaQueryWrapper<CqCqbjxx> query1 = new LambdaQueryWrapper<>();
+        query1.eq(CqCqbjxx::getDistrictname, cqXxxq.getDistrictname());
+        CqCqbjxx cqCqbjxx=cqCqbjxxMapper.selectOne(query1);
+        System.out.println("----------------------");
+//        System.out.println(cqCqbjxx);
+        //获取需要抽签的学校
+        LambdaQueryWrapper<CqYcqxx> query = new LambdaQueryWrapper<>();
+        query.eq(CqYcqxx::getDistrictname, cqXxxq.getDistrictname())
+             .eq(CqYcqxx::getEstate, cqXxxq.getEstate());
+        List<CqYcqxx> cqYcqxxList=cqYcqxxMapper.selectList(query);
+        int studentamount = 45;//抽取人数
+        for (CqYcqxx cqYcqxx : cqYcqxxList) {
+            //调用抽班级方法
+            rycqsjsbj(cqYcqxx,cqCqbjxx,studentamount);
+            System.out.println(cqYcqxx);
+        }
+        return null;
     }
+    public String rycqsjsbj(CqYcqxx cqYcqxx,CqCqbjxx cqCqbjxx,int studentamount) {
+        List<CqCqks> cqCqksList=new ArrayList<>();//学校抽取考生集合
+        int remainder = 0;//随机数取余的值
+        String banji="";//班级
+        if(cqYcqxx.getSchoolpopulation()>45){
+            System.out.println("够45人开始从班级里抽取人员");
+            //判断抽到的班级是否够45人
+            //判断当前学校的班级数量是否在抽取的随机数中
+            if(Integer.parseInt(cqYcqxx.getClasscode())>=Integer.parseInt(cqCqbjxx.getBz())){
+                //获取抽到的班级是几班
+                banji=cqYcqxx.getNianji()+convertNumberToChinese(Integer.parseInt(cqCqbjxx.getBz()))+"班";
+                //获取班级里面的人
+                System.out.println("banji1："+banji);
+                cqbanxs(cqYcqxx,banji,Integer.parseInt(cqCqbjxx.getBz()),studentamount);
+            }else {
+                //小于则随机数除以班级数量取余获取抽到的班级
+                remainder=Integer.parseInt(cqCqbjxx.getBz())%Integer.parseInt(cqYcqxx.getClasscode());
+                if (remainder==0){
+                    remainder=remainder+1;
+                }
+                banji=cqYcqxx.getNianji()+convertNumberToChinese(remainder)+"班";
+                System.out.println("banji2："+banji);
 
-    public boolean cqbanji(CqYcqxx cqYcqxx,String Schoolname,int studentamount) {
-        //校验当前学校是否进行班级抽取
-//        System.out.println("yyz显示cqYcqxx："+cqYcqxx);
-//        System.out.println("yyz显示xxxq："+xxxq);
-//        LambdaQueryWrapper<CqCqbjxx> query1 = new LambdaQueryWrapper<>();
-//        query1.eq(CqCqbjxx::getYcqxxId, cqYcqxx.getId());
-//        Long count1 = cqCqbjxxMapper.selectCount(query1);
-//        if (Integer.parseInt(count1+"") >0) {
-//            System.out.println("该学校以抽签班级");
-//        }else if(Integer.parseInt(count1+"") ==0){
-            //学校抽签完毕抽取学校班级
-            //查询当前学校有多少个班级
-            List<String> bjlist=cqKsxxMapper.chaclassname(Schoolname);
-            //抽签班级
-            System.out.println(bjlist);
-            List<String> chouqianclass=chouclass(bjlist,1);
-            CqCqbjxx cqCqbjxx= new CqCqbjxx();
-            cqCqbjxx.setYcqxxId(cqYcqxx.getId());
-            cqCqbjxx.setClassname(chouqianclass.get(0));
-            cqCqbjxxMapper.insert(cqCqbjxx);
-            //调用抽人方法
-            this.cqbanjiry(cqYcqxx,Schoolname,cqCqbjxx,studentamount);
-//        }
-
-        return true;
-    }
-    //补学校抽签班级
-    public boolean cqbanjibxx(CqYcqxx cqYcqxx,String Schoolname,int studentamount) {
+                cqbanxs(cqYcqxx,banji,Integer.parseInt(cqCqbjxx.getBz()),studentamount);
+            }
+        }else {
+            cqCqksList=this.cqbanji(cqKsxxMapper.chaxxksxx(cqYcqxx.getDistrictname(),cqYcqxx.getSchoolname()));
+            for (CqCqks cqCqks : cqCqksList) {
+                cqCqksMapper.insert(cqCqks);
+            }
+            System.out.println("学校人数不足抽签人数全部参加，都抽签完毕后，去别的学校里补");
+            //获取人员不够的学校进行补充
 
-        //查询当前学校有多少个班级
-        List<String> bjlist=cqKsxxMapper.chaclassname(Schoolname);
-        //抽签班级
-        System.out.println(bjlist);
-        List<String> chouqianclass=chouclass(bjlist,1);
-        CqCqbjxx cqCqbjxx= new CqCqbjxx();
-        cqCqbjxx.setYcqxxId(cqYcqxx.getId());
-        cqCqbjxx.setClassname(chouqianclass.get(0));
-        cqCqbjxx.setClasssjs("补给"+cqYcqxx.getSchoolname()+studentamount+"人");
-        cqCqbjxxMapper.insert(cqCqbjxx);
-        //调用抽人方法
-        this.cqbanjiry(cqYcqxx,Schoolname,cqCqbjxx,studentamount);
-        return true;
+        }
+        return null;
     }
-    public boolean cqbanjiry(CqYcqxx cqYcqxx,String Schoolname,CqCqbjxx cqCqbjxx,int studentamount) {
-        //班级抽取完毕开始抽取学生
-        //获取班级考试人数
-        System.out.println("开始抽人数");
+    //根据班级抽学生
+    public void cqbanxs(CqYcqxx cqYcqxx, String banji, int sjs, int studentamount) {
+        CqCqbjxq cqCqbjxq= new CqCqbjxq();
         //获取考生详情
-        List<CqKsxx> cqKsxxList =cqKsxxMapper.chacqksxx(Schoolname,cqCqbjxx.getClassname());
-//            System.out.println("抽签班级学生详情"+cqKsxxList);
-        System.out.println("抽签班级学生数量"+cqKsxxList.size());
+        List<CqKsxx> cqKsxxList =cqKsxxMapper.chacqksxx(cqYcqxx.getSchoolname(),banji);
+        System.out.println("抽签班级学生数量："+cqKsxxList.size());
+        System.out.println("抽签数量："+studentamount);
         List<CqCqks>  cqCqksList=new ArrayList<>();//抽中学生保存集合
         List<CqKsxx>  cqKsxxListcz=new ArrayList<>();//抽中学生集合
-        //判断抽到的学校人数是否大于指定人数
-        if(Integer.parseInt(String.valueOf(cqYcqxx.getSchoolpopulation()))>studentamount){
             //判断班级是否抽签
             LambdaQueryWrapper<CqCqks> query = new LambdaQueryWrapper<>();
-            query.eq(CqCqks::getSchoolname, Schoolname)
-                    .eq(CqCqks::getClassname, cqCqbjxx.getClassname());
+            query.eq(CqCqks::getSchoolname, cqYcqxx.getSchoolname())
+                    .eq(CqCqks::getClassname, banji);
             Long count = cqCqksMapper.selectCount(query);
             if (Integer.parseInt(count+"")==0){
+                //抽签班级信息保存入库
+                cqCqbjxq.setYcqxxId(cqYcqxx.getId());
+                cqCqbjxq.setClassname(banji);
+                if (studentamount<=cqKsxxList.size()) {
+                    cqCqbjxq.setBz(studentamount+"");
+                }else {
+                    cqCqbjxq.setBz(cqKsxxList.size()+"");
+                }
+                cqCqbjxqMapper.insert(cqCqbjxq);
                 //判断班级人数是否符合抽签人数
                 if(cqKsxxList.size()>studentamount){
                     System.out.println("大于45，随机抽人");
@@ -297,36 +374,175 @@ public class CqXxxqServiceImpl extends ServiceImpl<CqXxxqMapper, CqXxxq> impleme
                         cqCqks.setId(null);
                         cqCqksMapper.insert(cqCqks);
                     }
-                    //在本校中重新抽班级补人
-//                    this.cqbanji(cqYcqxx,xxxq,studentamount-cqKsxxList.size());
-                    //查询当前学校剩余多少个班级
-                    List<String> bjlist=cqKsxxMapper.chaclassname(Schoolname);
-                    //抽签班级
-                    System.out.println(bjlist);
-                    List<String> chouqianclass=chouclass(bjlist,1);
-                    CqCqbjxx cqCqbjxx1= new CqCqbjxx();
-                    cqCqbjxx1.setYcqxxId(cqYcqxx.getId());
-                    cqCqbjxx1.setClassname(chouqianclass.get(0));
-                    cqCqbjxx1.setClasssjs("补");
-                    cqCqbjxxMapper.insert(cqCqbjxx1);
-                    //调用抽人方法  只抽取缺的人数
-                    this.cqbanjiry(cqYcqxx,Schoolname,cqCqbjxx1,studentamount-cqKsxxList.size());
+                    //顺序抽取下一个班
+                    sjs=sjs+1;
+                    CqCqbjxx cqCqbjxx=new CqCqbjxx();
+                    cqCqbjxx.setBz(sjs+"");
+                    rycqsjsbj(cqYcqxx,cqCqbjxx,studentamount-cqKsxxList.size());
                 }
             }else {
                 System.out.println("该班级以抽签");
             }
+    }
+    // 生成抽签班级随机数
+    public static int getRandomNumber(int zuidashuliang) {
+        Random random = new Random();
+        return random.nextInt(zuidashuliang) + 1; // nextInt(x)生成0-x，加1后变为1-x
+    }
+    // 将数字转换为中文大写形式
+    public static String convertNumberToChinese(int number) {
+        String[] chineseNumbers = {
+                "一", "二", "三", "四", "五",
+                "六", "七", "八", "九", "十",
+                "十一", "十二", "十三", "十四", "十五",
+                "十六", "十七", "十八", "十九", "二十"
+        };
 
-        }else {
-            cqCqksList=this.cqbanji(cqKsxxList);
-            for (CqCqks cqCqks : cqCqksList) {
-                cqCqksMapper.insert(cqCqks);
-            }
-            System.out.println("学校人数不足抽签人数全部参加，都抽签完毕后，去别的学校里补");
-
+        if (number >= 1 && number <= 20) {
+            return chineseNumbers[number - 1]; // 数组索引从0开始
+        } else {
+            return "未知";
         }
-        return true;
     }
-    //循环赋值
+
+    @Override
+    public List<String> huoquds() {
+        return cqXxxqMapper.huoquds();
+    }
+
+    @Override
+    public List<String> huoqudsxxdj(String districtname) {
+        return cqXxxqMapper.huoqudsxxdj(districtname);
+    }
+
+    @Override
+    public List<String> huoqudsxxnj(String districtname) {
+        return cqXxxqMapper.huoqudsxxnj(districtname);
+    }
+
+    @Override
+    public String qccqxx() {
+        return null;
+    }
+
+    //    public boolean cqbanji(CqYcqxx cqYcqxx,String Schoolname,int studentamount) {
+//        //校验当前学校是否进行班级抽取
+////        System.out.println("yyz显示cqYcqxx："+cqYcqxx);
+////        System.out.println("yyz显示xxxq："+xxxq);
+////        LambdaQueryWrapper<CqCqbjxx> query1 = new LambdaQueryWrapper<>();
+////        query1.eq(CqCqbjxx::getYcqxxId, cqYcqxx.getId());
+////        Long count1 = cqCqbjxxMapper.selectCount(query1);
+////        if (Integer.parseInt(count1+"") >0) {
+////            System.out.println("该学校以抽签班级");
+////        }else if(Integer.parseInt(count1+"") ==0){
+//            //学校抽签完毕抽取学校班级
+//            //查询当前学校有多少个班级
+//            List<String> bjlist=cqKsxxMapper.chaclassname(Schoolname);
+//            //抽签班级
+//            System.out.println(bjlist);
+//            List<String> chouqianclass=chouclass(bjlist,1);
+//            CqCqbjxx cqCqbjxx= new CqCqbjxx();
+//            cqCqbjxx.setYcqxxId(cqYcqxx.getId());
+//            cqCqbjxx.setClassname(chouqianclass.get(0));
+//            cqCqbjxxMapper.insert(cqCqbjxx);
+//            //调用抽人方法
+//            this.cqbanjiry(cqYcqxx,Schoolname,cqCqbjxx,studentamount);
+////        }
+//
+//        return true;
+//    }
+    //补学校抽签班级
+//    public boolean cqbanjibxx(CqYcqxx cqYcqxx,String Schoolname,int studentamount) {
+//
+//        //查询当前学校有多少个班级
+//        List<String> bjlist=cqKsxxMapper.chaclassname(Schoolname);
+//        //抽签班级
+//        System.out.println(bjlist);
+//        List<String> chouqianclass=chouclass(bjlist,1);
+//        CqCqbjxx cqCqbjxx= new CqCqbjxx();
+//        cqCqbjxx.setYcqxxId(cqYcqxx.getId());
+//        cqCqbjxx.setClassname(chouqianclass.get(0));
+//        cqCqbjxx.setClasssjs("补给"+cqYcqxx.getSchoolname()+studentamount+"人");
+//        cqCqbjxxMapper.insert(cqCqbjxx);
+//        //调用抽人方法
+//        this.cqbanjiry(cqYcqxx,Schoolname,cqCqbjxx,studentamount);
+//        return true;
+//    }
+//    public boolean cqbanjiry(CqYcqxx cqYcqxx,String Schoolname,CqCqbjxx cqCqbjxx,int studentamount) {
+//        //班级抽取完毕开始抽取学生
+//        //获取班级考试人数
+//        System.out.println("开始抽人数");
+//        //获取考生详情
+//        List<CqKsxx> cqKsxxList =cqKsxxMapper.chacqksxx(Schoolname,cqCqbjxx.getClassname());
+////            System.out.println("抽签班级学生详情"+cqKsxxList);
+//        System.out.println("抽签班级学生数量"+cqKsxxList.size());
+//        List<CqCqks>  cqCqksList=new ArrayList<>();//抽中学生保存集合
+//        List<CqKsxx>  cqKsxxListcz=new ArrayList<>();//抽中学生集合
+//        //判断抽到的学校人数是否大于指定人数
+//        if(Integer.parseInt(String.valueOf(cqYcqxx.getSchoolpopulation()))>studentamount){
+//            //判断班级是否抽签
+//            LambdaQueryWrapper<CqCqks> query = new LambdaQueryWrapper<>();
+//            query.eq(CqCqks::getSchoolname, Schoolname)
+//                    .eq(CqCqks::getClassname, cqCqbjxx.getClassname());
+//            Long count = cqCqksMapper.selectCount(query);
+//            if (Integer.parseInt(count+"")==0){
+//                //判断班级人数是否符合抽签人数
+//                if(cqKsxxList.size()>studentamount){
+//                    System.out.println("大于45，随机抽人");
+//                    //班级人数大于抽签人数时随机抽取考试人员
+//                    cqKsxxListcz= choustudent(cqKsxxList,studentamount);
+//                    System.out.println(cqKsxxListcz);
+//                    System.out.println(cqKsxxListcz.size());
+//                    cqCqksList=this.cqbanji(cqKsxxListcz);
+//                    for (CqCqks cqCqks : cqCqksList) {
+//                        cqCqks.setId(null);
+//                        cqCqksMapper.insert(cqCqks);
+//                    }
+//                }else if(cqKsxxList.size()==studentamount){
+//                    System.out.println("=45");
+//                    cqCqksList=this.cqbanji(cqKsxxList);
+//                    for (CqCqks cqCqks : cqCqksList) {
+//                        cqCqks.setId(null);
+//                        cqCqksMapper.insert(cqCqks);
+//                    }
+//                }else{
+//                    System.out.println("小于45");
+//                    //若抽中班级的学生数量少于当前学段需要参加考试的学生数量，当前班级人员全部参加
+//                    cqCqksList=this.cqbanji(cqKsxxList);
+//                    for (CqCqks cqCqks : cqCqksList) {
+//                        cqCqks.setId(null);
+//                        cqCqksMapper.insert(cqCqks);
+//                    }
+//                    //在本校中重新抽班级补人
+////                    this.cqbanji(cqYcqxx,xxxq,studentamount-cqKsxxList.size());
+//                    //查询当前学校剩余多少个班级
+//                    List<String> bjlist=cqKsxxMapper.chaclassname(Schoolname);
+//                    //抽签班级
+//                    System.out.println(bjlist);
+//                    List<String> chouqianclass=chouclass(bjlist,1);
+//                    CqCqbjxx cqCqbjxx1= new CqCqbjxx();
+////                    cqCqbjxx1.setYcqxxId(cqYcqxx.getId());
+//                    cqCqbjxx1.setClassname(chouqianclass.get(0));
+////                    cqCqbjxx1.setClasssjs("补");
+//                    cqCqbjxxMapper.insert(cqCqbjxx1);
+//                    //调用抽人方法  只抽取缺的人数
+//                    this.cqbanjiry(cqYcqxx,Schoolname,cqCqbjxx1,studentamount-cqKsxxList.size());
+//                }
+//            }else {
+//                System.out.println("该班级以抽签");
+//            }
+//
+//        }else {
+//            cqCqksList=this.cqbanji(cqKsxxList);
+//            for (CqCqks cqCqks : cqCqksList) {
+//                cqCqksMapper.insert(cqCqks);
+//            }
+//            System.out.println("学校人数不足抽签人数全部参加，都抽签完毕后，去别的学校里补");
+//
+//        }
+//        return true;
+//    }
+//    //循环赋值
     public List<CqCqks> cqbanji(List<CqKsxx> cqKsxxList) {
         List<CqCqks> cqCqksList=new ArrayList<>();
         CqCqks cqCqks=new CqCqks();
@@ -364,12 +580,11 @@ public class CqXxxqServiceImpl extends ServiceImpl<CqXxxqMapper, CqXxxq> impleme
                 //判断剩余人数是否狗
                 if(cqKsxxMapper.chaclassrs(cqYcqxxbc.getSchoolname())>chouqurenshu){
                     System.out.println("执行");
-                    this.cqbanjibxx(cqYcqxxbc,cqYcqxxbc.getSchoolname(),chouqurenshu);
+//                    this.cqbanjibxx(cqYcqxxbc,cqYcqxxbc.getSchoolname(),chouqurenshu);
                     break;
                 }
             }
         }
-
         return true;
     }
 }