xuhy
2024-12-11 5be07b1a021f596b003eac001f4cb77416ae6c7b
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCommitteeController.java
@@ -93,18 +93,31 @@
        return R.ok();
    }
    //列表
    @ApiOperation(value = "查询",tags = {"后台-评审委员会管理","web-评审委员会"})
    @ApiOperation(value = "查询",tags = {"后台-评审委员会管理"})
    @PostMapping("/list")
    public R<Page<TCommittee>> list(@RequestBody CommitteeQuery informationQuery){
        Page<TCommittee> page = tCommitteeService.lambdaQuery()
                .like(!StringUtils.isEmpty(informationQuery.getName()), TCommittee::getCommitteeName, informationQuery.getName())
                .like(!StringUtils.isEmpty(informationQuery.getCommitteeUnit()), TCommittee::getCommitteeLevel, informationQuery.getCommitteeUnit())
                .eq(informationQuery.getRegionId() != null, TCommittee::getRegionId, informationQuery.getRegionId())
                .eq(informationQuery.getTechnicalId() != null, TCommittee::getTechnicalId, informationQuery.getTechnicalId())
                .eq(informationQuery.getMajorId() != null, TCommittee::getMajorId, informationQuery.getMajorId())
                .eq(informationQuery.getLevel() != null, TCommittee::getLevel, informationQuery.getLevel())
                .orderByDesc(TCommittee::getCommitteeSort)
                .page(Page.of(informationQuery.getPageNum(), informationQuery.getPageSize()));
        Page<TCommittee> page;
        if(informationQuery.getSortType() == 1){
            page = tCommitteeService.lambdaQuery()
                    .like(!StringUtils.isEmpty(informationQuery.getName()), TCommittee::getCommitteeName, informationQuery.getName())
                    .like(!StringUtils.isEmpty(informationQuery.getCommitteeUnit()), TCommittee::getCommitteeUnit, informationQuery.getCommitteeUnit())
                    .eq(informationQuery.getRegionId() != null, TCommittee::getRegionId, informationQuery.getRegionId())
                    .eq(informationQuery.getTechnicalId() != null, TCommittee::getTechnicalId, informationQuery.getTechnicalId())
                    .eq(informationQuery.getMajorId() != null, TCommittee::getMajorId, informationQuery.getMajorId())
                    .eq(informationQuery.getLevel() != null, TCommittee::getLevel, informationQuery.getLevel())
                    .orderByDesc(TCommittee::getCreateTime)
                    .page(Page.of(informationQuery.getPageNum(), informationQuery.getPageSize()));
        }else {
            page = tCommitteeService.lambdaQuery()
                    .like(!StringUtils.isEmpty(informationQuery.getName()), TCommittee::getCommitteeName, informationQuery.getName())
                    .like(!StringUtils.isEmpty(informationQuery.getCommitteeUnit()), TCommittee::getCommitteeUnit, informationQuery.getCommitteeUnit())
                    .eq(informationQuery.getRegionId() != null, TCommittee::getRegionId, informationQuery.getRegionId())
                    .eq(informationQuery.getTechnicalId() != null, TCommittee::getTechnicalId, informationQuery.getTechnicalId())
                    .eq(informationQuery.getMajorId() != null, TCommittee::getMajorId, informationQuery.getMajorId())
                    .eq(informationQuery.getLevel() != null, TCommittee::getLevel, informationQuery.getLevel())
                    .orderByDesc(TCommittee::getCommitteeSort)
                    .page(Page.of(informationQuery.getPageNum(), informationQuery.getPageSize()));
        }
        for (TCommittee record : page.getRecords()) {
            TRegion byId = regionService.getById(record.getRegionId());