修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseBankVo.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.base.api.basemanufacturer;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class BaseBankVo implements Vo {
+
+    @ApiModelProperty(value = "银行账号")
+    private String bankAccount;
+    @ApiModelProperty(value = "开户行")
+    private String depositBank;
+    @ApiModelProperty(value = "供应商")
+    private String manufacturerName;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java

@@ -14,19 +14,6 @@ import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
-/**
- * Project: anrui-base(安瑞基础信息模块) <br/>
- * File: BaseManufacturerFeign.java <br/>
- * Class: com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign <br/>
- * Description: 供应厂商信息. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-09-10 11:31:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "供应厂商信息")
 @FeignClient(
         contextId = "anrui-base-BaseManufacturer",
@@ -77,6 +64,11 @@ public interface BaseManufacturerFeign {
     @ResponseBody
     public ResultBean<List<BaseManufacturerVo>> getGysTypeByOrgSid(@RequestParam("orgSid") String orgSid, @RequestParam("supplierType") String supplierType);
 
+    @ApiOperation("根据分公司和分类获取开户行信息")
+    @PostMapping("/getKhhByOrgSid")
+    @ResponseBody
+    public ResultBean<List<BaseBankVo>> getKhhByOrgSid(@RequestParam("orgSid") String orgSid, @RequestParam("supplierType") String supplierType);
+
     /**
      * 生成厂商开户行信息到供应商
      *

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java

@@ -8,19 +8,6 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 import java.util.Map;
 
-/**
- * Project: anrui-base(安瑞基础信息模块) <br/>
- * File: BaseManufacturerFeignFallback.java <br/>
- * Class: com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeignFallback <br/>
- * Description: 供应厂商信息. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-09-10 11:31:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Component
 public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
 
@@ -45,6 +32,11 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<BaseBankVo>> getKhhByOrgSid(String orgSid, String supplierType) {
+        return null;
+    }
+
     @Override
     public ResultBean copyManBankToGys(String orgSid) {
         return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerVo.java

@@ -1,25 +1,11 @@
 package com.yxt.anrui.base.api.basemanufacturer;
 
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: anrui-base(安瑞基础信息模块) <br/>
- * File: BaseManufacturerVo.java <br/>
- * Class: com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerVo <br/>
- * Description: 供应厂商信息 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-09-10 11:31:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @ApiModel(value = "供应厂商信息 视图数据对象", description = "供应厂商信息 视图数据对象")
 @Data
 public class BaseManufacturerVo implements Vo {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java

@@ -155,4 +155,6 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
 
     @Select("SELECT * FROM base_manufacturer WHERE manufacturerCode = #{supplierCode}")
     BaseManufacturerDetailsVo fetchByCode(String supplierCode);
+
+    List<BaseBankVo> getKhhByOrgSid(@Param("orgSid") String orgSid,@Param("supplierType") String supplierType);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml

@@ -352,4 +352,15 @@
         left join base_vehicle_brand bb on bb.manufacturerSid = bm.sid
         where bm.supplierType = '0001' and bm.isDelete = 0 and bb.useOrg like concat('%',#{orgSid},'%')
     </select>
+
+    <select id="getKhhByOrgSid" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseBankVo">
+        SELECT bb.bankAccount,
+               bb.depositBank,
+               b.manufacturerName
+        FROM base_manufacturer_bank bb
+                 LEFT JOIN base_manufacturer b
+                           ON bb.manufacturerSid = b.sid
+        WHERE b.createOrg = #{orgSid}
+          AND b.supplierType = #{supplierType}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java

@@ -24,19 +24,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-/**
- * Project: anrui-base(安瑞基础信息模块) <br/>
- * File: BaseManufacturerFeignFallback.java <br/>
- * Class: com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerRest <br/>
- * Description: 供应厂商信息. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-09-10 11:31:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "供应厂商信息")
 @Controller
 @RequestMapping("v1/basemanufacturer")
@@ -96,6 +83,11 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
         return baseManufacturerService.getGysTypeByOrgSid(orgSid, supplierType);
     }
 
+    @Override
+    public ResultBean<List<BaseBankVo>> getKhhByOrgSid(String orgSid, String supplierType) {
+        return baseManufacturerService.getKhhByOrgSid(orgSid, supplierType);
+    }
+
     @Override
     public ResultBean copyManBankToGys(String orgSid) {
         return baseManufacturerService.copyManBankToGys(orgSid);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

@@ -831,4 +831,10 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         BaseManufacturerDetailsVo baseManufacturerDetailsVo = baseMapper.fetchByCode(supplierCode);
         return rb.success().setData(baseManufacturerDetailsVo);
     }
+
+    public ResultBean<List<BaseBankVo>> getKhhByOrgSid(String orgSid, String supplierType) {
+        ResultBean rb = ResultBean.fireFail();
+        List<BaseBankVo> baseBankVoList = baseMapper.getKhhByOrgSid(orgSid, supplierType);
+        return rb.success().setData(baseBankVoList);
+    }
 }