修改

xuhy

2024-12-12 412ed345ecf217516fa697f0a25cf7e67559958f

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

@@ -18,6 +18,7 @@

import javax.annotation.Resource;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -130,6 +131,7 @@
    @PostMapping(value = "/list")
    public R<Page<TDeclareNotice>> list(@RequestBody DeclareNoticeQuery informationQuery) {
        Page<TDeclareNotice> page;
        if(StringUtils.isEmpty(informationQuery.getProvinceName())){
        if(informationQuery.getSortType()==1){
            page = tDeclareNoticeService.lambdaQuery()
                    .like(!StringUtils.isEmpty(informationQuery.getDeclareNoticeName()), TDeclareNotice::getDeclareNoticeName, informationQuery.getDeclareNoticeName())
@@ -155,6 +157,47 @@
                    .orderByDesc(TDeclareNotice::getNoticeSort)
                    .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 = tDeclareNoticeService.lambdaQuery()
                        .like(!StringUtils.isEmpty(informationQuery.getDeclareNoticeName()), TDeclareNotice::getDeclareNoticeName, informationQuery.getDeclareNoticeName())
                        .in( TDeclareNotice::getRegionId, ids)
                        .eq(informationQuery.getTechnicalId() != null, TDeclareNotice::getTechnicalId, informationQuery.getTechnicalId())
                        .eq(informationQuery.getMajorId() != null, TDeclareNotice::getMajorId, informationQuery.getMajorId())
                        .eq(informationQuery.getLevel() != null, TDeclareNotice::getLevel, informationQuery.getLevel())
                        .eq(informationQuery.getIsOnline()!=null, TDeclareNotice::getIsOnline, informationQuery.getIsOnline())
                        .between(informationQuery.getDeclareStartTime1()!=null,TDeclareNotice::getDeclareStartTime,informationQuery.getDeclareStartTime1(),informationQuery.getDeclareStartTime2())
                        .between(informationQuery.getDeclareEndTime1()!=null,TDeclareNotice::getDeclareEndTime,informationQuery.getDeclareEndTime1(),informationQuery.getDeclareEndTime2())
                        .orderByDesc(TDeclareNotice::getCreateTime)
                        .page(Page.of(informationQuery.getPageNum(), informationQuery.getPageSize()));
            }else {
                page = tDeclareNoticeService.lambdaQuery()
                        .like(!StringUtils.isEmpty(informationQuery.getDeclareNoticeName()), TDeclareNotice::getDeclareNoticeName, informationQuery.getDeclareNoticeName())
                        .in( TDeclareNotice::getRegionId, ids)
                        .eq(informationQuery.getTechnicalId() != null, TDeclareNotice::getTechnicalId, informationQuery.getTechnicalId())
                        .eq(informationQuery.getMajorId() != null, TDeclareNotice::getMajorId, informationQuery.getMajorId())
                        .eq(informationQuery.getLevel() != null, TDeclareNotice::getLevel, informationQuery.getLevel())
                        .eq(informationQuery.getIsOnline()!=null, TDeclareNotice::getIsOnline, informationQuery.getIsOnline())
                        .between(informationQuery.getDeclareStartTime1()!=null,TDeclareNotice::getDeclareStartTime,informationQuery.getDeclareStartTime1(),informationQuery.getDeclareStartTime2())
                        .between(informationQuery.getDeclareEndTime1()!=null,TDeclareNotice::getDeclareEndTime,informationQuery.getDeclareEndTime1(),informationQuery.getDeclareEndTime2())
                        .orderByDesc(TDeclareNotice::getNoticeSort)
                        .page(Page.of(informationQuery.getPageNum(), informationQuery.getPageSize()));
            }
        }


        for (TDeclareNotice record : page.getRecords()) {
            TRegion byId = regionService.getById(record.getRegionId());
@@ -177,7 +220,7 @@
        tDeclareNotice.setDeclareNoticeTechnicals(tDeclareNoticeTechnicals);
        tDeclareNotice.setDeclareNoticeMajors(tDeclareNoticeMajors);
        if(StringUtils.isEmpty(tDeclareNotice.getDeclareLevel())){
            tDeclareNotice.setDeclareLevel(tDeclareNoticeTechnicals.stream().map(TDeclareNoticeTechnical::getLevelName).collect(Collectors.joining("/")));
            tDeclareNotice.setDeclareLevel(tDeclareNoticeTechnicals.stream().map(TDeclareNoticeTechnical::getTechnicalName).collect(Collectors.joining("/")));
        }
        return R.ok(tDeclareNotice);
    }