From d17a3691559250b88e2589cfe1ce19d79673b955 Mon Sep 17 00:00:00 2001
From: baozhipeng <961815525@qq.com>
Date: Sun, 26 Sep 2021 14:36:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml    | 4 ++--
 .../payment/service/impl/PayPaymentRecordServiceImpl.java     | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml
index f8bc21c1..366b0008 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml
@@ -99,7 +99,7 @@
         <if test="paymentDate != null and paymentDate != ''">
             AND DATE_FORMAT(ppr.payment_date,'%Y') = #{paymentDate}
         </if>
-        GROUP BY p.id ORDER BY p.create_time
+        GROUP BY p.id ORDER BY p.create_time desc
     </select>
 
     <!--    到账开票导出-->
@@ -199,7 +199,7 @@
         <if test="paymentDate != null and paymentDate != ''">
             AND DATE_FORMAT(ppr.payment_date,'%Y') = #{paymentDate}
         </if>
-        GROUP BY p.id ORDER BY p.create_time
+        GROUP BY p.id ORDER BY p.create_time desc
     </select>
     <select id="getMonthAmountCount" resultType="java.math.BigDecimal">
         SELECT sum(amount_received) AS nowMonthAmount  FROM pay_payment_record WHERE DATE_FORMAT(payment_date,'%Y-%m') = #{time}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
index 9f38f6f5..d833d2ef 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
@@ -266,6 +266,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
         tbMemberProjectSubitemMapper.updateById(tbMember);
 
         //插入来款记录表
+        payPaymentRecord.setProjectId(tbMember.getId());
+        payPaymentRecord.setProjectType(Integer.valueOf(PayIncomeContractCommon.PROJECT_TYPE5));
         payPaymentRecordMapper.insert(payPaymentRecord);
         return Result.OK("添加成功！");
     }
@@ -275,7 +277,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
             LambdaQueryWrapper<PayPaymentRecord> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(PayPaymentRecord::getProjectId, payPaymentRecord.getProjectId());
-            wrapper.eq(PayPaymentRecord::getProjectType, PayIncomeContractCommon.PROJECT_TYPE5);
+            wrapper.eq(PayPaymentRecord::getProjectType, Integer.valueOf(PayIncomeContractCommon.PROJECT_TYPE5));
             List<PayPaymentRecord> type5List = payPaymentRecordMapper.selectList(wrapper);
 
             if(type5List!=null && type5List.size()>0){