Merge branch 'develop' of http://112.74.196.215:3000/Tech2/data-daq into develop

service-base/src/main/java/com/simuwang/base/pojo/dto/query/FundAliasPageQuery.java

@@ -13,8 +13,14 @@ public class FundAliasPageQuery extends PageQuery {
      * 基金名称
      */
     private String fundName;
-
+    /**
+     * 基金别名
+     */
     private String fundAliasName;
+    /**
+     * 是否匹配基金
+     */
+    private Integer isMapping;
 
     public String getFundName() {
         return fundName;
@@ -31,4 +37,12 @@ public class FundAliasPageQuery extends PageQuery {
     public void setFundAliasName(String fundAliasName) {
         this.fundAliasName = fundAliasName;
     }
+
+    public Integer getIsMapping() {
+        return isMapping;
+    }
+
+    public void setIsMapping(Integer isMapping) {
+        this.isMapping = isMapping;
+    }
 }

service-base/src/main/resources/mapper/DistributionMapper.xml

@@ -71,9 +71,9 @@
             ON info.trust_id = c.company_id AND c.isvalid = 1
             JOIN PPW_EMAIL.nav n
             ON n.fund_id = d.fund_id and d.distribute_date=n.price_date
+            AND n.isvalid = 1
         WHERE d.isvalid = 1
             AND info.isvalid = 1
-            AND n.isvalid = 1
         <if test="companyName != null and companyName !=''">
             and (c.company_name like concat('%',#{companyName},'%') or c.company_short_name like concat('%',#{companyName},'%'))
         </if>
@@ -89,6 +89,7 @@
         <if test="endDate != null and endDate !=''">
             and d.distribute_date <![CDATA[ <= ]]> #{endDate}
         </if>
+        order by d.updatetime desc
         limit #{offset},#{pageSize}
     </select>
     <select id="countDistributionList" resultType="java.lang.Long"

service-base/src/main/resources/mapper/FundAliasMapper.xml

@@ -58,6 +58,12 @@
         <if test="fundAliasName != null and fundAliasName !=''">
             and (target_fund_name like concat('%',#{fundAliasName},'%')  or target_register_number like concat('%',#{fundAliasName},'%') )
         </if>
+        <if test="isMapping != null and isMapping == 0">
+            and target_fund_id is null
+        </if>
+        <if test="isMapping != null and isMapping == 1">
+            and target_fund_id is not null
+        </if>
         order by updatetime desc
         limit #{offset},#{pageSize}
     </select>
@@ -70,6 +76,12 @@
         <if test="fundAliasName != null and fundAliasName !=''">
             and (target_fund_name like concat('%',#{fundAliasName},'%')  or target_register_number like concat('%',#{fundAliasName},'%') )
         </if>
+        <if test="isMapping != null and isMapping == 0">
+            and target_fund_id is null
+        </if>
+        <if test="isMapping != null and isMapping == 1">
+            and target_fund_id is not null
+        </if>
     </select>
     <select id="searchFundAliasById" resultType="com.simuwang.base.pojo.dos.FundAliasDO"
             parameterType="java.lang.Integer">