瀏覽代碼

fix: 解析详情净值规模异常状态下拉框多选问题修复

chenjianhua 7 月之前
父節點
當前提交
695e05d4cb

+ 7 - 5
service-base/src/main/java/com/simuwang/base/pojo/dto/query/ParseDetailPageQuery.java

@@ -3,6 +3,8 @@ package com.simuwang.base.pojo.dto.query;
 
 import com.simuwang.base.common.support.query.PageQuery;
 
+import java.util.List;
+
 /**
  * @author wangzaijun
  * @date 2024/9/13 13:38
@@ -32,7 +34,7 @@ public class ParseDetailPageQuery extends PageQuery {
     /**
      * 异常情况:1-无异常,2-净值缺失,3-未匹配基金,4-净值<=0,5-资产净值<=0
      */
-    private Integer exceptionStatus;
+    private List<Integer> exceptionStatusList;
 
     /**
      * 是否入库,0-未入库,1-入库
@@ -68,12 +70,12 @@ public class ParseDetailPageQuery extends PageQuery {
         this.priceEndDate = priceEndDate;
     }
 
-    public Integer getExceptionStatus() {
-        return exceptionStatus;
+    public List<Integer> getExceptionStatusList() {
+        return exceptionStatusList;
     }
 
-    public void setExceptionStatus(Integer exceptionStatus) {
-        this.exceptionStatus = exceptionStatus;
+    public void setExceptionStatusList(List<Integer> exceptionStatusList) {
+        this.exceptionStatusList = exceptionStatusList;
     }
 
     public Integer getIsStore() {

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

@@ -45,7 +45,17 @@
     </update>
     <select id="searchAssetDetail" resultMap="BaseResultMap"
             parameterType="com.simuwang.base.pojo.dto.query.ParseDetailPageQuery">
-        select distinct asset.id,asset.fund_id, asset.fund_name,asset.register_number,asset.price_date,asset.asset_net,asset.asset_share,asset.is_stored,asset.exception_status,asset.updatetime,parse.email_title
+        select distinct asset.id,
+                        asset.fund_id,
+                        asset.fund_name,
+                        asset.register_number,
+                        asset.price_date,
+                        asset.asset_net,
+                        asset.asset_share,
+                        asset.is_stored,
+                        asset.exception_status,
+                        asset.updatetime,
+                        parse.email_title
         from PPW_EMAIL.email_fund_asset asset
         join PPW_EMAIL.email_file_info file
         on asset.file_id = file.id
@@ -61,9 +71,6 @@
         <if test="priceEndDate != null and priceEndDate !=''">
             and asset.price_date  <![CDATA[ <= ]]> #{priceEndDate}
         </if>
-        <if test="exceptionStatus != null">
-            and asset.exception_status = #{exceptionStatus}
-        </if>
         <if test="updateStartDate != null and updateStartDate !=''">
             and asset.updatetime  <![CDATA[ >= ]]> #{updateStartDate}
         </if>
@@ -76,6 +83,12 @@
         <if test="emailTitle != null and emailTitle != ''">
             and parse.email_title like concat('%',#{emailTitle},'%')
         </if>
+        <if test="exceptionStatusList != null">
+            and asset.exception_status in
+            <foreach collection="exceptionStatusList" index="index" item="exceptionStatus" separator="," open="(" close=")">
+                #{exceptionStatus}
+            </foreach>
+        </if>
         order by asset.updatetime desc
         limit #{offset},#{pageSize}
     </select>
@@ -98,9 +111,6 @@
         <if test="priceEndDate != null and priceEndDate !=''">
             and asset.price_date  <![CDATA[ <= ]]> #{priceEndDate}
         </if>
-        <if test="exceptionStatus != null">
-            and asset.exception_status = #{exceptionStatus}
-        </if>
         <if test="updateStartDate != null and updateStartDate !=''">
             and asset.updatetime  <![CDATA[ >= ]]> #{updateStartDate}
         </if>
@@ -113,6 +123,12 @@
         <if test="emailTitle != null and emailTitle != ''">
             and parse.email_title like concat('%',#{emailTitle},'%')
         </if>
+        <if test="exceptionStatusList != null">
+            and asset.exception_status in
+            <foreach collection="exceptionStatusList" index="index" item="exceptionStatus" separator="," open="(" close=")">
+                #{exceptionStatus}
+            </foreach>
+        </if>
         )a
     </select>
     <select id="countNoStoreAsset" resultType="java.lang.Integer" parameterType="java.lang.String">

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

@@ -75,8 +75,11 @@
         <if test="priceEndDate != null and priceEndDate !=''">
             and nav.price_date  <![CDATA[ <= ]]> #{priceEndDate}
         </if>
-        <if test="exceptionStatus != null">
-            and nav.exception_status = #{exceptionStatus}
+        <if test="exceptionStatusList != null">
+            and nav.exception_status in
+            <foreach collection="exceptionStatusList" index="index" item="exceptionStatus" separator="," open="(" close=")">
+                #{exceptionStatus}
+            </foreach>
         </if>
         <if test="updateStartDate != null and updateStartDate !=''">
             and nav.updatetime  <![CDATA[ >= ]]> #{updateStartDate}
@@ -122,8 +125,11 @@
         <if test="priceEndDate != null and priceEndDate !=''">
             and nav.price_date  <![CDATA[ <= ]]> #{priceEndDate}
         </if>
-        <if test="exceptionStatus != null">
-            and nav.exception_status = #{exceptionStatus}
+        <if test="exceptionStatusList != null">
+            and nav.exception_status in
+            <foreach collection="exceptionStatusList" index="index" item="exceptionStatus" separator="," open="(" close=")">
+                #{exceptionStatus}
+            </foreach>
         </if>
         <if test="updateStartDate != null and updateStartDate !=''">
             and nav.updatetime  <![CDATA[ >= ]]> #{updateStartDate}