Merge remote-tracking branch 'origin/master'

luohairen

2024-11-29 40d262e091d43b15c082260b7279daf4e89b2799

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

@@ -1,10 +1,14 @@
package com.ycl.service.impl;

import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.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;
@@ -39,6 +43,7 @@
    private final ProjectInfoMapper projectInfoMapper;
    private final FileService fileService;
    private final FileMapper fileMapper;

    /**
     * 添加
     *
@@ -83,6 +88,7 @@
        baseMapper.updateById(entity);
        List<File> fileList = form.getFileList();
        fileList.forEach(item->{
            item.setId(null);
            item.setBusId(entity.getId());
            item.setType(FileTypeEnum.PROJECT_INFO);
        });
@@ -130,17 +136,54 @@
     */
    @Override
    public Result page(ProjectInfoQuery query) {
        IPage<ProjectInfo> page = PageUtil.getPage(query, ProjectInfo.class);
        if (query.getProjectStartTime() != null) {
            query.setProjectStartTime(DateUtils.getDayStart(query.getProjectStartTime()));
        }
        if (query.getProjectEndTime() != null) {
            query.setProjectEndTime(DateUtils.getDayEnd(query.getProjectEndTime()));
        }
        String projectCategory = query.getProjectCategory();
        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)) {
            query.setProjectStatus(ProjectCategoryEnum.FINISH.getStatus());
        } else if (ProjectCategoryEnum.EXCEPTION.getType().equals(projectCategory)) {
            //TODO
            //先查出异常流程或者异常进度或者异常计划的projectId和异常种类
            //通过projectId查出项目数据
            //补充相应的异常数据（异常种类、异常流程节点等）
            List<ProjectVO> list = new ArrayList<>();
            return Result.ok().data(list).total(0);
        }

        IPage<ProjectInfoVO> page = PageUtil.getPage(query, ProjectInfoVO.class);
        baseMapper.getPage(page, query);
        List<ProjectInfo> records = page.getRecords();
        List<ProjectInfoVO> list = records.stream()
                .map(entity -> {
                    ProjectInfoVO vo = ProjectInfoVO.getVoByEntity(entity, null);
        List<ProjectInfoVO> records = page.getRecords();
        List<ProjectVO> list = new ArrayList<>();
        records.forEach(vo -> {
                    ProjectInfoVO.transform(vo);
                    vo.setProjectColorCode("green");
                    return vo;
                })
                .collect(Collectors.toList());
            ProjectVO projectVO = new ProjectVO();
            copyToProjectVO(vo,projectVO);
            //翻译项目阶段
            String phase = ProjectCategoryEnum.getPhaseByProjectStatus(projectVO.getProjectStatus(), projectVO.getProcessId() != null);
            projectVO.setProjectPhase(phase);
            list.add(projectVO);
        });
        return Result.ok().data(list).total(page.getTotal());
    }

    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);
    }

    /**
@@ -224,6 +267,7 @@
    public Result addDoc(DocumentInfoForm form) {
        List<File> fileList = form.getFileList();
        fileList.forEach(item->{
            item.setId(null);
            item.setBusId(form.getProjectId());
            item.setType(FileTypeEnum.DOCUMENT_INFO);
        });