From b5dfbd2897c9c2f8a4ed727abf344193c75d5bbe Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Wed, 23 Nov 2022 15:40:28 +0800
Subject: [PATCH] =?UTF-8?q?PC=E6=AC=BE=E9=A1=B9=E7=94=B3=E8=AF=B7=E3=80=81?=
=?UTF-8?q?=E7=A1=AE=E8=AE=A4=E9=A9=B3=E5=9B=9E=E4=B8=80=E6=AC=A1=E6=80=A7?=
=?UTF-8?q?=E8=AE=A4=E6=AC=BE=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FinCollectionConfirmationVo.java | 7 ++++++
...ilsOfReceivablesAndUncollectedItemsVo.java | 6 ++---
.../FinCollectionConfirmationService.java | 22 ++++++++++++++++++-
.../finance/paymentapply/PaymentApplyVo.java | 2 +-
4 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java
index 571178878c..d77df63829 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java
@@ -48,6 +48,7 @@ import lombok.Data;
@Data
public class FinCollectionConfirmationVo implements Vo {
+ private static final long serialVersionUID = 6561005289102689912L;
@ApiModelProperty("收款确认单sid")
private String sid; // 收款确认单sid
@ApiModelProperty("收款日期")
@@ -68,4 +69,10 @@ public class FinCollectionConfirmationVo implements Vo {
private Integer auditState; // 审核状态
@ApiModelProperty("认款状态（1未认款/2部分认款/3已认款）")
private Integer subscriptionState; // 审核状态
+
+ @ApiModelProperty("是否允许认款")
+ private boolean showHandle;
+
+ @ApiModelProperty("余额")
+ private String balance;
}
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/DetailsOfReceivablesAndUncollectedItemsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/DetailsOfReceivablesAndUncollectedItemsVo.java
index e8255f7eef..6d243c2ba7 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/DetailsOfReceivablesAndUncollectedItemsVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/DetailsOfReceivablesAndUncollectedItemsVo.java
@@ -27,14 +27,11 @@ package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.util.List;
-
/**
* Project: anrui-fin(销售相关)
* File: FinUncollectedReceivablesDetailedVo.java
@@ -71,4 +68,7 @@ public class DetailsOfReceivablesAndUncollectedItemsVo implements Vo {
private String receivablesName; // 应收项目名称
@ApiModelProperty("当前应收金额")
private String currentReceivableMoney; // 当前应收金额
+
+ @ApiModelProperty("应收金额")
+ private String reveivableMoney;
}
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
index 4c09932536..2ff093e299 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@@ -141,6 +141,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService qw = createQueryWrapper(query);
IPage page = PagerUtil.queryToPage(pq);
IPage pagging = baseMapper.selectPageVo(page, qw);
- /* List records = pagging.getRecords();
+ List records = pagging.getRecords();
for (FinCollectionConfirmationVo record : records) {
+ //是否有余额
+ if(StringUtils.isNotBlank(record.getBalance())){
+ //余额是0
+ if(new BigDecimal(record.getBalance()).compareTo(BigDecimal.ZERO) == 0){
+ record.setShowHandle(false);
+ }else{
+ //是否是待审核状态或已驳回状态
+ if(record.getAuditState() == 1 || record.getAuditState() == 2){
+ record.setShowHandle(false);
+ }else{
+ record.setShowHandle(true);
+ }
+ }
+ }else{
+ record.setShowHandle(false);
+ }
+ }
+ /* for (FinCollectionConfirmationVo record : records) {
String s = "";
BigDecimal subscriptionMoney = new BigDecimal(0);
String sid = record.getSid();
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java
index 9d6a55d6f7..cb5d374907 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java
@@ -64,7 +64,7 @@ public class PaymentApplyVo implements Vo {
@JsonProperty("procInsId")
private String procInstId;
- @ApiModelProperty("品牌sid")
+ @ApiModelProperty("品牌")
private String brand;
}