From b84301ea2845e6eebd074780537f769128d2d8fa Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 27 Nov 2025 14:24:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=9B=E6=A0=87=E8=A7=A3=E6=9E=90=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/web/service/analysis/AnalysisService.java    |  6 ++++--
 .../src/main/resources/mapper/AnalysisMapper.xml       | 10 +++++++---
 .../bonus/common/domain/analysis/dto/AnalysisDto.java  |  5 +++++
 .../common/domain/analysis/dto/AnalysisProDto.java     |  2 +-
 .../common/domain/analysis/po/ProComposition.java      |  3 +++
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/bonus-admin/src/main/java/com/bonus/web/service/analysis/AnalysisService.java b/bonus-admin/src/main/java/com/bonus/web/service/analysis/AnalysisService.java
index 97854e5..e1e9a67 100644
--- a/bonus-admin/src/main/java/com/bonus/web/service/analysis/AnalysisService.java
+++ b/bonus-admin/src/main/java/com/bonus/web/service/analysis/AnalysisService.java
@@ -145,7 +145,7 @@ public class AnalysisService {
             List<ProComposition> compositions = new ArrayList<>();
 
             for (String uploadType : dto.getUploadType()) {
-                ProComposition vo = createVo(dto.getProId(), uploadType);
+                ProComposition vo = createVo(dto.getProId(), uploadType,"1");
                 compositions.add(vo);
             }
             // 保存项目的文件组成数据
@@ -169,10 +169,11 @@ public class AnalysisService {
         }
     }
 
-    public ProComposition createVo(Long proId,String value){
+    public ProComposition createVo(Long proId,String value,String compositionType){
         ProComposition proComposition = new ProComposition();
         proComposition.setProId(proId);
         proComposition.setCompositionFileName(value);
+        proComposition.setCompositionType(compositionType);
         return proComposition;
     }
 
@@ -213,6 +214,7 @@ public class AnalysisService {
         // 查询类型为2时查询文件
         if(dto.getQueryType() == 2){
             // 查询项目组成文件
+            dto.setCompositionType("1");
             List<ProComposition> compositions = analysisService.getProComposition(dto);
             // 查询招标文件
             // 3.查询项目关联资源文件
diff --git a/bonus-analysis/src/main/resources/mapper/AnalysisMapper.xml b/bonus-analysis/src/main/resources/mapper/AnalysisMapper.xml
index cfc6f11..57ed4ab 100644
--- a/bonus-analysis/src/main/resources/mapper/AnalysisMapper.xml
+++ b/bonus-analysis/src/main/resources/mapper/AnalysisMapper.xml
@@ -56,6 +56,9 @@
         parsing_state AS parsingState
         FROM tb_pro_bid
         WHERE pro_id = #{proId} AND del_flag = '0'
+        <if test="bidId!=null">
+            AND bid_id = #{bidId}
+        </if>
         <if test="markName!=null and markName!=''">
             AND INSTR(mark_name , #{markName}) > 0
         </if>
@@ -99,11 +102,12 @@
 
     <!--保存项目的文件组成-->
     <insert id="addProCompositionData" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        INSERT INTO tb_pro_composition (pro_id, composition_file_name) VALUES
+        INSERT INTO tb_pro_composition (pro_id, composition_file_name,composition_type) VALUES
         <foreach collection="list" separator="," item="item">
             (
                 #{item.proId},
-                #{item.compositionFileName}
+                #{item.compositionFileName},
+                #{item.compositionType}
             )
         </foreach>
     </insert>
@@ -112,6 +116,6 @@
     <select id="getProComposition" resultType="com.bonus.common.domain.analysis.po.ProComposition">
         SELECT id,
         composition_file_name AS compositionFileName
-        FROM tb_pro_composition WHERE pro_id = #{proId}
+        FROM tb_pro_composition WHERE pro_id = #{proId} AND composition_type = #{compositionType}
     </select>
 </mapper>
diff --git a/bonus-common/src/main/java/com/bonus/common/domain/analysis/dto/AnalysisDto.java b/bonus-common/src/main/java/com/bonus/common/domain/analysis/dto/AnalysisDto.java
index d257fdc..af4b570 100644
--- a/bonus-common/src/main/java/com/bonus/common/domain/analysis/dto/AnalysisDto.java
+++ b/bonus-common/src/main/java/com/bonus/common/domain/analysis/dto/AnalysisDto.java
@@ -25,6 +25,8 @@ public class AnalysisDto {
 
     /*项目id*/
     private Long proId;
+    /**标段id*/
+    private Long bidId;
     /**标的名称*/
     private String markName;
     /**标段名称*/
@@ -59,6 +61,9 @@ public class AnalysisDto {
         /**类型为2时查询文件组成*/
         private int queryType;
 
+        /**模板组成类型 1.项目文件 2.标段/标包文件*/
+        private String compositionType;
+
         /**
          * 创建人
          */
diff --git a/bonus-common/src/main/java/com/bonus/common/domain/analysis/dto/AnalysisProDto.java b/bonus-common/src/main/java/com/bonus/common/domain/analysis/dto/AnalysisProDto.java
index 9b4168b..9eb55b8 100644
--- a/bonus-common/src/main/java/com/bonus/common/domain/analysis/dto/AnalysisProDto.java
+++ b/bonus-common/src/main/java/com/bonus/common/domain/analysis/dto/AnalysisProDto.java
@@ -78,7 +78,7 @@ public class AnalysisProDto {
      * 开标方式
      */
     @NotBlank(message = "开标方式不能为空", groups = {UPDATE.class})
-    @Length(max = 32, message = "开标方式字符长度不能超过32", groups = {UPDATE.class})
+    @Length(max = 128, message = "开标方式字符长度不能超过128", groups = {UPDATE.class})
     private String bidOpeningMethod;
 
     /**
diff --git a/bonus-common/src/main/java/com/bonus/common/domain/analysis/po/ProComposition.java b/bonus-common/src/main/java/com/bonus/common/domain/analysis/po/ProComposition.java
index 4ca1561..b00fb2f 100644
--- a/bonus-common/src/main/java/com/bonus/common/domain/analysis/po/ProComposition.java
+++ b/bonus-common/src/main/java/com/bonus/common/domain/analysis/po/ProComposition.java
@@ -24,6 +24,9 @@ public class ProComposition {
     /**文件组成名称*/
     private String compositionFileName;
 
+    /**模板组成类型 1.项目文件 2.标段/标包文件*/
+    private String compositionType;
+
     /**文件*/
     List<ResourceFileVo> fileVoList;
 }