Merge remote-tracking branch 'origin/master'

fuliqi

2024-11-26 a272c80f565aa5ace23820558fdb7cde636d15f0

 business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java

@@ -6,7 +6,7 @@
import com.ycl.domain.entity.ProjectInfo;
import com.ycl.domain.form.ProjectInfoForm;
import com.ycl.domain.query.ProjectInfoQuery;
import com.ycl.domain.vo.ProjectInfoVO;
import com.ycl.domain.vo.*;
import com.ycl.framework.utils.PageUtil;
import com.ycl.mapper.ProjectInfoMapper;
import com.ycl.service.ProjectInfoService;
@@ -15,7 +15,10 @@
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
@@ -32,6 +35,7 @@

    /**
     * 添加
     *
     * @param form
     * @return
     */
@@ -44,6 +48,7 @@

    /**
     * 修改
     *
     * @param form
     * @return
     */
@@ -60,6 +65,7 @@

    /**
     * 批量删除
     *
     * @param ids
     * @return
     */
@@ -71,6 +77,7 @@

    /**
     * id删除
     *
     * @param id
     * @return
     */
@@ -82,6 +89,7 @@

    /**
     * 分页查询
     *
     * @param query
     * @return
     */
@@ -94,6 +102,7 @@

    /**
     * 根据id查找
     *
     * @param id
     * @return
     */
@@ -106,6 +115,7 @@

    /**
     * 列表
     *
     * @return
     */
    @Override
@@ -116,4 +126,37 @@
                .collect(Collectors.toList());
        return Result.ok().data(vos);
    }

    @Override
    public IndexCountVO getIndexCount(IndexDTO indexDTO) {
        // {"proPhaseCountVO":[{"type":"储备规划阶段","count":0,"amount":"0.00","text":"储"},
        // {"type":"项目前期阶段","count":0,"amount":"0.00","text":"新"},
        // {"type":"实施阶段","count":0,"amount":"0.00","text":"建"},{"type":"竣工投用阶段","count":0,"amount":"0.00","text":"竣"}],
        // "impTypeCountVO":[{"type":"一般项目","count":0,"amount":"0.00","text":"普"},
        // {"type":"县重点项目","count":0,"amount":"0.00","text":"县"},{"type":"市重点项目","count":0,"amount":"0.00","text":"市"},
        // {"type":"省重点项目","count":0,"amount":"0.00","text":"省"}]}}
        IndexCountVO indexCountVO = new IndexCountVO();
        List<IndexProPhaseCountVO> proPhaseCountVO = new ArrayList<>();
        proPhaseCountVO.add(new IndexProPhaseCountVO("储备规划阶段", 0, "0.00", "储"));
        proPhaseCountVO.add(new IndexProPhaseCountVO("项目前期阶段", 0, "0.00", "新"));
        proPhaseCountVO.add(new IndexProPhaseCountVO("实施阶段", 0, "0.00", "建"));
        proPhaseCountVO.add(new IndexProPhaseCountVO("竣工投用阶段", 0, "0.00", "竣"));
        List<IndexImpTypeCountVO> impTypeCountVO = new ArrayList<>();
        impTypeCountVO.add(new IndexImpTypeCountVO("一般项目", 0, "0.00", "普"));
        impTypeCountVO.add(new IndexImpTypeCountVO("县重点项目", 0, "0.00", "县"));
        impTypeCountVO.add(new IndexImpTypeCountVO("市重点项目", 0, "0.00", "市"));
        impTypeCountVO.add(new IndexImpTypeCountVO("省重点项目", 0, "0.00", "省"));
        indexCountVO.setImpTypeCountVO(impTypeCountVO);
        indexCountVO.setProPhaseCountVO(proPhaseCountVO);


        return indexCountVO;
    }

    @Override
    public Map<String, Integer> countExceptionProject(IndexDTO indexDTO) {
        Map<String, Integer> map = new HashMap<>();
        map.put("processExceptionProject", 0);
        return map;
    }
}