diff --git a/src/com/engine/salary/timer/SyncCBSAccountDetailsJob.java b/src/com/engine/salary/timer/SyncCBSAccountDetailsJob.java index b2c7fa5..d130faa 100644 --- a/src/com/engine/salary/timer/SyncCBSAccountDetailsJob.java +++ b/src/com/engine/salary/timer/SyncCBSAccountDetailsJob.java @@ -132,17 +132,17 @@ public class SyncCBSAccountDetailsJob extends BaseCronJob { requestParam.setEndDate(nowDate); } requestParam.setLoanType(loanType); - requestParam.setPaymentNatureList(paymentNatureList == null ? null :Arrays.stream(paymentNatureList.split(",")).collect(Collectors.toList())); + requestParam.setPaymentNatureList(paymentNatureList == null ? null : Arrays.stream(paymentNatureList.split(",")).collect(Collectors.toList())); requestParam.setDateType(dateType); - requestParam.setAccountNoList(accountNoList== null ? null :Arrays.stream(accountNoList.split(",")).collect(Collectors.toList())); - requestParam.setBankTypeList(bankTypeList== null ? null :Arrays.stream(bankTypeList.split(",")).collect(Collectors.toList())); - requestParam.setCurrencyList(currencyList== null ? null :Arrays.stream(currencyList.split(",")).collect(Collectors.toList())); + requestParam.setAccountNoList(accountNoList == null ? null : Arrays.stream(accountNoList.split(",")).collect(Collectors.toList())); + requestParam.setBankTypeList(bankTypeList == null ? null : Arrays.stream(bankTypeList.split(",")).collect(Collectors.toList())); + requestParam.setCurrencyList(currencyList == null ? null : Arrays.stream(currencyList.split(",")).collect(Collectors.toList())); requestParam.setDetailedSources(detailedSources); requestParam.setCurrentFlag(currentFlag); - requestParam.setAccountNatureList(accountNatureList== null ? null :Arrays.stream(accountNatureList.split(",")).collect(Collectors.toList())); + requestParam.setAccountNatureList(accountNatureList == null ? null : Arrays.stream(accountNatureList.split(",")).collect(Collectors.toList())); requestParam.setBankSerialNumber(bankSerialNumber); requestParam.setTransactionSerialNumber(transactionSerialNumber); - requestParam.setUnitCodeList(unitCodeList== null ? null :Arrays.stream(unitCodeList.split(",")).collect(Collectors.toList())); + requestParam.setUnitCodeList(unitCodeList == null ? null : Arrays.stream(unitCodeList.split(",")).collect(Collectors.toList())); requestParam.setErpSerialNumber(erpSerialNumber); //查询前1000条数据 @@ -217,7 +217,7 @@ public class SyncCBSAccountDetailsJob extends BaseCronJob { add(String.format("'%s'", currDate)); add(String.format("'%s'", currTime)); }}; - + String hkr = ""; for (EBS2ECConfig.Table.Field field : table.getFields()) { //数据库字段 @@ -225,14 +225,14 @@ public class SyncCBSAccountDetailsJob extends BaseCronJob { fields.add(fieldName); // 接口值 String value = detailMap.getOrDefault(field.getEbsKey(), ""); - values.add(String.format("'%s'", detailMap.getOrDefault(field.getEbsKey(), ""))); - + values.add(String.format("'%s'", value)); + //汇款人 if ("hkr".equals(fieldName)) { hkr = value; } } - + //业务逻辑字段,收款类型,默认是银行存款 fields.add("sklx"); values.add(0); @@ -244,7 +244,7 @@ public class SyncCBSAccountDetailsJob extends BaseCronJob { * 如对照标准无数据,则状态为:未认领; */ Integer departmentId = customerDepartmentMap.get(hkr); - if(departmentId!=null){ + if (departmentId != null) { //认领 fields.add("zt"); values.add(1); @@ -255,8 +255,8 @@ public class SyncCBSAccountDetailsJob extends BaseCronJob { //办事处 fields.add("szbm"); - values.add(departmentId); - }else { + values.add(String.format("'%s'", departmentId)); + } else { //未认领 fields.add("zt"); values.add(0); diff --git a/src/com/engine/salary/timer/SyncCBSBillPoolJob.java b/src/com/engine/salary/timer/SyncCBSBillPoolJob.java index c78142f..ddd5bb7 100644 --- a/src/com/engine/salary/timer/SyncCBSBillPoolJob.java +++ b/src/com/engine/salary/timer/SyncCBSBillPoolJob.java @@ -167,13 +167,13 @@ public class SyncCBSBillPoolJob extends BaseCronJob { } requestParam.setHoldAccountList(Arrays.stream(holdAccountList.split(",")).collect(Collectors.toList())); - if (StrUtil.isNotBlank(issueDateStart) && StrUtil.isNotBlank(issueDateEnd)) { - requestParam.setIssueDateStart(issueDateStart); - requestParam.setIssueDateEnd(issueDateEnd); + if (StrUtil.isNotBlank(holdSignDateStart) && StrUtil.isNotBlank(holdSignDateEnd)) { + requestParam.setHoldSignDateStart(holdSignDateStart); + requestParam.setHoldSignDateEnd(holdSignDateEnd); } else { String nowDate = LocalDate.now().toString(); - requestParam.setIssueDateStart(nowDate); - requestParam.setIssueDateEnd(nowDate); + requestParam.setHoldSignDateStart(nowDate); + requestParam.setHoldSignDateEnd(nowDate); } //系统票据类型 @@ -184,8 +184,8 @@ public class SyncCBSBillPoolJob extends BaseCronJob { requestParam.setBillType(billType); requestParam.setDraftSourceList(draftSourceList==null ? null :Arrays.stream(draftSourceList.split(",")).collect(Collectors.toList())); requestParam.setHoldBankTypeList(holdBankTypeList==null ? null :Arrays.stream(holdBankTypeList.split(",")).collect(Collectors.toList())); - requestParam.setHoldSignDateStart(holdSignDateStart); - requestParam.setHoldSignDateEnd(holdSignDateEnd); + requestParam.setIssueDateStart(issueDateStart); + requestParam.setIssueDateEnd(issueDateEnd); requestParam.setDraftNbr(draftNbr); requestParam.setBillNbr(billNbr); requestParam.setBillAmountStart(billAmountStart); diff --git a/src/com/engine/salary/timer/SyncCBSPayDetailsJob.java b/src/com/engine/salary/timer/SyncCBSPayDetailsJob.java index 8756423..845b1e5 100644 --- a/src/com/engine/salary/timer/SyncCBSPayDetailsJob.java +++ b/src/com/engine/salary/timer/SyncCBSPayDetailsJob.java @@ -173,13 +173,13 @@ public class SyncCBSPayDetailsJob extends BaseCronJob { } requestParam.setHoldAccountList(Arrays.stream(holdAccountList.split(",")).collect(Collectors.toList())); - if (StrUtil.isNotBlank(issueDateStart) && StrUtil.isNotBlank(issueDateEnd)) { - requestParam.setIssueDateStart(issueDateStart); - requestParam.setIssueDateEnd(issueDateEnd); + if (StrUtil.isNotBlank(holdSignDateStart) && StrUtil.isNotBlank(holdSignDateEnd)) { + requestParam.setHoldSignDateStart(holdSignDateStart); + requestParam.setHoldSignDateEnd(holdSignDateEnd); } else { String nowDate = LocalDate.now().toString(); - requestParam.setIssueDateStart(nowDate); - requestParam.setIssueDateEnd(nowDate); + requestParam.setHoldSignDateStart(nowDate); + requestParam.setHoldSignDateEnd(nowDate); } //系统票据类型 @@ -190,8 +190,8 @@ public class SyncCBSPayDetailsJob extends BaseCronJob { requestParam.setBillType(billType); requestParam.setDraftSourceList(draftSourceList==null ? null :Arrays.stream(draftSourceList.split(",")).collect(Collectors.toList())); requestParam.setHoldBankTypeList(holdBankTypeList==null ? null :Arrays.stream(holdBankTypeList.split(",")).collect(Collectors.toList())); - requestParam.setHoldSignDateStart(holdSignDateStart); - requestParam.setHoldSignDateEnd(holdSignDateEnd); + requestParam.setIssueDateStart(issueDateStart); + requestParam.setIssueDateEnd(issueDateEnd); requestParam.setDraftNbr(draftNbr); requestParam.setBillNbr(billNbr); requestParam.setBillAmountStart(billAmountStart); @@ -314,7 +314,7 @@ public class SyncCBSPayDetailsJob extends BaseCronJob { //办事处 fields.add("szbm"); - values.add(departmentId); + values.add(String.format("'%s'", departmentId)); }else { //未认领 fields.add("zt");