diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectInfo.java index 6086189f..2adbf00a 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectInfo.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectInfo.java @@ -107,6 +107,7 @@ public class ProjectInfo extends BaseEntity /** 竞争对手 */ @Excel(name = "竞争对手") private String competitor; + private List competitorList; /** 是否国产 */ @Excel(name = "是否国产") diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java index 0b45e754..6c76468d 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java @@ -63,6 +63,9 @@ public class ProjectInfoServiceImpl implements IProjectInfoService { @Override public ProjectInfo selectProjectInfoById(Long id) { ProjectInfo projectInfo = projectInfoMapper.selectProjectInfoById(id); + if (StringUtils.isNotEmpty(projectInfo.getCompetitor())) { + projectInfo.setCompetitorList(Stream.of(projectInfo.getCompetitor().split(",")).collect(Collectors.toList())); + } //查询产品信息 List projectProductInfos = productInfoService.selectProjectProductInfoListByProjectId(projectInfo.getId()); projectInfo.setProjectProductInfoList(projectProductInfos); @@ -120,6 +123,9 @@ public class ProjectInfoServiceImpl implements IProjectInfoService { projectInfo.setCreateTime(DateUtils.getNowDate()); projectInfo.setUpdateTime(DateUtils.getNowDate()); projectInfo.setCreateBy(ShiroUtils.getUserId().toString()); + if (CollUtil.isNotEmpty(projectInfo.getCompetitorList())) { + projectInfo.setCompetitor(CollUtil.join(projectInfo.getCompetitorList(), ",")); + } int i = projectInfoMapper.insertProjectInfo(projectInfo); saveOtherInfo(projectInfo); return i;