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 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" and t1.project_stage = #{projectStage} and t1.project_grasp_degree = #{projectGraspDegree} and t1.hz_support_user = #{hzSupportUser} - t3.user_name like concat('%', #{hzSupportUserName}, '%') + and t3.user_name like concat('%', #{hzSupportUserName}, '%') and t1.operate_institution = #{operateInstitution} and t1.partner_code = #{partnerCode} and t1.partner_name = #{partnerName}