diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java index 73acfab5..df6669aa 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java @@ -379,7 +379,7 @@ public class XzdContractAccountServiceImpl extends ServiceImpl byid2 = iXzdCorrespondentList.getCustomerByid(vo.getSupervision()); if (byid2 != null) { if (byid2.getData().getXzdCustomerinformation() != null) { - vo.setOwnerName(byid2.getData().getXzdCustomerinformation().getUnitName()); + vo.setSupervisionName(byid2.getData().getXzdCustomerinformation().getUnitName()); } } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java index 480e1d9b..3941586f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java @@ -81,6 +81,8 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl 0; } + + public void setValue(List vos){ + + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java index 3bafa4c3..90dce5e3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java @@ -758,8 +758,9 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl openBanks = xzdSupplierOpenBankService.list(bankLambdaQueryWrapper); - vo.getSettlement().setOpenBanks(openBanks); - + if (vo.getSettlement() != null && openBanks != null && !openBanks.isEmpty()) { + vo.getSettlement().setOpenBanks(openBanks); + } //处理业务信息 LambdaQueryWrapper businessInfoLambdaQueryWrapper = new LambdaQueryWrapper<>(); businessInfoLambdaQueryWrapper.eq(XzdBusinessInfo::getCustomerinformationId,vo.getId()).eq(XzdBusinessInfo::getType,"2"); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/vo/XzdContractPaymentVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/vo/XzdContractPaymentVo.java index e6827e23..bb7e9656 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/vo/XzdContractPaymentVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/vo/XzdContractPaymentVo.java @@ -70,6 +70,11 @@ public class XzdContractPaymentVo implements Serializable { @ExcelProperty(value = "合同id") private Long contractId; + /** + * 合同名称 + */ + private String contractName; + /** * 合同编码 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/service/impl/XzdContractPaymentServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/service/impl/XzdContractPaymentServiceImpl.java index 836d8612..f166b8ff 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/service/impl/XzdContractPaymentServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/service/impl/XzdContractPaymentServiceImpl.java @@ -297,6 +297,8 @@ public class XzdContractPaymentServiceImpl extends ServiceImpl