cc пре 3 месеци
родитељ
комит
2eb0421242

+ 2 - 1
src/main/java/com/qingjian/common/model/trans/dto/TransBankCardInfoDTO.java

@@ -13,7 +13,8 @@ public class TransBankCardInfoDTO {
 
     @ExcelProperty("本方银行卡号")
     private String personCardNo;
-
+    @ExcelProperty("本方姓名")
+    private String personName;
     @ExcelProperty("所属银行")
     private String bankName;
 

+ 1 - 0
src/main/java/com/qingjian/module/person/service/DataProfileService.java

@@ -268,6 +268,7 @@ public class DataProfileService {
             transRecordSummary.setNetAmount(subtract.abs());
             if (acctOpenInfoMap.containsKey(transRecordSummary.getPersonCardNo())) {
                 AcctOpenInfo acctOpenInfo = acctOpenInfoMap.get(transRecordSummary.getPersonCardNo());
+                transRecordSummary.setPersonName(acctOpenInfo.getPersonName());
                 transRecordSummary.setAcctBalance(acctOpenInfo.getBalance());
                 transRecordSummary.setOpeningDate(acctOpenInfo.getOpeningDate());
                 transRecordSummary.setClosingDate(acctOpenInfo.getClosingDate());

+ 3 - 1
src/main/resources/mappers/trans/TransRecordMapper.xml

@@ -246,6 +246,7 @@
 
         WITH trans_latest_balance AS (
         SELECT
+        personName,
         personCardNo,
         transAmount,
         debitCreditFlag,
@@ -260,6 +261,7 @@
         </foreach>
         )
         SELECT
+        personName,
         personCardNo,
         SUM(transAmount) FILTER (WHERE debitCreditFlag = '收入') AS incomeTotalAmount,
         SUM(transAmount) FILTER (WHERE debitCreditFlag = '支出') AS expenseTotalAmount,
@@ -267,7 +269,7 @@
         COUNT(*) AS transCount,
         ANY_VALUE(latest_balance) AS totalBalance
         FROM trans_latest_balance
-        GROUP BY personCardNo
+        GROUP BY personName,personCardNo
 
     </select>