Merge remote-tracking branch 'origin/master'

luohairen

2024-11-29 5041e1691397344f4bd8d79b34c74df512b69881

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java

 business/src/main/java/com/ycl/controller/ProjectInfoController.java

@@ -58,7 +58,7 @@
    @DeleteMapping("/{id}")
    @ApiOperation(value = "ID删除", notes = "ID删除")
//    @PreAuthorize("hasAuthority('projectInfo:del')")
    public Result removeById(@PathVariable("id") String id) {
    public Result removeById(@PathVariable("id") Long id) {
        return projectInfoService.removeById(id);
    }


 business/src/main/java/com/ycl/mapper/ProjectInfoMapper.java

@@ -5,8 +5,11 @@
import com.ycl.domain.entity.ProjectInfo;
import com.ycl.domain.query.ProjectInfoQuery;
import com.ycl.domain.vo.ProjectInfoVO;
import com.ycl.domain.vo.ProjectVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * 项目管理基础信息表 Mapper 接口
@@ -29,4 +32,6 @@
    */
    IPage getPage(IPage page, @Param("query") ProjectInfoQuery query);

    List<ProjectVO> homeCount();

}

 business/src/main/java/com/ycl/service/ProjectInfoService.java

@@ -46,7 +46,7 @@
     * @param id
     * @return
     */
    Result removeById(String id);
    Result removeById(Long id);

    /**
     * 分页查询

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

@@ -6,27 +6,28 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.common.base.Result;
import com.ycl.common.enums.business.FileTypeEnum;
import com.ycl.common.enums.business.ImportanceTypeEnum;
import com.ycl.common.enums.business.ProjectCategoryEnum;
import com.ycl.common.utils.CopyUtils;
import com.ycl.common.utils.DateUtils;
import com.ycl.common.utils.SecurityUtils;
import com.ycl.domain.entity.File;
import com.ycl.domain.entity.ProjectInfo;
import com.ycl.common.utils.StringUtils;
import com.ycl.domain.entity.*;
import com.ycl.domain.form.DocumentInfoForm;
import com.ycl.domain.form.ProjectInfoForm;
import com.ycl.domain.query.ProjectInfoQuery;
import com.ycl.domain.vo.*;
import com.ycl.framework.utils.PageUtil;
import com.ycl.mapper.FileMapper;
import com.ycl.mapper.ProjectInfoMapper;
import com.ycl.mapper.*;
import com.ycl.service.FileService;
import com.ycl.service.ProjectInfoService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;

@@ -41,6 +42,10 @@
public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, ProjectInfo> implements ProjectInfoService {

    private final ProjectInfoMapper projectInfoMapper;
    private final ProjectInvestmentFundingMapper investmentFundingMapper;
    private final ProjectInvestmentInfoMapper investmentInfoMapper;
    private final ProjectInvestmentPolicyComplianceMapper policyMapper;
    private final ProjectUnitRegistrationInfoMapper unitRegistrationInfoMapper;
    private final FileService fileService;
    private final FileMapper fileMapper;

@@ -109,7 +114,6 @@
     * @return
     */
    @Override
    //TODO:待完善
    public Result remove(List<String> ids) {
        baseMapper.deleteBatchIds(ids);
        return Result.ok("删除成功");
@@ -122,8 +126,18 @@
     * @return
     */
    @Override
    //TODO:待完善
    public Result removeById(String id) {
    @Transactional(rollbackFor = Exception.class)
    public Result removeById(Long id) {
        investmentFundingMapper.delete(new QueryWrapper<ProjectInvestmentFunding>().eq("project_id", id));
        investmentInfoMapper.delete(new QueryWrapper<ProjectInvestmentInfo>().eq("project_id", id));
        policyMapper.delete(new QueryWrapper<ProjectInvestmentPolicyCompliance>().eq("project_id", id));
        unitRegistrationInfoMapper.delete(new QueryWrapper<ProjectUnitRegistrationInfo>().eq("project_id", id));

        List<String> types = new ArrayList<>();
        types.add(FileTypeEnum.PROJECT_INFO.getType());
        types.add(FileTypeEnum.INVEST_POLICY.getType());
        types.add(FileTypeEnum.DOCUMENT_INFO.getType());
        fileMapper.delete(new QueryWrapper<File>().eq("bus_id", id).in("type", types));
        baseMapper.deleteById(id);
        return Result.ok("删除成功");
    }
@@ -143,13 +157,14 @@
            query.setProjectEndTime(DateUtils.getDayEnd(query.getProjectEndTime()));
        }
        String projectCategory = query.getProjectCategory();
        //实施阶段有两个值放在sql处理
        if (ProjectCategoryEnum.RESERVE.getType().equals(projectCategory)) {
            query.setProjectStatus(ProjectCategoryEnum.RESERVE.getStatus());
            query.setReserveOrPrevious(ProjectCategoryEnum.RESERVE.getCode());
        } else if (ProjectCategoryEnum.PREVIOUS.getType().equals(projectCategory)) {
            query.setProjectStatus(ProjectCategoryEnum.PREVIOUS.getStatus());
            query.setReserveOrPrevious(ProjectCategoryEnum.PREVIOUS.getCode());
        } else if (ProjectCategoryEnum.FINISH.getType().equals(projectCategory)) {
        }  else if (ProjectCategoryEnum.FINISH.getType().equals(projectCategory)) {
            query.setProjectStatus(ProjectCategoryEnum.FINISH.getStatus());
        } else if (ProjectCategoryEnum.EXCEPTION.getType().equals(projectCategory)) {
            //TODO
@@ -165,10 +180,10 @@
        List<ProjectInfoVO> records = page.getRecords();
        List<ProjectVO> list = new ArrayList<>();
        records.forEach(vo -> {
                    ProjectInfoVO.transform(vo);
                    vo.setProjectColorCode("green");
            ProjectInfoVO.transform(vo);
            vo.setProjectColorCode("green");
            ProjectVO projectVO = new ProjectVO();
            copyToProjectVO(vo,projectVO);
            copyToProjectVO(vo, projectVO);
            //翻译项目阶段
            String phase = ProjectCategoryEnum.getPhaseByProjectStatus(projectVO.getProjectStatus(), projectVO.getProcessId() != null);
            projectVO.setProjectPhase(phase);
@@ -177,13 +192,17 @@
        return Result.ok().data(list).total(page.getTotal());
    }

    private void copyToProjectVO(ProjectInfoVO vo,ProjectVO projectVO) {
    private void copyToProjectVO(ProjectInfoVO vo, ProjectVO projectVO) {
        //忽略null值的复制
        CopyUtils.copyNoNullProperties(vo, projectVO);
        if(vo.getProjectInvestmentFunding()!=null) CopyUtils.copyNoNullProperties(vo.getProjectInvestmentFunding(),projectVO);
        if(vo.getProjectInvestmentInfo()!=null)  CopyUtils.copyNoNullProperties(vo.getProjectInvestmentInfo(),projectVO);
        if(vo.getProjectUnitRegistrationInfo()!=null)  CopyUtils.copyNoNullProperties(vo.getProjectUnitRegistrationInfo(),projectVO);
        if(vo.getProjectInvestmentPolicyCompliance()!=null)  CopyUtils.copyNoNullProperties(vo.getProjectInvestmentPolicyCompliance(),projectVO);
        if (vo.getProjectInvestmentInfo() != null)
            CopyUtils.copyNoNullProperties(vo.getProjectInvestmentInfo(), projectVO);
        if (vo.getProjectUnitRegistrationInfo() != null)
            CopyUtils.copyNoNullProperties(vo.getProjectUnitRegistrationInfo(), projectVO);
        if (vo.getProjectInvestmentPolicyCompliance() != null)
            CopyUtils.copyNoNullProperties(vo.getProjectInvestmentPolicyCompliance(), projectVO);
        if (vo.getProjectInvestmentFunding() != null)
            CopyUtils.copyNoNullProperties(vo.getProjectInvestmentFunding(), projectVO);
    }

    /**
@@ -229,18 +248,81 @@
        // {"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);
        List<ProjectVO> projectVOS = baseMapper.homeCount();
        List<ProjectVO> reserve = new ArrayList<>();
        List<ProjectVO> previous = new ArrayList<>();
        List<ProjectVO> implement = new ArrayList<>();
        List<ProjectVO> finish = new ArrayList<>();
        List<ProjectVO> normal = new ArrayList<>();
        List<ProjectVO> province = new ArrayList<>();
        List<ProjectVO> city = new ArrayList<>();
        List<ProjectVO> county = new ArrayList<>();
        projectVOS.forEach(item -> {
            if (ProjectCategoryEnum.RESERVE.getDesc().equals(ProjectCategoryEnum.getPhaseByProjectStatus(item.getProjectStatus(), item.getProcessId() != null))) {
                reserve.add(item);
            } else if (ProjectCategoryEnum.PREVIOUS.getDesc().equals(ProjectCategoryEnum.getPhaseByProjectStatus(item.getProjectStatus(), item.getProcessId() != null))) {
                previous.add(item);
            } else if (ProjectCategoryEnum.IMPLEMENT.getDesc().equals(ProjectCategoryEnum.getPhaseByProjectStatus(item.getProjectStatus(), item.getProcessId() != null))) {
                implement.add(item);
            } else if (ProjectCategoryEnum.FINISH.getDesc().equals(ProjectCategoryEnum.getPhaseByProjectStatus(item.getProjectStatus(), item.getProcessId() != null))) {
                finish.add(item);
            }

            if (ImportanceTypeEnum.PROVINCIAL_KEY.getType().equals(item.getImportanceType())) {
                province.add(item);
            } else if (ImportanceTypeEnum.SUINING_KEY.getType().equals(item.getImportanceType())) {
                city.add(item);
            } else if (ImportanceTypeEnum.SHEHONG_KEY.getType().equals(item.getImportanceType())) {
                county.add(item);
            } else if (ImportanceTypeEnum.NORMAL.getType().equals(item.getImportanceType())) {
                normal.add(item);
            }
        });
        //单位先默认为元
        proPhaseCountVO.add(new IndexProPhaseCountVO("储备规划阶段", reserve.size(), reserve.stream().
                filter(item -> !StringUtils.isEmpty(item.getTotalInvestment()))
                .map(item -> new BigDecimal(item.getTotalInvestment()).setScale(2, RoundingMode.HALF_UP))
                .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("100000000"), 2, RoundingMode.HALF_UP).toString(), "储"));

        proPhaseCountVO.add(new IndexProPhaseCountVO("项目前期阶段", previous.size(), previous.stream().
                filter(item -> !StringUtils.isEmpty(item.getTotalInvestment()))
                .map(item -> new BigDecimal(item.getTotalInvestment()).setScale(2, RoundingMode.HALF_UP))
                .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("100000000"), 2, RoundingMode.HALF_UP).toString(), "新"));

        proPhaseCountVO.add(new IndexProPhaseCountVO("实施阶段", implement.size(), implement.stream().
                filter(item -> !StringUtils.isEmpty(item.getTotalInvestment()))
                .map(item -> new BigDecimal(item.getTotalInvestment()).setScale(2, RoundingMode.HALF_UP))
                .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("100000000"), 2, RoundingMode.HALF_UP).toString(), "建"));

        proPhaseCountVO.add(new IndexProPhaseCountVO("竣工投用阶段", finish.size(), finish.stream().
                filter(item -> !StringUtils.isEmpty(item.getTotalInvestment()))
                .map(item -> new BigDecimal(item.getTotalInvestment()).setScale(2, RoundingMode.HALF_UP))
                .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("100000000"), 2, RoundingMode.HALF_UP).toString(), "竣"));

        indexCountVO.setProPhaseCountVO(proPhaseCountVO);

        List<IndexImpTypeCountVO> impTypeCountVO = new ArrayList<>();
        impTypeCountVO.add(new IndexImpTypeCountVO("一般项目", province.size(), province.stream().
                filter(item -> !StringUtils.isEmpty(item.getTotalInvestment()))
                .map(item -> new BigDecimal(item.getTotalInvestment()).setScale(2, RoundingMode.HALF_UP))
                .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("100000000"), 2, RoundingMode.HALF_UP).toString(), "普"));

        impTypeCountVO.add(new IndexImpTypeCountVO("县重点项目", city.size(), city.stream().
                filter(item -> !StringUtils.isEmpty(item.getTotalInvestment()))
                .map(item -> new BigDecimal(item.getTotalInvestment()).setScale(2, RoundingMode.HALF_UP))
                .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("100000000"), 2, RoundingMode.HALF_UP).toString(), "县"));

        impTypeCountVO.add(new IndexImpTypeCountVO("市重点项目", county.size(), county.stream().
                filter(item -> !StringUtils.isEmpty(item.getTotalInvestment()))
                .map(item -> new BigDecimal(item.getTotalInvestment()).setScale(2, RoundingMode.HALF_UP))
                .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("100000000"), 2, RoundingMode.HALF_UP).toString(), "市"));

        impTypeCountVO.add(new IndexImpTypeCountVO("省重点项目", normal.size(), normal.stream().
                filter(item -> !StringUtils.isEmpty(item.getTotalInvestment()))
                .map(item -> new BigDecimal(item.getTotalInvestment()).setScale(2, RoundingMode.HALF_UP))
                .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("100000000"), 2, RoundingMode.HALF_UP).toString(), "省"));
        indexCountVO.setImpTypeCountVO(impTypeCountVO);


        return indexCountVO;
    }

 business/src/main/resources/mapper/ProjectInfoMapper.xml

@@ -149,8 +149,18 @@
            <if test="query.reserveOrPrevious != null and query.reserveOrPrevious == 'previous'">
                and TPP.process_instance_id is not null
            </if>
            <if test="query.projectCategory == 3">
                and (TPI.project_status = 'working' or TPI.project_status = 'stop')
            </if>
        </where>
        order by TPI.gmt_create
    </select>

    <select id="homeCount" resultType="com.ycl.domain.vo.ProjectVO">
        SELECT TPI.*,TPIF.total_investment,TPP.process_instance_id as processId
        FROM t_project_info TPI
        LEFT JOIN t_project_investment_funding TPIF ON TPI.id = TPIF.project_id and TPIF.deleted = 0
        LEFT JOIN t_project_process TPP ON TPI.id = TPP.project_id and TPP.deleted = 0
        WHERE TPI.deleted = 0
</select>
</mapper>

 common/src/main/java/com/ycl/common/enums/business/ImportanceTypeEnum.java

New file
@@ -0,0 +1,31 @@
package com.ycl.common.enums.business;

import com.baomidou.mybatisplus.annotation.EnumValue;
import com.fasterxml.jackson.annotation.JsonValue;
import lombok.Getter;

/**
 * 重点类型枚举
 *
 * @author：flq
 * @date：2024/11/27 18:21
 */
@Getter
public enum ImportanceTypeEnum {
    PROVINCIAL_KEY("provincial_key", "省重点"),
    SUINING_KEY("suining_key","遂宁市重点"),
    //县重点
    SHEHONG_KEY("shehong_key","射洪市重点"),
    NORMAL("normal", "一般");

    @EnumValue // 标明该字段存入数据库
    private final String type;

    @JsonValue // 标明在转JSON时使用该字段
    private final String desc;

    ImportanceTypeEnum(String type, String desc) {
        this.type = type;
        this.desc = desc;
    }
}