修改

xuhy

2024-12-12 412ed345ecf217516fa697f0a25cf7e67559958f

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCommitteeController.java

@@ -16,8 +16,10 @@
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -97,6 +99,7 @@
    @PostMapping("/list")
    public R<Page<TCommittee>> list(@RequestBody CommitteeQuery informationQuery){
        Page<TCommittee> page;
        if(StringUtils.isEmpty(informationQuery.getProvinceName())){
        if(informationQuery.getSortType() == 1){
            page = tCommitteeService.lambdaQuery()
                    .like(!StringUtils.isEmpty(informationQuery.getName()), TCommittee::getCommitteeName, informationQuery.getName())
@@ -118,6 +121,42 @@
                    .orderByDesc(TCommittee::getCommitteeSort)
                    .page(Page.of(informationQuery.getPageNum(), informationQuery.getPageSize()));
        }
        }else {
            List<TRegion> list;
            // 查询省份下的市
            if(informationQuery.getProvinceName().equals("直辖市")){
                List<String> cityList = new ArrayList<>();
                cityList.add("北京市");
                cityList.add("天津市");
                cityList.add("重庆市");
                cityList.add("上海市");
                list = regionService.lambdaQuery().in(TRegion::getProvinceName, cityList).list();
            }else {
                list = regionService.lambdaQuery().eq(TRegion::getProvinceName, informationQuery.getProvinceName()).list();
            }
            List<Integer> ids = list.stream().map(TRegion::getId).collect(Collectors.toList());
            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())
                        .in( TCommittee::getRegionId, ids)
                        .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())
                        .in( TCommittee::getRegionId, ids)
                        .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());