From c901a457fc4ee305d9d2044d1bfa3bf2024ea38f Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Thu, 5 Jun 2025 09:32:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=AE=E6=97=85=E6=8A=A5=E9=94=80=E5=8D=95?= =?UTF-8?q?=E5=BC=80=E6=88=B7=E9=93=B6=E8=A1=8C=20=E6=94=B6=E6=AC=BE?= =?UTF-8?q?=E4=BA=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OerDjmlExtServiceImpl.java | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java b/fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java index fc14ac3e..ff8a0905 100644 --- a/fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java +++ b/fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java @@ -33,6 +33,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.io.*; +import java.math.BigDecimal; import java.net.URLDecoder; import java.nio.charset.Charset; import java.util.*; @@ -299,9 +300,9 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService { jsfs.setJsfsmc(forson.getString("field0042")); jsfs.setKmdm(""); jsfs.setKmmc(""); - jsfs.setSkr(forson.getString("field0076")); - jsfs.setKhyh(forson.getString("field0077")); - jsfs.setYhzh(forson.getString("field0078")); + jsfs.setSkr(forson.getString("field0013")); + jsfs.setKhyh(forson.getString("field0014")); + jsfs.setYhzh(forson.getString("field0015")); jsfs.setJe(je); jsfs.setYh(""); jsfs.setYhhh(""); @@ -482,7 +483,11 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService { djnr.setClf_hsf(forson.getString("field0146")); //交通补助 djnr.setClf_jtbz(forson.getString("field0147"));//交通补助标准 - djnr.setClf_jtbzf(forson.getString("field0192"));//交通补助实报 + //交通补助实报=公杂费+交通补助实报 2025年6月4日群里开户在线演示时提出的 + BigDecimal gzf = Convert.toBigDecimal(forson.getString("field0150"), BigDecimal.ZERO); + BigDecimal jtbz = Convert.toBigDecimal(forson.getString("field0192"), BigDecimal.ZERO); + BigDecimal total = gzf.add(jtbz); + djnr.setClf_jtbzf(String.valueOf(total));//交通补助实报 djnr.setClf_jtf(forson.getString("field0148")); //其他 djnr.setClf_qtf(forson.getString("field0151")); @@ -512,7 +517,7 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService { //支付方式为个人、公务卡时 可以选择 经办人、负责人、其他 jsfs.setRytype("");//人员类型 //用途 - jsfs.setYt(forson.getString("field0125")); + jsfs.setYt(forson.getString("field0160")); jsfsList.add(jsfs); //预算指标 OerYszbEntity yszb = new OerYszbEntity(); @@ -1435,4 +1440,11 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService { } } + public static void main(String[] args) { + BigDecimal gzf = Convert.toBigDecimal("12.11", BigDecimal.ZERO); + System.out.println(gzf); + BigDecimal jtbz = Convert.toBigDecimal("1", BigDecimal.ZERO); + System.out.println(jtbz); + System.out.println(gzf.add(jtbz)); + } }