feat(info): 支持获取并返回下级项目信息

buhuazhen

4 天以前 24820701b09281e03edf2e22db62edab7f4da53b

feat(info): 支持获取并返回下级项目信息

- 在 InfoHandleService 中新增 getSubordinateInfo 方法，用于查询子项目信息
- 在 InfoHandleService 中新增 convert 方法，统一实体到 DTO 的转换过程
- 修改 InfoServiceImpl，异步获取下级项目信息并设置到 InfoVo 中
- 在 InfoVo 中添加 subordinateInfoList 字段以存储下级项目信息列表
- 优化代码格式，统一空格和花括号位置，提升代码可读性

 src/main/java/com/ruoyi/projectManagement/service/impl/InfoServiceImpl.java

@@ -105,6 +105,9 @@
        CompletableFuture<ShippingAddressDto> shippingFuture = CompletableFuture.supplyAsync(() -> shippingAddressHandleService.getByInfoId(id));
        CompletableFuture<List<SalesLedgerProduct>> listCompletableFuture = CompletableFuture.supplyAsync(() -> salesLedgerService.getSalesLedgerProductListByRelateId(id,SaleEnum.MANAGEMENT));

        // 下级项目信息
        CompletableFuture<List<SaveInfoDto>> subordinateInfoListFuture = CompletableFuture.supplyAsync(() -> infoHandleService.getSubordinateInfo(id));

        // 商品

        // 等待所有异步完成
@@ -114,13 +117,13 @@
        ContractInfoDto contract = contractFuture.get();
        ShippingAddressDto shippingAddress = shippingFuture.get();
        List<SalesLedgerProduct> salesLedgerProductList = listCompletableFuture.get();

        List<SaveInfoDto> saveInfoDtos = subordinateInfoListFuture.get();
        InfoVo vo = new InfoVo();
        vo.setInfo(info);
        vo.setContractInfo(contract);
        vo.setShippingAddress(shippingAddress);
        vo.setSalesLedgerProductList(salesLedgerProductList);

        vo.setSubordinateInfoList(saveInfoDtos);
        return vo;
    }


 src/main/java/com/ruoyi/projectManagement/service/impl/handle/InfoHandleService.java

@@ -8,15 +8,12 @@
import com.ruoyi.basic.service.CustomerFollowUpFileService;
import com.ruoyi.common.enums.PlanStageEnum;
import com.ruoyi.common.enums.ReviewStatusEnum;
import com.ruoyi.common.utils.EnumUtil;
import com.ruoyi.projectManagement.dto.PlanStageDto;
import com.ruoyi.projectManagement.dto.SaveInfoDto;
import com.ruoyi.projectManagement.mapper.InfoMapper;
import com.ruoyi.projectManagement.pojo.Info;
import com.ruoyi.projectManagement.pojo.PlanNode;
import com.ruoyi.projectManagement.service.PlanService;
import com.ruoyi.projectManagement.service.impl.PlanServiceImpl;
import com.ruoyi.projectManagement.vo.PlanVo;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -34,7 +31,7 @@
 */
@Component
@RequiredArgsConstructor
@Transactional(rollbackFor = Exception.class,readOnly = true)
@Transactional(rollbackFor = Exception.class, readOnly = true)
public class InfoHandleService {

    private static final String GENERATE_SERIAL_NUMBER_PREFIX = "XM";
@@ -46,7 +43,7 @@
    private final CustomerFollowUpFileService customerFollowUpFileService;

    @Transactional(rollbackFor = Exception.class)
    public Long save(@NotNull SaveInfoDto saveInfoDto){
    public Long save(@NotNull SaveInfoDto saveInfoDto) {
        Info info = BeanUtil.copyProperties(saveInfoDto, Info.class);

        // 附件特殊处理
@@ -54,41 +51,61 @@
        info.setAttachment(attachmentIds);

        // 生成序号 (如果需要自动生成的话)
        if(StrUtil.isBlank(info.getNo())){
        if (StrUtil.isBlank(info.getNo())) {
            info.setNo(generateSerialNumber());
        }
        info.setTeam(saveInfoDto.getTeamList());
        if(info.getId() == null){
        if (info.getId() == null) {
            // 生成对应的阶段关系数据
            info.setPlanStage(getPlanStageList(info.getProjectManagementPlanId()));
            // 插入默认状态
            info.setStatus(PlanStageEnum.TO_BEGIN.getCode());
            info.setReviewStatus(ReviewStatusEnum.PENDING_REVIEW.getCode());
            infoMapper.insert(info);
        }else {
        } else {
            infoMapper.updateById(info);
        }
        return info.getId();
    }

    public SaveInfoDto getInfoById(@NotNull Long id){
    public SaveInfoDto getInfoById(@NotNull Long id) {
        Info info = infoMapper.selectById(id);
        return convert(info);
    }

    private SaveInfoDto convert(Info info) {
        SaveInfoDto saveInfoDto = BeanUtil.copyProperties(info, SaveInfoDto.class);
        // 附件处理
        saveInfoDto.setTeamList(info.getTeam());
        customerFollowUpFileService.fillAttachment(Lists.newArrayList(saveInfoDto), SaveInfoDto::getAttachment, SaveInfoDto::setAttachmentList);
        return saveInfoDto;

    }

    /**
     * 获取改id下子项目信息
     *
     * @param id
     * @return
     */
    public List<SaveInfoDto> getSubordinateInfo(@NotNull Long id) {
        LambdaQueryWrapper<Info> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(Info::getProjectManagementInfoParentId, id);
        queryWrapper.orderByAsc(Info::getCreateTime);
        List<Info> infoList = infoMapper.selectList(queryWrapper);
        return infoList.stream().map(this::convert).collect(Collectors.toList());
    }


    private List<PlanStageDto> getPlanStageList(@NotNull Long planId) {
        List<PlanNode> planNodeByPlanId = planService.getPlanNodeByPlanId(planId);
        return planNodeByPlanId.stream().map(it-> new PlanStageDto(it.getId(), it.getName(), PlanStageEnum.TO_BEGIN)).collect(Collectors.toList());
        return planNodeByPlanId.stream().map(it -> new PlanStageDto(it.getId(), it.getName(), PlanStageEnum.TO_BEGIN)).collect(Collectors.toList());
    }


    /**
     * 生成项目编号
     *
     * @return
     */
    private String generateSerialNumber() {

 src/main/java/com/ruoyi/projectManagement/vo/InfoVo.java

@@ -1,11 +1,13 @@
package com.ruoyi.projectManagement.vo;

import com.ruoyi.projectManagement.dto.SaveInfoDto;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;

import java.io.Serializable;
import java.util.List;

/**
 * @author buhuazhen
@@ -21,4 +23,7 @@

    // 项目阶段
    private String xxx;

    // 下级项目
    private List<SaveInfoDto> subordinateInfoList;
}