报价结构化

This commit is contained in:
yss
2023-11-23 14:32:29 +08:00
parent 6ceedb1824
commit ea1bc72b8a

View File

@ -13,6 +13,7 @@ import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum;
import com.chinaunicom.mall.ebtp.common.util.JsonUtils;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.mall.ebtp.project.common.ProjectCommonUtil;
import com.chinaunicom.mall.ebtp.project.common.ProjectExceptionEnum;
@ -22,6 +23,9 @@ import com.chinaunicom.mall.ebtp.project.dictchooseprocess.entity.DictChooseProc
import com.chinaunicom.mall.ebtp.project.dictchooseprocess.service.IDictChooseProcessService;
import com.chinaunicom.mall.ebtp.project.feign.*;
import com.chinaunicom.mall.ebtp.project.feign.entity.*;
import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ProjectEntrustExpand;
import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ProjectEntrustVO;
import com.chinaunicom.mall.ebtp.project.projectentrust.service.IProjectEntrustExpandService;
import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecord;
import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecordVO;
import com.chinaunicom.mall.ebtp.project.projectrecord.service.IProjectRecordService;
@ -31,6 +35,9 @@ import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSectionFlo
import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSectionVO;
import com.chinaunicom.mall.ebtp.project.projectsection.service.IProjectSectionFlowService;
import com.chinaunicom.mall.ebtp.project.projectsection.service.IProjectSectionService;
import com.chinaunicom.mall.ebtp.project.sectionmaterial.entity.SectionMaterial;
import com.chinaunicom.mall.ebtp.project.sectionmaterial.entity.SectionMaterialVO;
import com.chinaunicom.mall.ebtp.project.sectionmaterial.service.ISectionMaterialService;
import io.seata.core.context.RootContext;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@ -42,6 +49,8 @@ import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
import static java.util.stream.Collectors.groupingBy;
/**
* 对数据表 biz_project_section 操作的 serviceImpl
* @author daixc
@ -82,6 +91,12 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl<ProjectSectionMap
@Resource
private IDictProjectService dictProjectService;
@Resource
private IProjectEntrustExpandService entrustExpandService;
@Resource
private ISectionMaterialService materialService;
/**
* 默认轮次
*/
@ -146,6 +161,14 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl<ProjectSectionMap
//查询
IPage<ProjectSection> result = new Page<>(projectSectionVO.getBasePageRequest().getPageNo(), projectSectionVO.getBasePageRequest().getPageSize());
result = this.page(result, query);
if (!result.getRecords().isEmpty()&&StringUtils.isNotBlank(projectSectionVO.getProjectId())) {
LambdaQueryWrapper<SectionMaterial> materialQuery=Wrappers.lambdaQuery();
List<SectionMaterial> sectionMaterialList=materialService.list(materialQuery.eq(SectionMaterial::getProjectId,projectSectionVO.getProjectId()));
if(sectionMaterialList!=null){
Map<String,List<SectionMaterial>> sectionMaterialMap=sectionMaterialList.stream().collect(groupingBy(SectionMaterial::getSectionId));
result.convert(c -> c.setMaterialList(sectionMaterialMap.get(c.getId())));
}
}
return result;
}