From ef0141b5ece166d9049bf5f13a852fa10713d328 Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 4 Jul 2023 09:07:11 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=8A=B5=E6=89=A3=E7=A8=8E=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/core/service/export/impl/RzFpxxServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java index 4bbfaee2..1421d079 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java @@ -7,6 +7,7 @@ import java.util.Map; import javax.annotation.Resource; +import com.dxhy.common.util.AmountFormatUtil; import com.dxhy.core.service.export.PoolPaperService; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -82,7 +83,13 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl dataArray[7] = pageList.get(i).getXfName(); dataArray[8] = pageList.get(i).getInvoiceAmount(); dataArray[9] = pageList.get(i).getTaxAmount(); - dataArray[10] = pageList.get(i).getDkTaxAmount(); + + if (pageList.get(i).getDkTaxAmount() != null) { + dataArray[10] = AmountFormatUtil.fmtMicrometer(MathUtil.round(pageList.get(i).getDkTaxAmount())); + } else { + dataArray[10] = AmountFormatUtil.fmtMicrometer(MathUtil.round(pageList.get(i).getTaxAmount())); + } + dataArray[11] = dictdetaServcice.queryDictName(DictConstant.QS_STATUS, pageList.get(i).getQsStatus()); dataArray[12] = pageList.get(i).getQsDate(); dataArray[13] = dictdetaServcice.queryDictName(DictConstant.QS_TYPE, pageList.get(i).getQsType());