fix: 解析详情增加邮件ID的展示和查询

service-base/src/main/java/com/simuwang/base/pojo/dos/EmailFundAssetDO.java

@@ -96,6 +96,8 @@ public class EmailFundAssetDO {
 
     private String emailTitle;
 
+    private String emailId;
+
     public EmailFundAssetVO toVo() {
         EmailFundAssetVO vo = new EmailFundAssetVO();
         vo.setId(this.id);
@@ -109,6 +111,7 @@ public class EmailFundAssetDO {
         vo.setAssetNet(this.assetNet);
         vo.setAssetShare(this.assetShare);
         vo.setEmailTitle(this.emailTitle);
+        vo.setEmailId(this.emailId);
         return vo;
     }
 }

service-base/src/main/java/com/simuwang/base/pojo/dos/EmailFundNavDO.java

@@ -92,6 +92,9 @@ public class EmailFundNavDO {
 
     private String emailTitle;
 
+
+    private String emailId;
+
     public EmailFundNavVO toVo() {
         EmailFundNavVO vo = new EmailFundNavVO();
         vo.setId(this.id);
@@ -103,6 +106,7 @@ public class EmailFundNavDO {
         vo.setPriceDate(this.priceDate==null?null:DateUtils.format(this.priceDate, DateUtils.YYYY_MM_DD));
         vo.setCumulativeNavWithdrawal(this.cumulativeNavWithdrawal);
         vo.setNav(this.nav);
+        vo.setEmailId(this.emailId);
         vo.setIsStored(this.isStored);
         vo.setExceptionStatus(this.exceptionStatus);
         vo.setUpateTime(DateUtils.format(this.updateTime, DateUtils.YYYY_MM_DD_HH_MM_SS));

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

@@ -45,6 +45,18 @@ public class ParseDetailPageQuery extends PageQuery {
      * 邮件标题
      */
     private String emailTitle;
+    /**
+     * 邮件ID
+     */
+    private String emailId;
+
+    public String getEmailId() {
+        return emailId;
+    }
+
+    public void setEmailId(String emailId) {
+        this.emailId = emailId;
+    }
 
     public String getFundName() {
         return fundName;

service-base/src/main/java/com/simuwang/base/pojo/vo/EmailFundAssetVO.java

@@ -65,4 +65,8 @@ public class EmailFundAssetVO {
      * 邮件标题
      */
     private String emailTitle;
+    /**
+     * 邮件ID
+     */
+    private String emailId;
 }

service-base/src/main/java/com/simuwang/base/pojo/vo/EmailFundNavVO.java

@@ -66,4 +66,8 @@ public class EmailFundNavVO {
      * 邮件标题
      */
     private String emailTitle;
+    /**
+     * 邮件ID
+     */
+    private String emailId;
 }

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

@@ -18,6 +18,7 @@
         <result column="updaterid" property="updaterId"/>
         <result column="updatetime" property="updateTime"/>
         <result column="email_title" property="emailTitle"/>
+        <result column="email_id" property="emailId"/>
     </resultMap>
 
     <insert id="batchInsert" parameterType="com.simuwang.base.pojo.dos.EmailFundAssetDO">
@@ -55,7 +56,8 @@
                         asset.is_stored,
                         asset.exception_status,
                         asset.updatetime,
-                        parse.email_title
+                        parse.email_title,
+                        parse.id as email_id
         from PPW_EMAIL.email_fund_asset asset
         join PPW_EMAIL.email_file_info file
         on asset.file_id = file.id
@@ -83,6 +85,9 @@
         <if test="emailTitle != null and emailTitle != ''">
             and parse.email_title like concat('%',#{emailTitle},'%')
         </if>
+        <if test="emailId != null">
+            and parse.id =#{emailId}
+        </if>
         <if test="exceptionStatusList != null">
             and asset.exception_status in
             <foreach collection="exceptionStatusList" index="index" item="exceptionStatus" separator="," open="(" close=")">
@@ -123,6 +128,9 @@
         <if test="emailTitle != null and emailTitle != ''">
             and parse.email_title like concat('%',#{emailTitle},'%')
         </if>
+        <if test="emailId != null">
+            and parse.id =#{emailId}
+        </if>
         <if test="exceptionStatusList != null">
             and asset.exception_status in
             <foreach collection="exceptionStatusList" index="index" item="exceptionStatus" separator="," open="(" close=")">

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

@@ -58,7 +58,8 @@
             nav.exception_status,
             nav.is_stored,
             nav.updatetime,
-            parse.email_title
+            parse.email_title,
+            parse.id as email_id
         FROM
             PPW_EMAIL.email_fund_nav nav
             join PPW_EMAIL.email_file_info file
@@ -93,6 +94,9 @@
         <if test="emailTitle != null and emailTitle != ''">
             and parse.email_title like concat('%',#{emailTitle},'%')
         </if>
+        <if test="emailId != null">
+            and parse.id=#{emailId}
+        </if>
         order by nav.updatetime desc
         limit #{offset},#{pageSize}
     </select>
@@ -143,6 +147,9 @@
         <if test="emailTitle != null and emailTitle != ''">
             and parse.email_title like concat('%',#{emailTitle},'%')
         </if>
+        <if test="emailId != null">
+            and parse.id=#{emailId}
+        </if>
         ) a
     </select>
     <select id="countNoStoreNav" resultType="java.lang.Integer" parameterType="java.lang.String">