|
|
@ -20,6 +20,8 @@ import org.jeecg.common.util.oConvertUtils; |
|
|
|
import org.jeecg.config.JeecgBaseConfig; |
|
|
|
import org.jeecg.config.JeecgBaseConfig; |
|
|
|
import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint; |
|
|
|
import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint; |
|
|
|
import org.jeecg.modules.demo.annualCompPoint.service.IAnnualCompPointService; |
|
|
|
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.entity.AnnualCompAward; |
|
|
|
import org.jeecg.modules.demo.annualcompaward.service.IAnnualCompAwardService; |
|
|
|
import org.jeecg.modules.demo.annualcompaward.service.IAnnualCompAwardService; |
|
|
|
import org.jeecg.modules.demo.annualcompetitionprojectregistration.entity.AnnualCompetitionProjectRegistration; |
|
|
|
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 com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
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.ExcelImportUtil; |
|
|
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants; |
|
|
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants; |
|
|
|
import org.jeecgframework.poi.excel.entity.ExportParams; |
|
|
|
import org.jeecgframework.poi.excel.entity.ExportParams; |
|
|
@ -70,6 +74,10 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward |
|
|
|
private IAnnualCompPointService annualCompPointService; |
|
|
|
private IAnnualCompPointService annualCompPointService; |
|
|
|
@Autowired |
|
|
|
@Autowired |
|
|
|
private IAnnualCompetitionProjectRegistrationService annualCompetitionProjectRegistrationService; |
|
|
|
private IAnnualCompetitionProjectRegistrationService annualCompetitionProjectRegistrationService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
|
|
private ICompService compService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
|
|
private IAnnualCompService annualCompService; |
|
|
|
@Resource |
|
|
|
@Resource |
|
|
|
private JeecgBaseConfig jeecgBaseConfig; |
|
|
|
private JeecgBaseConfig jeecgBaseConfig; |
|
|
|
|
|
|
|
|
|
|
@ -89,7 +97,27 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward |
|
|
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, |
|
|
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, |
|
|
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, |
|
|
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, |
|
|
|
HttpServletRequest req) { |
|
|
|
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<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); |
|
|
|
Page<AwardPersion> page = new Page<AwardPersion>(pageNo, pageSize); |
|
|
|
IPage<AwardPersion> pageList = awardPersionService.page(page, queryWrapper); |
|
|
|
IPage<AwardPersion> pageList = awardPersionService.page(page, queryWrapper); |
|
|
|
return Result.OK(pageList); |
|
|
|
return Result.OK(pageList); |
|
|
|