chenjianhua před 4 měsíci
rodič
revize
dfe098af94

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

@@ -71,7 +71,7 @@
         on asset.fund_id=info.fund_id and info.isvalid=1
         where asset.isvalid=1 and file.isvalid=1 and parse.isvalid=1
         <if test="fundName != null and fundName !=''">
-            and asset.fund_name like concat('%',#{fundName},'%')
+            and (asset.fund_name like concat('%',#{fundName},'%') or asset.register_number like concat('%',#{fundName},'%') )
         </if>
         <if test="priceStartDate != null and priceStartDate !=''">
             and asset.price_date >= #{priceStartDate}
@@ -136,7 +136,7 @@
         on asset.fund_id=info.fund_id and info.isvalid=1
         where asset.isvalid=1 and file.isvalid=1 and parse.isvalid=1
         <if test="fundName != null and fundName !=''">
-            and asset.fund_name like concat('%',#{fundName},'%')
+            and (asset.fund_name like concat('%',#{fundName},'%') or asset.register_number like concat('%',#{fundName},'%') )
         </if>
         <if test="priceStartDate != null and priceStartDate !=''">
             and asset.price_date >= #{priceStartDate}

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

@@ -75,7 +75,7 @@
                 on nav.fund_id=info.fund_id and info.isvalid=1
         WHERE nav.isvalid = 1  and file.isvalid=1 and parse.isvalid=1
         <if test="fundName != null and fundName !=''">
-            and nav.fund_name like concat('%',#{fundName},'%')
+            and (nav.fund_name like concat('%',#{fundName},'%') or nav.register_number like concat('%',#{fundName},'%'))
         </if>
         <if test="priceStartDate != null and priceStartDate !=''">
             and nav.price_date >= #{priceStartDate}
@@ -139,7 +139,7 @@
         on nav.fund_id=info.fund_id and info.isvalid=1
         WHERE nav.isvalid = 1  and file.isvalid=1 and parse.isvalid=1
         <if test="fundName != null and fundName !=''">
-            and nav.fund_name like concat('%',#{fundName},'%')
+            and (nav.fund_name like concat('%',#{fundName},'%') or nav.register_number like concat('%',#{fundName},'%'))
         </if>
         <if test="priceStartDate != null and priceStartDate !=''">
             and nav.price_date >= #{priceStartDate}

+ 1 - 0
service-base/src/main/resources/mapper/EmailTemplateMappingMapper.xml

@@ -68,6 +68,7 @@
         <if test="status != null">
             and mapping.status=#{status}
         </if>
+        order by mapping.updatetime desc
         limit #{offset},#{pageSize}
     </select>
     <select id="countTemplateSettingList" resultType="java.lang.Long">