From 0a5cf0bc14ded0ec90e504ccbe1085f25b0da232 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Mon, 3 Apr 2023 09:40:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E4=BB=98=E6=AC=BE=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B1=82=E7=BA=A7=E5=88=97=E8=A1=A8=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/finpaymentrecord/FinPaymentrecordMapper.xml    |  1 +
 .../biz/finpaymentrecord/FinPaymentrecordService.java  | 10 ----------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml
index 8bf8540885..e96e634e6f 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml
@@ -29,6 +29,7 @@
         <where>
             ${ew.sqlSegment}
         </where>
+        order by fp.createTime desc
     </select>
 
     <select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordVo">
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
index 352cf5e985..c54625d055 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
@@ -27,7 +27,6 @@ package com.yxt.anrui.fin.biz.finpaymentrecord;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufUpdateDto;
@@ -40,7 +39,6 @@ import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPay;
 import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayFeign;
 import com.yxt.anrui.base.api.basevehicleactualsales.BaseVehicleActualSalesDetailsVo;
 import com.yxt.anrui.base.api.basevehicleactualsales.BaseVehicleActualSalesFeign;
-import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyFeign;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
@@ -50,9 +48,6 @@ import com.yxt.anrui.fin.api.finpaymentrecord.*;
 import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill;
 import com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService;
 import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService;
-import com.yxt.anrui.flowable.api.flowtask.FlowRecordVo;
-import com.yxt.anrui.flowable.api.flowtask.FlowTask;
-import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.portal.api.flow.FlowableFeign;
 import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
@@ -73,13 +68,11 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.messagecenter.api.message.AppScmMessageFlowableQuery;
 import com.yxt.messagecenter.api.message.MessageFeign;
-import com.yxt.messagecenter.api.message.MsgTargetUriEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -87,7 +80,6 @@ import java.text.NumberFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static cn.hutool.core.util.ClassLoaderUtil.getClassLoader;
 import static java.util.Comparator.comparing;
 
 /**
@@ -170,7 +162,6 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 }
             }
         }
-        qw.orderByDesc("fp.createTime");
         IPage<FinPaymentrecord> page = PagerUtil.queryToPage(pq);
         IPage<FinPaymentrecordVo> pagging = baseMapper.selectPageVo(page, qw);
         List<FinPaymentrecordVo> list = pagging.getRecords();
@@ -226,7 +217,6 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                     apply(StringUtils.isNotBlank(pageQuery.getCreateEndDate()), "date_format (fp.createTime,'%Y-%m-%d') <= date_format('" + pageQuery.getCreateEndDate() + "','%Y-%m-%d')"
                     );
         }
-        qw.orderByDesc("fp.createTime");
         IPage<FinPaymentrecord> page = PagerUtil.queryToPage(pq);
         IPage<FinPaymentrecordVo> pagging = baseMapper.selectPageVo(page, qw);
         List<FinPaymentrecordVo> list = pagging.getRecords();