修改抽签4

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

@@ -167,6 +167,7 @@ public class CqXxxqController extends JeecgController<CqXxxq, ICqXxxqService> {
 //        //测试添加
 //        CqXxxq cqXxxq=new CqXxxq();
 //        cqXxxq.setDistrictname(cqCqks.getDistrictname());
+//        cqXxxq.setNianji(cqCqks.getNianji());
 //        cqXxxqService.rycq(cqXxxq);
         return Result.OK(pageList);
     }

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

@@ -336,7 +336,7 @@ public class CqXxxqServiceImpl extends ServiceImpl<CqXxxqMapper, CqXxxq> impleme
         if (cqXxxq.getDistrictname().equals("市直属")) {
             //获取需要抽签的学校
             LambdaQueryWrapper<CqYcqxx> query = new LambdaQueryWrapper<>();
-            query.eq(CqYcqxx::getDistrictname, cqXxxq.getDistrictname());
+            query.eq(CqYcqxx::getDistrictname, cqXxxq.getDistrictname()).eq(CqYcqxx::getNianji, cqXxxq.getNianji());
             List<CqYcqxx> cqYcqxxList=cqYcqxxMapper.selectList(query);
             for (CqYcqxx cqYcqxx : cqYcqxxList) {
                 //调用抽班级方法
@@ -353,6 +353,7 @@ public class CqXxxqServiceImpl extends ServiceImpl<CqXxxqMapper, CqXxxq> impleme
             LambdaQueryWrapper<CqYcqxx> query = new LambdaQueryWrapper<>();
             query.eq(CqYcqxx::getDistrictname, cqXxxq.getDistrictname())
                  .eq(CqYcqxx::getEstate, cqXxxq.getEstate())
+                 .eq(CqYcqxx::getNianji, cqXxxq.getNianji())
                  .ne(CqYcqxx::getState, "2");
             List<CqYcqxx> cqYcqxxList=cqYcqxxMapper.selectList(query);
             if (cqYcqxxList.isEmpty()){