mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.unissense.tech/mula/unis_sip

master
wangjiuyun 2025-06-05 10:31:56 +08:00
parent c270bcad17 d09d970983
commit 5a0eca0ff6
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectInfo.java
View File

@ -107,6 +107,7 @@ public class ProjectInfo extends BaseEntity
/** 竞争对手 */ /** 竞争对手 */
@Excel(name = "竞争对手") @Excel(name = "竞争对手")
private String competitor; private String competitor;
private List<String> competitorList;
/** 是否国产 */ /** 是否国产 */
@Excel(name = "是否国产") @Excel(name = "是否国产")

6
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java
View File

@ -63,6 +63,9 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
@Override @Override
public ProjectInfo selectProjectInfoById(Long id) { public ProjectInfo selectProjectInfoById(Long id) {
ProjectInfo projectInfo = projectInfoMapper.selectProjectInfoById(id); ProjectInfo projectInfo = projectInfoMapper.selectProjectInfoById(id);
if (StringUtils.isNotEmpty(projectInfo.getCompetitor())) {
projectInfo.setCompetitorList(Stream.of(projectInfo.getCompetitor().split(",")).collect(Collectors.toList()));
}
//查询产品信息 //查询产品信息
List<ProjectProductInfo> projectProductInfos = productInfoService.selectProjectProductInfoListByProjectId(projectInfo.getId()); List<ProjectProductInfo> projectProductInfos = productInfoService.selectProjectProductInfoListByProjectId(projectInfo.getId());
projectInfo.setProjectProductInfoList(projectProductInfos); projectInfo.setProjectProductInfoList(projectProductInfos);
@ -120,6 +123,9 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
projectInfo.setCreateTime(DateUtils.getNowDate()); projectInfo.setCreateTime(DateUtils.getNowDate());
projectInfo.setUpdateTime(DateUtils.getNowDate()); projectInfo.setUpdateTime(DateUtils.getNowDate());
projectInfo.setCreateBy(ShiroUtils.getUserId().toString()); projectInfo.setCreateBy(ShiroUtils.getUserId().toString());
if (CollUtil.isNotEmpty(projectInfo.getCompetitorList())) {
projectInfo.setCompetitor(CollUtil.join(projectInfo.getCompetitorList(), ","));
}
int i = projectInfoMapper.insertProjectInfo(projectInfo); int i = projectInfoMapper.insertProjectInfo(projectInfo);
saveOtherInfo(projectInfo); saveOtherInfo(projectInfo);
return i; return i;