lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11-14-修改银行

Browse Source
This commit is contained in:
青云
2025-11-14 11:13:33 +08:00
parent 90b0eb82f4
commit 3e85e79bdd
7 changed files with 75 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdSupplierOpenBankController.java
View File

@ -1,27 +1,27 @@
package org.dromara.xzd.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.xzd.domain.XzdSupplierOpenBank;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.xzd.domain.vo.XzdSupplierOpenBankVo;
import org.dromara.xzd.domain.bo.XzdSupplierOpenBankBo;
import org.dromara.xzd.service.IXzdSupplierOpenBankService;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.xzd.domain.XzdSupplierOpenBank;
import org.dromara.xzd.domain.bo.XzdSupplierOpenBankBo;
import org.dromara.xzd.domain.vo.XzdSupplierOpenBankVo;
import org.dromara.xzd.service.IXzdSupplierOpenBankService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 供应商信息-开户银行
@ -76,7 +76,7 @@ public class XzdSupplierOpenBankController extends BaseController {
@Log(title = "供应商信息-开户银行", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<XzdSupplierOpenBank> add(@Validated(AddGroup.class) @RequestBody List<XzdSupplierOpenBankBo> bo) {
public R<XzdSupplierOpenBank> add(XzdSupplierOpenBankBo bo) {
return xzdSupplierOpenBankService.insertByBo(bo);
}

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdYhxx.java
View File

@ -38,6 +38,11 @@ public class XzdYhxx extends BaseEntity {
*/
private Long yhId;
/**
* 开户账号
*/
private String account;
/**
* 是否默认0否1是
*/

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdYhxxBo.java
View File

@ -32,6 +32,11 @@ public class XzdYhxxBo extends BaseEntity {
*/
private Long yhId;
/**
* 开户账号
*/
private String account;
/**
* 是否默认0否1是
*/

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdYhxxVo.java
View File

@ -43,6 +43,11 @@ public class XzdYhxxVo implements Serializable {
@ExcelProperty(value = "银行id")
private Long yhId;
/**
* 开户账号
*/
private String account;
/**
* 是否默认0否1是
*/

16
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdSupplierOpenBankService.java
View File

@ -1,13 +1,13 @@
package org.dromara.xzd.service;
import org.dromara.common.core.domain.R;
import org.dromara.xzd.domain.vo.XzdSupplierOpenBankVo;
import org.dromara.xzd.domain.bo.XzdSupplierOpenBankBo;
import org.dromara.xzd.domain.XzdSupplierOpenBank;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.common.core.domain.R;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.xzd.domain.XzdSupplierOpenBank;
import org.dromara.xzd.domain.bo.XzdSupplierOpenBankBo;
import org.dromara.xzd.domain.vo.XzdSupplierOpenBankVo;
import java.util.Collection;
import java.util.List;
@ -50,7 +50,7 @@ public interface IXzdSupplierOpenBankService extends IService<XzdSupplierOpenBan
* @param bo 供应商信息-开户银行
* @return 是否新增成功
*/
R<XzdSupplierOpenBank> insertByBo(List<XzdSupplierOpenBankBo> bo);
R<XzdSupplierOpenBank> insertByBo(XzdSupplierOpenBankBo bo);
/**
* 修改供应商信息-开户银行

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java
View File

@ -286,6 +286,7 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMappe
xzdYhxxBo.setYhId(bank.getId());
xzdYhxxBo.setMainId(add.getId());
xzdYhxxBo.setSfmr(bank.getIsDefault());
xzdYhxxBo.setAccount(bank.getAccount());
xzdYhxxService.insertByBo(xzdYhxxBo);
}
}
@ -866,7 +867,7 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMappe
XzdSupplierOpenBank openBank = xzdSupplierOpenBankService.getById(xzdYhxx.getYhId());
if (openBank != null) {
vo.setKhyh(openBank.getOpenBank());
vo.setKhhzh(openBank.getAccount());
vo.setKhhzh(xzdYhxx.getAccount());
vo.setKhhhm(openBank.getOpenBank());
} else {
vo.setKhyh("暂无数据");

46
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierOpenBankServiceImpl.java
View File

@ -2,30 +2,29 @@ package org.dromara.xzd.service.impl;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.service.XzdSupplierOpenBankService;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.xzd.settlement.domain.vo.XzdJsCgJungonVo;
import org.springframework.stereotype.Service;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.xzd.domain.XzdSupplierOpenBank;
import org.dromara.xzd.domain.bo.XzdSupplierOpenBankBo;
import org.dromara.xzd.domain.vo.XzdSupplierOpenBankVo;
import org.dromara.xzd.domain.XzdSupplierOpenBank;
import org.dromara.xzd.mapper.XzdSupplierOpenBankMapper;
import org.dromara.xzd.service.IXzdSupplierOpenBankService;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 供应商信息-开户银行Service业务层处理
@ -97,12 +96,9 @@ public class XzdSupplierOpenBankServiceImpl extends ServiceImpl<XzdSupplierOpenB
* @return 是否新增成功
*/
@Override
public R<XzdSupplierOpenBank> insertByBo(List<XzdSupplierOpenBankBo> bo) {
public R<XzdSupplierOpenBank> insertByBo(XzdSupplierOpenBankBo bo) {
XzdSupplierOpenBank temp = new XzdSupplierOpenBank();
for (XzdSupplierOpenBankBo bankBo : bo) {
XzdSupplierOpenBank add = MapstructUtils.convert(bankBo, XzdSupplierOpenBank.class);
XzdSupplierOpenBank add = MapstructUtils.convert(bo, XzdSupplierOpenBank.class);
validEntityBeforeSave(add);
@ -111,12 +107,24 @@ public class XzdSupplierOpenBankServiceImpl extends ServiceImpl<XzdSupplierOpenB
return R.fail();
}
if (add.getIsDefault().equals("1")){
temp = add;
}
}
// XzdSupplierOpenBank temp = new XzdSupplierOpenBank();
//
// for (XzdSupplierOpenBankBo bankBo : bo) {
// XzdSupplierOpenBank add = MapstructUtils.convert(bankBo, XzdSupplierOpenBank.class);
//
// validEntityBeforeSave(add);
//
// boolean flag = baseMapper.insert(add) > 0;
// if (!flag) {
// return R.fail();
// }
//
// if (add.getIsDefault().equals("1")){
// temp = add;
// }
// }
return R.ok(temp);
return R.ok(add);
}
/**