diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdSupplierOpenBankController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdSupplierOpenBankController.java index 13463608..d413a2ce 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdSupplierOpenBankController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdSupplierOpenBankController.java @@ -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 add(@Validated(AddGroup.class) @RequestBody List bo) { + public R add(XzdSupplierOpenBankBo bo) { return xzdSupplierOpenBankService.insertByBo(bo); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdYhxx.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdYhxx.java index 9fdd9fe4..6f187d35 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdYhxx.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdYhxx.java @@ -38,6 +38,11 @@ public class XzdYhxx extends BaseEntity { */ private Long yhId; + /** + * 开户账号 + */ + private String account; + /** * 是否默认0否1是 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdYhxxBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdYhxxBo.java index d4650493..702faffa 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdYhxxBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdYhxxBo.java @@ -32,6 +32,11 @@ public class XzdYhxxBo extends BaseEntity { */ private Long yhId; + /** + * 开户账号 + */ + private String account; + /** * 是否默认0否1是 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdYhxxVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdYhxxVo.java index 3c9af54b..e8d1fcb8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdYhxxVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdYhxxVo.java @@ -43,6 +43,11 @@ public class XzdYhxxVo implements Serializable { @ExcelProperty(value = "银行id") private Long yhId; + /** + * 开户账号 + */ + private String account; + /** * 是否默认0否1是 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdSupplierOpenBankService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdSupplierOpenBankService.java index b0764f1e..eed8a167 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdSupplierOpenBankService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdSupplierOpenBankService.java @@ -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 insertByBo(List bo); + R insertByBo(XzdSupplierOpenBankBo bo); /** * 修改供应商信息-开户银行 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 16151447..49cad115 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 @@ -286,6 +286,7 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl insertByBo(List bo) { + public R insertByBo(XzdSupplierOpenBankBo bo) { - XzdSupplierOpenBank temp = new XzdSupplierOpenBank(); + XzdSupplierOpenBank add = MapstructUtils.convert(bo, XzdSupplierOpenBank.class); - for (XzdSupplierOpenBankBo bankBo : bo) { - XzdSupplierOpenBank add = MapstructUtils.convert(bankBo, XzdSupplierOpenBank.class); + validEntityBeforeSave(add); - validEntityBeforeSave(add); - - boolean flag = baseMapper.insert(add) > 0; - if (!flag) { - return R.fail(); - } - - if (add.getIsDefault().equals("1")){ - temp = add; - } + boolean flag = baseMapper.insert(add) > 0; + if (!flag) { + return R.fail(); } - return R.ok(temp); +// 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(add); } /**