fix: 查询排序和附件剔除HTML问题修复

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

@@ -28,4 +28,8 @@ public class FundFileInfoVO {
      * 文件路径
      */
     private String filePath;
+    /**
+     * 文件路径
+     */
+    private String createTime;
 }

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

@@ -53,6 +53,7 @@
         <if test="sendStatus != null">
             and maxce.send_status=#{sendStatus}
         </if>
+        order by maxce.send_time desc
         limit #{offset},#{pageSize}
     </select>
 

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

@@ -32,7 +32,7 @@
             parameterType="java.lang.Integer">
         select id ,email_id, file_name, file_path,
                isvalid, creatorid, createtime, updaterid, updatetime
-        from PPW_EMAIL.email_file_info where email_id=#{emailId} and isvalid=1
+        from PPW_EMAIL.email_file_info where email_id=#{emailId} and isvalid=1 and file_name not like '%html'
     </select>
 
     <select id="queryByEmailId" resultMap="BaseResultMap">
@@ -46,7 +46,8 @@
             efn.fund_id as "fundId",
             efn.fund_name as "fundName",
             efi.file_name as "fileName",
-            efi.file_path as "filePath"
+            efi.file_path as "filePath",
+            efi.createtime as "createTime"
         FROM
             PPW_EMAIL.EMAIL_FILE_INFO efi
                 JOIN PPW_EMAIL.EMAIL_FUND_NAV efn
@@ -57,6 +58,7 @@
           AND efn.isvalid = 1
           AND epi.isvalid = 1
           AND epi.EMAIL_TYPE = #{fileType} and efn.fund_id=#{fundId}
+        order by efi.createtime desc
         limit #{offset},#{pageSize}
     </select>
 

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

@@ -76,7 +76,7 @@
         <if test="emailTitle != null and emailTitle != ''">
             and parse.email_title like concat('%',#{emailTitle},'%')
         </if>
-        order by asset.fund_name desc,asset.price_date desc
+        order by asset.updatetime desc
         limit #{offset},#{pageSize}
     </select>
     <select id="countAssetDetail" resultType="java.lang.Long"

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

@@ -90,7 +90,7 @@
         <if test="emailTitle != null and emailTitle != ''">
             and parse.email_title like concat('%',#{emailTitle},'%')
         </if>
-        order by nav.fund_name desc,nav.price_date desc
+        order by nav.updatetime desc
         limit #{offset},#{pageSize}
     </select>
     <select id="countNavDetail" resultType="java.lang.Long"

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

@@ -73,6 +73,7 @@
         <if test="endDate != null and endDate !=''">
             and f.inception_date <![CDATA[ <= ]]> #{endDate}
         </if>
+        order by n.last_price_date desc
         limit #{offset},#{pageSize}
     </select>