From d09d970983a2112da3d590c81ae4c28770094010 Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Wed, 4 Jun 2025 17:47:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(sip):=20=E5=A2=9E=E5=8A=A0=E7=AB=9E?=
 =?UTF-8?q?=E4=BA=89=E5=AF=B9=E6=89=8B=E5=88=97=E8=A1=A8=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E5=B9=B6=E5=AE=9E=E7=8E=B0=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?-=20=E5=9C=A8=20ProjectInfo=20=E7=B1=BB=E4=B8=AD=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=20competitorList=20=E5=B1=9E=E6=80=A7=EF=BC=8C?=
 =?UTF-8?q?=E7=94=A8=E4=BA=8E=E5=AD=98=E5=82=A8=E7=AB=9E=E4=BA=89=E5=AF=B9?=
 =?UTF-8?q?=E6=89=8B=E5=88=97=E8=A1=A8=20-=20=E5=9C=A8=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF=E6=97=B6=EF=BC=8C=E5=B0=86?=
 =?UTF-8?q?=E7=AB=9E=E4=BA=89=E5=AF=B9=E6=89=8B=E5=AD=97=E7=AC=A6=E4=B8=B2?=
 =?UTF-8?q?=E6=8B=86=E5=88=86=E6=88=90=E5=88=97=E8=A1=A8=20-=20=E5=9C=A8?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=B0=86=E7=AB=9E=E4=BA=89=E5=AF=B9=E6=89=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8B=BC=E6=8E=A5=E6=88=90=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/sip/domain/ProjectInfo.java     | 1 +
 .../com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java  | 6 ++++++
 2 files changed, 7 insertions(+)

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<String> 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<ProjectProductInfo> 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;