From a0d2e15eab28e8dc33f480a677d589940cf475c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 20 May 2025 11:32:55 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=90=8C=E6=AD=A5=E5=A2=83=E5=86=85=E8=B4=A6?= =?UTF-8?q?=E6=88=B7=E6=98=8E=E7=BB=86uf=5Fjnzhmx=E5=92=8C=E7=A5=A8?= =?UTF-8?q?=E6=8D=AE=E6=98=8E=E7=BB=86uf=5Fpjskmx=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=8F=AF=E4=BB=A5=E6=A0=B9=E6=8D=AE=E5=9B=9E?= =?UTF-8?q?=E6=AC=BE=E4=BA=BA=E4=B8=8E=E5=8A=9E=E4=BA=8B=E5=A4=84=E7=9A=84?= =?UTF-8?q?=E5=AF=B9=E7=85=A7=E8=A1=A8=EF=BC=88uf=5Fhkrdzb=EF=BC=89?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E5=AE=A2=E6=88=B7=E3=80=82=E6=AD=A4=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=98=AF=E5=90=A6=E7=B3=BB=E7=BB=9F=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E8=AE=A4=E9=A2=86=3D1=20=EF=BC=8C=E5=B7=B2=E8=AE=A4=E9=A2=86?= =?UTF-8?q?=E9=87=91=E9=A2=9D=EF=BC=88yrlje=EF=BC=89=3D=E9=87=91=E9=A2=9D?= =?UTF-8?q?=EF=BC=88je=EF=BC=89=EF=BC=8C=E6=9C=AA=E8=AE=A4=E9=A2=86?= =?UTF-8?q?=E9=87=91=E9=A2=9D=EF=BC=88wrlje=EF=BC=89=3D0=202.=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E6=97=A0=E6=B3=95=E5=8C=B9=E9=85=8D=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=EF=BC=8C=E5=88=99=E5=B0=86=E6=98=AF=E5=90=A6=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=AE=A4=E9=A2=86=EF=BC=88sfxtzdrl=EF=BC=89?= =?UTF-8?q?=3D0=EF=BC=8C=E5=B7=B2=E8=AE=A4=E9=A2=86=E9=87=91=E9=A2=9D?= =?UTF-8?q?=EF=BC=88yrlje=EF=BC=89=3D0=20=EF=BC=8C=E6=9C=AA=E8=AE=A4?= =?UTF-8?q?=E9=A2=86=E9=87=91=E9=A2=9D=EF=BC=88wrlje=EF=BC=89=3D=E9=87=91?= =?UTF-8?q?=E9=A2=9D=EF=BC=88je=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../timer/SyncCBSAccountDetailsJob.java | 28 +++++++++++++++++++ .../salary/timer/SyncCBSPayDetailsJob.java | 22 +++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/src/com/engine/salary/timer/SyncCBSAccountDetailsJob.java b/src/com/engine/salary/timer/SyncCBSAccountDetailsJob.java index c13733c..e487961 100644 --- a/src/com/engine/salary/timer/SyncCBSAccountDetailsJob.java +++ b/src/com/engine/salary/timer/SyncCBSAccountDetailsJob.java @@ -223,6 +223,7 @@ public class SyncCBSAccountDetailsJob extends BaseCronJob { }}; String hkr = ""; + String je = ""; for (EBS2ECConfig.Table.Field field : table.getFields()) { //数据库字段 String fieldName = field.getKey(); @@ -235,6 +236,11 @@ public class SyncCBSAccountDetailsJob extends BaseCronJob { if ("hkr".equals(fieldName)) { hkr = value; } + + //金额 + if ("je".equals(fieldName)) { + je = value; + } } //业务逻辑字段，收款类型，默认是银行存款 @@ -260,6 +266,12 @@ public class SyncCBSAccountDetailsJob extends BaseCronJob { fields.add("sfxtzdrl"); values.add(1); + //是否系统自动认领=1 ，已认领金额(yrlje)=金额(je)，未认领金额(wrlje)=0 + fields.add("yrlje"); + values.add(String.format("'%s'", je)); + fields.add("wrlje"); + values.add(String.format("'%s'", 0)); + //办事处 fields.add("szbm"); values.add(String.format("'%s'", "1412")); @@ -290,6 +302,12 @@ public class SyncCBSAccountDetailsJob extends BaseCronJob { fields.add("sfxtzdrl"); values.add(1); + //是否系统自动认领=1 ，已认领金额(yrlje)=金额(je)，未认领金额(wrlje)=0 + fields.add("yrlje"); + values.add(String.format("'%s'", je)); + fields.add("wrlje"); + values.add(String.format("'%s'", 0)); + //办事处 fields.add("szbm"); List bmbmList = Arrays.stream(bmbms.split(",")).map(departmentMap::get).filter(StrUtil::isNotBlank).collect(Collectors.toList()); @@ -303,6 +321,16 @@ public class SyncCBSAccountDetailsJob extends BaseCronJob { //未认领 fields.add("zt"); values.add(0); + + //是否系统认领 + fields.add("sfxtzdrl"); + values.add(0); + + //是否系统自动认领(sfxtzdrl)=0，已认领金额(yrlje)=0 ，未认领金额(wrlje)=金额(je) + fields.add("yrlje"); + values.add(String.format("'%s'", 0)); + fields.add("wrlje"); + values.add(String.format("'%s'", je)); } String sql = String.format("insert into %s (%s) values (%s)", tableName, String.join(",", fields), values.stream().map(Object::toString).collect(Collectors.joining(","))); diff --git a/src/com/engine/salary/timer/SyncCBSPayDetailsJob.java b/src/com/engine/salary/timer/SyncCBSPayDetailsJob.java index 8369d34..d17ceeb 100644 --- a/src/com/engine/salary/timer/SyncCBSPayDetailsJob.java +++ b/src/com/engine/salary/timer/SyncCBSPayDetailsJob.java @@ -281,6 +281,7 @@ public class SyncCBSPayDetailsJob extends BaseCronJob { }}; String hkr = ""; + String je = ""; for (EBS2ECConfig.Table.Field field : table.getFields()) { //数据库字段 String fieldName = field.getKey(); @@ -293,6 +294,11 @@ public class SyncCBSPayDetailsJob extends BaseCronJob { if ("hkr".equals(fieldName)) { hkr = value; } + + //金额 + if ("je".equals(fieldName)) { + je = value; + } } //业务逻辑字段，收款类型 @@ -326,6 +332,12 @@ public class SyncCBSPayDetailsJob extends BaseCronJob { fields.add("sfxtzdrl"); values.add(1); + //是否系统自动认领=1 ，已认领金额(yrlje)=金额(je)，未认领金额(wrlje)=0 + fields.add("yrlje"); + values.add(String.format("'%s'", je)); + fields.add("wrlje"); + values.add(String.format("'%s'", 0)); + //办事处 fields.add("szbm"); List bmbmList = Arrays.stream(bmbms.split(",")).map(departmentMap::get).filter(StrUtil::isNotBlank).collect(Collectors.toList()); @@ -334,6 +346,16 @@ public class SyncCBSPayDetailsJob extends BaseCronJob { //未认领 fields.add("zt"); values.add(0); + + //是否系统认领 + fields.add("sfxtzdrl"); + values.add(0); + + //是否系统自动认领(sfxtzdrl)=0，已认领金额(yrlje)=0 ，未认领金额(wrlje)=金额(je) + fields.add("yrlje"); + values.add(String.format("'%s'", 0)); + fields.add("wrlje"); + values.add(String.format("'%s'", je)); } } else { //未认领