From 5a5a134b220e7452f260b89fec011b1937061c48 Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Mon, 9 Jun 2025 15:52:58 +0800
Subject: [PATCH] =?UTF-8?q?refactor(sip):=20=E4=BC=98=E5=8C=96=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E4=BF=A1=E6=81=AF=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 注释掉 ProjectInfo 类中的 currencyType 字段的 @Excel 注解
- 在 ProjectInfo 类中的 countryProduct 字段添加读取转换器
-修复 ProjectInfoMapper.xml 中的 SQL 语句
---
 ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectInfo.java | 4 ++--
 ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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 40cba03c..e5b03d58 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
@@ -89,7 +89,7 @@ public class ProjectInfo extends BaseEntity
     private BigDecimal estimatedAmount;
 
     /** 币种 */
-    @Excel(name = "币种")
+//    @Excel(name = "币种")
     private String currencyType;
 
     /** 预计下单时间 */
@@ -114,7 +114,7 @@ public class ProjectInfo extends BaseEntity
     private List<String> competitorList;
 
     /** 是否国产 */
-    @Excel(name = "是否国产")
+    @Excel(name = "是否国产",readConverterExp = "0=否,1=是")
     private String countryProduct;
 
     /** 服务器配置 */
diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml
index 3aa217e9..6e12324c 100644
--- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml
@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectStage != null  and projectStage != ''"> and t1.project_stage = #{projectStage}</if>
             <if test="projectGraspDegree != null  and projectGraspDegree != ''"> and t1.project_grasp_degree = #{projectGraspDegree}</if>
             <if test="hzSupportUser != null  and hzSupportUser != ''"> and t1.hz_support_user = #{hzSupportUser}</if>
-            <if test="hzSupportUserName != null  and hzSupportUserName != ''"> t3.user_name like concat('%', #{hzSupportUserName}, '%')</if>
+            <if test="hzSupportUserName != null  and hzSupportUserName != ''"> and t3.user_name like concat('%', #{hzSupportUserName}, '%')</if>
             <if test="operateInstitution != null  and operateInstitution != ''"> and t1.operate_institution = #{operateInstitution}</if>
             <if test="partnerCode != null  and partnerCode != ''"> and t1.partner_code = #{partnerCode}</if>
             <if test="partnerName != null  and partnerName != ''"> and t1.partner_name = #{partnerName}</if>