From c16ccefb336325b5b65757073e168ea31c376b08 Mon Sep 17 00:00:00 2001
From: cyf009 <591388323@qq.com>
Date: Thu, 5 Sep 2024 10:37:36 +0800
Subject: [PATCH 1/2] 11
---
.../application/command/IncomeCommandServiceImpl.java | 4 ++--
WebSite/src/views/stagingentryapplication/index.vue | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/IncomeCommandServiceImpl.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/IncomeCommandServiceImpl.java
index a8026007..fb218a9f 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/IncomeCommandServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/IncomeCommandServiceImpl.java
@@ -179,9 +179,9 @@ public class IncomeCommandServiceImpl extends BaseCommandAbstractService<Income
JSONArray array = json.getJSONObject("data").getJSONArray("voucherDetails");
List<VchDetailEntity> vchDetailList = VchDetailAssembler.jsonArrayToEntity(array);;
BankAccountNumberOut bankAccountNumberOut=bankAccountNumberQueryService.getBankAccountNumberEntity(null,incomeAggregate.getInComeAccount().getAccount());
- boolean list = vchDetailList.stream().anyMatch(t->( t.getCrAmount().compareTo(incomeAggregate.getIncomeAmount())==0
+ boolean list = vchDetailList.stream().anyMatch(t->( t.getDeAmount().compareTo(incomeAggregate.getIncomeAmount())==0
&& t.getVchAcctCode().equals(bankAccountNumberOut.getAccountCode())
- && t.getDeorcr()==-1));
+ && t.getDeorcr()==1));
if(!list)
throw new RuntimeException("杈撳叆鍏ヨ处鍑瘉閲戦鍜岀鐩笉绗﹀悎!");
//2 鏌ヨ鍙戠エ
diff --git a/WebSite/src/views/stagingentryapplication/index.vue b/WebSite/src/views/stagingentryapplication/index.vue
index ba178802..fec38bfd 100644
--- a/WebSite/src/views/stagingentryapplication/index.vue
+++ b/WebSite/src/views/stagingentryapplication/index.vue
@@ -180,7 +180,8 @@ import IncomeType from '@/api/IncomeType';
import BankAccountNumber from '@/api/BankAccountNumber';
import Emun from '@/api/Emun';
import AccountEntryManage from '@/api/AccountEntryManage';
-import Pagination from 'element-plus/lib/el-pagination';
+import Pagination from '@/components/Pagination';
+import { ElMessage, ElNotification, ElMessageBox } from 'element-plus';
export default {
name:'stagingentryapplication',
components:{Pagination},
@@ -245,6 +246,7 @@ const selectStagingEntryApplication=()=>{
return ElNotification.warning(rs.description);
}
data.stagingEntryApplicationLis=rs.data;
+ data.dataCount=rs.total;
}).catch(err => {
return ElNotification.error(err);
@@ -253,6 +255,7 @@ const selectStagingEntryApplication=()=>{
const stagingEntryApplication=async()=>{
const rs=await AccountEntryManage.storageTemp(data.incomeId);
+ debugger;
if (rs.code!='00000') {
return ElNotification.warning(rs.description);
}
--
GitLab
From 12d241aca746695d13fe0880459cf57419e5e24e Mon Sep 17 00:00:00 2001
From: cyf009 <591388323@qq.com>
Date: Thu, 5 Sep 2024 11:05:47 +0800
Subject: [PATCH 2/2] 11
---
.../application/command/IncomeCommandServiceImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/IncomeCommandServiceImpl.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/IncomeCommandServiceImpl.java
index fb218a9f..25cd6dc3 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/IncomeCommandServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/IncomeCommandServiceImpl.java
@@ -179,9 +179,9 @@ public class IncomeCommandServiceImpl extends BaseCommandAbstractService<Income
JSONArray array = json.getJSONObject("data").getJSONArray("voucherDetails");
List<VchDetailEntity> vchDetailList = VchDetailAssembler.jsonArrayToEntity(array);;
BankAccountNumberOut bankAccountNumberOut=bankAccountNumberQueryService.getBankAccountNumberEntity(null,incomeAggregate.getInComeAccount().getAccount());
- boolean list = vchDetailList.stream().anyMatch(t->( t.getDeAmount().compareTo(incomeAggregate.getIncomeAmount())==0
+ boolean list = vchDetailList.stream().anyMatch(t-> t.getDeAmount().compareTo(incomeAggregate.getIncomeAmount())==0
&& t.getVchAcctCode().equals(bankAccountNumberOut.getAccountCode())
- && t.getDeorcr()==1));
+ && t.getDeorcr()==1);
if(!list)
throw new RuntimeException("杈撳叆鍏ヨ处鍑瘉閲戦鍜岀鐩笉绗﹀悎!");
//2 鏌ヨ鍙戠エ
--
GitLab