From 3d85b10475b745ae11bc06cec728a84779eccab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com> Date: Thu, 20 Nov 2025 20:00:03 +0800 Subject: [PATCH] =?UTF-8?q?11-20-=E6=94=B9=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/XzdSupplierInfoController.java | 28 +++++- .../dromara/xzd/domain/XzdSettlementInfo.java | 4 +- .../xzd/mapper/XzdSupplierInfoMapper.java | 8 +- ...ContractProgressSettlementServiceImpl.java | 18 ++-- .../impl/XzdSupplierInfoServiceImpl.java | 95 +++++++++---------- .../mapper/xzd/XzdSupplierInfoMapper.xml | 9 +- 6 files changed, 89 insertions(+), 73 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdSupplierInfoController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdSupplierInfoController.java index e86a6b86..23ba0af2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdSupplierInfoController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdSupplierInfoController.java @@ -18,11 +18,13 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; import org.dromara.xzd.domain.bo.XzdProjectBo; import org.dromara.xzd.domain.bo.XzdSupplierInfoBo; -import org.dromara.xzd.domain.vo.XzdCustomertypeVo; -import org.dromara.xzd.domain.vo.XzdProjectVo; -import org.dromara.xzd.domain.vo.XzdSupplierInfoVo; +import org.dromara.xzd.domain.bo.XzdSupplierOpenBankBo; +import org.dromara.xzd.domain.bo.XzdYhxxBo; +import org.dromara.xzd.domain.vo.*; import org.dromara.xzd.service.IXzdProjectService; import org.dromara.xzd.service.IXzdSupplierInfoService; +import org.dromara.xzd.service.IXzdSupplierOpenBankService; +import org.dromara.xzd.service.IXzdYhxxService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -42,6 +44,8 @@ public class XzdSupplierInfoController extends BaseController { private final IXzdSupplierInfoService xzdSupplierInfoService; private final IXzdProjectService xzdProjectService; + private final IXzdSupplierOpenBankService xzdSupplierOpenBankService; + private final IXzdYhxxService xzdYhxxService; /** * 查询供应商信息列表 @@ -140,4 +144,22 @@ public class XzdSupplierInfoController extends BaseController { return R.ok(xzdProjectService.queryById(id)); } + /** + * 查询银行数据关联列表 + */ + @SaCheckPermission(value = {"xzd:supplierInfo:add", "xzd:supplierInfo:edit", "xzd:supplierInfo:list"}, mode = SaMode.OR) + @GetMapping("/supplierBankList") + public TableDataInfo list(XzdYhxxBo bo, PageQuery pageQuery) { + return xzdYhxxService.queryPageList(bo, pageQuery); + } + + /** + * 查询银行列表 + */ + @SaCheckPermission(value = {"xzd:supplierInfo:add", "xzd:supplierInfo:edit", "xzd:supplierInfo:list"}, mode = SaMode.OR) + @GetMapping("/bankList") + public TableDataInfo list(XzdSupplierOpenBankBo bo, PageQuery pageQuery) { + return xzdSupplierOpenBankService.queryPageList(bo, pageQuery); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSettlementInfo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSettlementInfo.java index c45731bf..f05c88b4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSettlementInfo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSettlementInfo.java @@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; import java.io.Serial; import java.math.BigDecimal; @@ -152,7 +150,7 @@ public class XzdSettlementInfo extends BaseEntity { * 开户银行信息 */ @TableField(exist = false) - private List openBanks; + private List openBanks; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdSupplierInfoMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdSupplierInfoMapper.java index 35aec25b..e4ce6073 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdSupplierInfoMapper.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdSupplierInfoMapper.java @@ -1,13 +1,11 @@ package org.dromara.xzd.mapper; -import org.apache.ibatis.annotations.Mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; -import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.xzd.domain.XzdSupplierInfo; import org.dromara.xzd.domain.bo.XzdSupplierInfoBo; import org.dromara.xzd.domain.vo.XzdSupplierInfoVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import java.util.List; @@ -19,7 +17,7 @@ import java.util.List; */ public interface XzdSupplierInfoMapper extends BaseMapperPlus { - List search(@Param("bo")XzdSupplierInfoBo bo); + List search(@Param("bo")XzdSupplierInfoBo bo, @Param("page") IPage page); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractProgressSettlementServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractProgressSettlementServiceImpl.java index 0ef5b266..198f04e5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractProgressSettlementServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractProgressSettlementServiceImpl.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.event.ProcessDeleteEvent; import org.dromara.common.core.domain.event.ProcessEvent; import org.dromara.common.core.domain.event.ProcessTaskEvent; @@ -22,7 +21,6 @@ import org.dromara.system.service.impl.SysOssServiceImpl; import org.dromara.xzd.domain.XzdBusinessChange; import org.dromara.xzd.domain.XzdContractProgressSettlement; import org.dromara.xzd.domain.bo.XzdContractProgressSettlementBo; -import org.dromara.xzd.domain.dto.QuerCorrespondentDto; import org.dromara.xzd.domain.vo.*; import org.dromara.xzd.mapper.XzdContractProgressSettlementMapper; import org.dromara.xzd.service.IXzdContractProgressSettlementService; @@ -483,14 +481,14 @@ public class XzdContractProgressSettlementServiceImpl extends ServiceImpl byid = iXzdCorrespondentList.getCustomerByid(vo.getSettlementUnit()); - if (byid != null) { - if (byid.getData().getXzdCustomerinformation() != null) { - vo.setSettlementUnitName(byid.getData().getXzdCustomerinformation().getUnitName()); - } - } - } +// if (vo.getSettlementUnit() != null) { +// R byid = iXzdCorrespondentList.getCustomerByid(vo.getSettlementUnit()); +// if (byid != null) { +// if (byid.getData().getXzdCustomerinformation() != null) { +// vo.setSettlementUnitName(byid.getData().getXzdCustomerinformation().getUnitName()); +// } +// } +// } //用印信息 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(XzdBusinessChange::getContractChangeId, vo.getId()); 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 33d97622..6f78968e 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 @@ -22,7 +22,6 @@ import org.dromara.system.service.impl.SysOssServiceImpl; import org.dromara.system.service.impl.SysUserServiceImpl; import org.dromara.xzd.domain.*; import org.dromara.xzd.domain.bo.XzdSupplierInfoBo; -import org.dromara.xzd.domain.bo.XzdYhxxBo; import org.dromara.xzd.domain.vo.XzdCustomertypeVo; import org.dromara.xzd.domain.vo.XzdSupplierInfoVo; import org.dromara.xzd.mapper.XzdSupplierInfoMapper; @@ -132,14 +131,11 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl xzdSupplierInfoVos = baseMapper.search(bo); + List xzdSupplierInfoVos = baseMapper.search(bo,pageQuery.build()); -// LambdaQueryWrapper lqw = buildQueryWrapper(bo); -// Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); -// setValue(result.getRecords()); return TableDataInfo.build(xzdSupplierInfoVos); } @@ -286,16 +282,18 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl() - .eq(XzdSupplierOpenBank::getOpenBank, xzdYhxx.getOpenBank()).eq(XzdSupplierOpenBank::getBranchName,xzdYhxx.getBranchName())); - if (openBank != null) { - vo.setKhyh(openBank.getOpenBank()); - vo.setKhhzh(xzdYhxx.getAccount()); - vo.setKhhhm(openBank.getOpenBank()); - } +// XzdSupplierOpenBank openBank = xzdSupplierOpenBankService.getBaseMapper().selectOne(new LambdaQueryWrapper() +// .eq(XzdSupplierOpenBank::getOpenBank, xzdYhxx.getOpenBank()).eq(XzdSupplierOpenBank::getBranchName,xzdYhxx.getBranchName())); +// if (openBank != null) { +// vo.setKhyh(openBank.getOpenBank()); +// vo.setKhhzh(xzdYhxx.getAccount()); +// vo.setKhhhm(openBank.getPersonName()); +// } + vo.setKhyh(xzdYhxx.getOpenBank()); + vo.setKhhzh(xzdYhxx.getAccount()); + vo.setKhhhm(xzdYhxx.getKhhm()); } bankLambdaQueryWrapper.clear(); bankLambdaQueryWrapper.eq(XzdYhxx::getMainId,vo.getId()); List xzdYhxxList = xzdYhxxService.list(bankLambdaQueryWrapper); - if (xzdYhxxList!= null && !xzdYhxxList.isEmpty()) { - List openBanks = new ArrayList<>(); - for (XzdYhxx yhxx : xzdYhxxList) { - XzdSupplierOpenBank byId = xzdSupplierOpenBankService.getBaseMapper().selectOne(new LambdaQueryWrapper() - .eq(XzdSupplierOpenBank::getOpenBank, xzdYhxx.getOpenBank()).eq(XzdSupplierOpenBank::getBranchName,xzdYhxx.getBranchName())); - if (byId != null){ - byId.setAccount(yhxx.getAccount()); - byId.setIsDefault(yhxx.getSfmr()); - byId.setPersonName(yhxx.getKhhm()); - openBanks.add(byId); - } - } - vo.getSettlement().setOpenBanks(openBanks); - } + vo.getSettlement().setOpenBanks(xzdYhxxList); +// if (xzdYhxxList!= null && !xzdYhxxList.isEmpty()) { +// List openBanks = new ArrayList<>(); +// for (XzdYhxx yhxx : xzdYhxxList) { +// XzdSupplierOpenBank byId = xzdSupplierOpenBankService.getBaseMapper().selectOne(new LambdaQueryWrapper() +// .eq(XzdSupplierOpenBank::getOpenBank, xzdYhxx.getOpenBank()).eq(XzdSupplierOpenBank::getBranchName,xzdYhxx.getBranchName())); +// if (byId != null){ +// byId.setAccount(yhxx.getAccount()); +// byId.setIsDefault(yhxx.getSfmr()); +// byId.setPersonName(yhxx.getKhhm()); +// openBanks.add(byId); +// } +// } +// 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/resources/mapper/xzd/XzdSupplierInfoMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml index 41da1d14..452d1682 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml @@ -12,8 +12,9 @@ # settlement.account_number as khhzh, info.city_code as cityCode, info.shzt as shzt, - bank.open_bank as khyh, + yhxx.open_bank as khyh, yhxx.account as khhzh, + yhxx.khhm as khhhm, supplement.creator as createByUser, info.create_time as createTime, info.update_time as updateTime, @@ -103,9 +104,9 @@ ORDER BY info.create_time DESC - - LIMIT #{bo.pageSize} OFFSET #{bo.offset} - + + +