From 5f943e7c05365178260b88e039dd7fb9b8f41f56 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Fri, 24 Nov 2023 16:13:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=A5=96=E6=95=B0=E6=8D=AE=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AwardPersionController.java    | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java
index 032a4837..410eef3c 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java
@@ -20,6 +20,8 @@ import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.config.JeecgBaseConfig;
 import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint;
 import org.jeecg.modules.demo.annualCompPoint.service.IAnnualCompPointService;
+import org.jeecg.modules.demo.annualcomp.entity.AnnualComp;
+import org.jeecg.modules.demo.annualcomp.service.IAnnualCompService;
 import org.jeecg.modules.demo.annualcompaward.entity.AnnualCompAward;
 import org.jeecg.modules.demo.annualcompaward.service.IAnnualCompAwardService;
 import org.jeecg.modules.demo.annualcompetitionprojectregistration.entity.AnnualCompetitionProjectRegistration;
@@ -34,6 +36,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.demo.comp.entity.Comp;
+import org.jeecg.modules.demo.comp.service.ICompService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -70,6 +74,10 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward
 	 private IAnnualCompPointService annualCompPointService;
 	 @Autowired
 	 private IAnnualCompetitionProjectRegistrationService annualCompetitionProjectRegistrationService;
+	 @Autowired
+	 private ICompService compService;
+	 @Autowired
+	 private IAnnualCompService annualCompService;
 	 @Resource
 	 private JeecgBaseConfig jeecgBaseConfig;
 
@@ -89,7 +97,27 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
+		LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		Comp comp = new Comp();
+		QueryWrapper<Comp> queryWrappercomp = QueryGenerator.initQueryWrapper(comp, req.getParameterMap());
+		queryWrappercomp.like("comp_admin",user.getUsername());
+		List<Comp> list = compService.list(queryWrappercomp);
+		List<String> ids = list.stream().map(Comp::getId).collect(Collectors.toList());
+		QueryWrapper<AnnualComp> queryWrapperAnnual = new QueryWrapper<>();
+		queryWrapperAnnual.in(ids.size()!=0,"compid",ids);
+		List<AnnualComp> listAnnual = annualCompService.list(queryWrapperAnnual);
+		List<String> annualIds = listAnnual.stream().map(AnnualComp::getId).collect(Collectors.toList());
 		QueryWrapper<AwardPersion> queryWrapper = QueryGenerator.initQueryWrapper(awardPersion, req.getParameterMap());
+		queryWrapper.in(annualIds.size()!=0,"annal_comp",annualIds);
+
+		AnnualCompPoint annualCompPoint = new AnnualCompPoint();
+		QueryWrapper<AnnualCompPoint> queryWrapperacp = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap());
+		queryWrapperacp.in(annualIds.size()!=0,"annual_comp_id",annualIds);
+		queryWrapperacp.eq("annual_comp_switch","Y");    // 比赛必须是开启的
+		List<AnnualCompPoint> listacp = annualCompPointService.list(queryWrapperacp);
+		List<String> acpIds = listacp.stream().map(AnnualCompPoint::getId).collect(Collectors.toList());
+		queryWrapper.in(acpIds.size()!=0,"annual_comp_p",acpIds);
+
 		Page<AwardPersion> page = new Page<AwardPersion>(pageNo, pageSize);
 		IPage<AwardPersion> pageList = awardPersionService.page(page, queryWrapper);
 		return Result.OK(pageList);