소스 검색

feat:别名编辑去掉前后空格

chenjianhua 1 주 전
부모
커밋
1efd584c86
2개의 변경된 파일16개의 추가작업 그리고 4개의 파일을 삭제
  1. 8 2
      service-base/src/main/resources/mapper/EmailFundAssetMapper.xml
  2. 8 2
      service-base/src/main/resources/mapper/EmailFundNavMapper.xml

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

@@ -66,7 +66,10 @@
         on file.email_id = parse.id
         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},'%') or asset.register_number like concat(#{fundName},'%') )
+            and (nav.fund_name like concat(#{fundName},'%'))
+        </if>
+        <if test="registerNumber != null and registerNumber !=''">
+            and (nav.register_number like concat(#{registerNumber},'%'))
         </if>
         <if test="priceStartDate != null and priceStartDate !=''">
             and asset.price_date >= #{priceStartDate}
@@ -112,7 +115,10 @@
         on file.email_id = parse.id
         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},'%') or asset.register_number like concat(#{fundName},'%') )
+            and (nav.fund_name like concat(#{fundName},'%'))
+        </if>
+        <if test="registerNumber != null and registerNumber !=''">
+            and (nav.register_number like concat(#{registerNumber},'%'))
         </if>
         <if test="priceStartDate != null and priceStartDate !=''">
             and asset.price_date >= #{priceStartDate}

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

@@ -71,7 +71,10 @@
                 on file.email_id = parse.id
         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},'%') or nav.register_number like concat(#{fundName},'%'))
+            and (nav.fund_name like concat(#{fundName},'%'))
+        </if>
+        <if test="registerNumber != null and registerNumber !=''">
+            and (nav.register_number like concat(#{registerNumber},'%'))
         </if>
         <if test="priceStartDate != null and priceStartDate !=''">
             and nav.price_date >= #{priceStartDate}
@@ -117,7 +120,10 @@
         on file.email_id = parse.id
         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},'%') or nav.register_number like concat(#{fundName},'%'))
+            and (nav.fund_name like concat(#{fundName},'%'))
+        </if>
+        <if test="registerNumber != null and registerNumber !=''">
+            and (nav.register_number like concat(#{registerNumber},'%'))
         </if>
         <if test="priceStartDate != null and priceStartDate !=''">
             and nav.price_date >= #{priceStartDate}