Bladeren bron

fix: 基金模块bug修复,涉及频率和搜索

chenjianhua 7 maanden geleden
bovenliggende
commit
c53c024e03

+ 1 - 1
service-base/src/main/java/com/simuwang/base/pojo/dos/FundReportFrequencyDO.java

@@ -41,7 +41,7 @@ public class FundReportFrequencyDO {
      * 频率备注
      */
     @TableField(value = "frequency_remark")
-    private Integer frequencyRemark;
+    private String frequencyRemark;
     /**
      * 创建者Id
      */

+ 1 - 1
service-base/src/main/java/com/simuwang/base/pojo/vo/FundReportFrequencyVO.java

@@ -30,5 +30,5 @@ public class FundReportFrequencyVO {
     /**
      * 频率备注
      */
-    private Integer frequencyRemark;
+    private String frequencyRemark;
 }

+ 2 - 2
service-base/src/main/resources/mapper/CompanyEmailHistoryMapper.xml

@@ -47,7 +47,7 @@
         ON cesh.email = maxce.email
         WHERE cec.isvalid = 1 and c.isvalid=1
         <if test="companyName != null and companyName !=''">
-            and (c.company_name like concat('%',#{companyName},'%') or c.company_short_name like concat('%',#{companyName},'%'))
+            and (c.company_name like concat('%',#{companyName},'%') or c.company_short_name like concat('%',#{companyName},'%') or c.register_number like concat('%',#{companyName},'%'))
         </if>
         <if test="email != null and email !=''">
             and cec.email like concat('%',#{email},'%')
@@ -74,7 +74,7 @@
         ON cesh.email = maxce.email
         WHERE cec.isvalid = 1 and c.isvalid=1
         <if test="companyName != null and companyName !=''">
-            and (c.company_name like concat('%',#{companyName},'%') or c.company_short_name like concat('%',#{companyName},'%'))
+            and (c.company_name like concat('%',#{companyName},'%') or c.company_short_name like concat('%',#{companyName},'%') or c.register_number like concat('%',#{companyName},'%'))
         </if>
         <if test="email != null and email !=''">
             and cec.email like concat('%',#{email},'%')

+ 2 - 2
service-base/src/main/resources/mapper/FundInfoMapper.xml

@@ -65,7 +65,7 @@
             and r.nav_frequency = #{navFrequency}
         </if>
         <if test="assetFrequency != null and assetFrequency !=''">
-            and r.asset_Frequency = #{navFrequency}
+            and r.asset_Frequency = #{assetFrequency}
         </if>
         <if test="startDate != null and startDate !=''">
             and f.inception_date <![CDATA[ >= ]]> #{startDate}
@@ -133,7 +133,7 @@
             and r.nav_frequency = #{navFrequency}
         </if>
         <if test="assetFrequency != null and assetFrequency !=''">
-            and r.asset_Frequency = #{navFrequency}
+            and r.asset_Frequency = #{assetFrequency}
         </if>
         <if test="startDate != null and startDate !=''">
             and f.inception_date <![CDATA[ >= ]]> #{startDate}