From 03fb81596f6926c3cdb8321d984a9cbda48da091 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Fri, 15 Nov 2024 19:12:50 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gzgqj/business/app/entity/PartApplyDetailAppVo.java      | 2 ++
 src/main/resources/mappers/bases/StatisticsMapper.xml        | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/bonus/gzgqj/business/app/entity/PartApplyDetailAppVo.java b/src/main/java/com/bonus/gzgqj/business/app/entity/PartApplyDetailAppVo.java
index a785349..248e15b 100644
--- a/src/main/java/com/bonus/gzgqj/business/app/entity/PartApplyDetailAppVo.java
+++ b/src/main/java/com/bonus/gzgqj/business/app/entity/PartApplyDetailAppVo.java
@@ -65,4 +65,6 @@ public class PartApplyDetailAppVo {
     @Excel(name = "备注", width = 10.0, orderNum = "9")
     private String remark;
 
+    private String proId;
+
 }
diff --git a/src/main/resources/mappers/bases/StatisticsMapper.xml b/src/main/resources/mappers/bases/StatisticsMapper.xml
index 070eea6..1d487af 100644
--- a/src/main/resources/mappers/bases/StatisticsMapper.xml
+++ b/src/main/resources/mappers/bases/StatisticsMapper.xml
@@ -89,10 +89,11 @@
 	<select id="getProDetailsFilePage" resultType="com.bonus.gzgqj.business.plan.entity.FileUploadVo">
 		select file.id, file.file_name fileName,
 			   file.file_url fileUrl,   file.create_time createTime,file.creator creator, file.model_table,
-			   file.own_id  ownId , file.suffix,file.type,  file.file_type fileType,file.create_name  createName
+			   file.own_id  ownId , file.suffix,file.type,  file.file_type fileType,file.create_name  createName,
+			   tpa.remark
 		FROM t_part_apply tpa
 				 left join bm_file_upload file  on tpa.id=file.own_id and file.model_table='t_part_apply'
-		where tpa.`status`=4 and file.id is not null amd   tpa.pro_id=#{proId}
+		where tpa.`status`=4 and file.id is not null  and   tpa.pro_id=#{proId}
 	</select>
 	<select id="getProDetails" resultType="com.bonus.gzgqj.business.bases.entity.ProjectInfoVo">
 		SELECT pro.id proId,pro.name  proName,tpa.lyNum lyNum,tpa.lydNum,mm.money lyMoney