From ef93b91e85dd02ad52850191f2b6b57e97d6986c Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Sat, 11 Mar 2023 16:41:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=8E=A5=E5=8F=A3co?= =?UTF-8?q?py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SupplierBankInfoDetailsVo.java | 9 +++-- .../supplierbankinfo/SupplierBankInfoDto.java | 9 +++-- .../SupplierBankInfoFeign.java | 10 +++--- .../SupplierContractInfoDto.java | 4 +-- .../SupplierBankInfoMapper.java | 24 ++++++------- .../SupplierBankInfoRest.java | 21 ++++++++++- .../SupplierBankInfoService.java | 36 ++++++++++++++----- .../supplierindex/SupplierIndexMapper.java | 3 ++ .../supplierindex/SupplierIndexService.java | 4 +++ 9 files changed, 86 insertions(+), 34 deletions(-) diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoDetailsVo.java index 72e2ce19..74f8c5a9 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoDetailsVo.java +++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoDetailsVo.java @@ -32,6 +32,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * Project: supervise(supervise)
* File: SupplierBankInfoVo.java
@@ -81,8 +84,8 @@ public class SupplierBankInfoDetailsVo implements Vo { private String bankRemarks; // 银行审批意见 @ApiModelProperty("营业执照附件") private String[] businessLicenseFiles; // 营业执照附件 - @ApiModelProperty("合同照片") - private String[] contractFiles; // 合同照片 + @ApiModelProperty("第二编码") + private List codeIndex = new ArrayList<>(); // 第二编码 @ApiModelProperty("合同信息") - private SupplierContractInfoDto supplierContractInfoDto; // 合同信息 + private SupplierContractInfoDto contractInfo; // 合同信息 } \ No newline at end of file diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoDto.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoDto.java index c5193249..4da9dc13 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoDto.java +++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoDto.java @@ -32,6 +32,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * Project: supervise(supervise)
* File: SupplierBankInfoDto.java
@@ -81,8 +84,8 @@ public class SupplierBankInfoDto implements Dto { private String bankRemarks; // 银行审批意见 @ApiModelProperty("营业执照附件") private String[] businessLicenseFiles; // 营业执照附件 - @ApiModelProperty("合同照片") - private String[] contractFiles; // 合同照片 + @ApiModelProperty("第二编码") + private List codeIndex = new ArrayList<>(); // 第二编码 @ApiModelProperty("合同信息") - private SupplierContractInfoDto supplierContractInfoDto; // 合同信息 + private SupplierContractInfoDto contractInfo; // 合同信息 } \ No newline at end of file diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoFeign.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoFeign.java index c4e42c52..13369925 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoFeign.java +++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoFeign.java @@ -48,9 +48,9 @@ import org.springframework.web.bind.annotation.*; */ @Api(tags = "供应商信息") @FeignClient( - contextId = "supervise-SupplierBankInfo", - name = "supervise", - path = "v1/supplier", + contextId = "supervise-customer-SupplierBankInfo", + name = "supervise-customer", + path = "v1/supplierbankinfo", fallback = SupplierBankInfoFeignFallback.class) public interface SupplierBankInfoFeign { @@ -60,14 +60,14 @@ public interface SupplierBankInfoFeign { public ResultBean> listPage(@RequestBody PagerQuery pq); @ApiOperation("新增或修改") - @PostMapping("/saveSupplier") + @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody SupplierBankInfoDto dto); @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody - public ResultBean delBySids(@RequestBody String[] sids); + public ResultBean delBySids(@RequestBody String[] sids); @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfoDto.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfoDto.java index 85183973..0e929122 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfoDto.java +++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/suppliercontractinfo/SupplierContractInfoDto.java @@ -66,6 +66,6 @@ public class SupplierContractInfoDto implements Dto { private String contractPrice; // 合同金额 @ApiModelProperty("供应商sid") private String supplierSid; // 供应商sid - - + @ApiModelProperty("合同照片") + private String[] contractFiles; // 合同照片 } \ No newline at end of file diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoMapper.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoMapper.java index 9b63b7fc..61fe6f6f 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoMapper.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoMapper.java @@ -52,24 +52,24 @@ import java.util.Map; @Mapper public interface SupplierBankInfoMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - int delBySids(@Param("list") String[] split); + int delBySids(@Param("list") String[] split); - @Delete("delete from supplier_files where mainSid=#{mainSid} and type=#{type}") - void deleteSupplierFiles(@Param("mainSid")String sid, @Param("type") String type); + @Delete("delete from supplier_files where mainSid=#{mainSid} and type=#{type}") + void deleteSupplierFiles(@Param("mainSid") String sid, @Param("type") String type); - void insertSupplierFiles(List> maps); + void insertSupplierFiles(List> maps); - @Select("select * from supplier_bank_info where sid=#{sid}") - SupplierBankInfo selectBySid(@Param("sid")String sid); + @Select("select * from supplier_bank_info where sid=#{sid}") + SupplierBankInfo selectBySid(@Param("sid") String sid); - @Select("select GROUP_CONCAT(url) url from supplier_files where mainSid=#{mainSid} and type=#{type}") - String selectSupplierFiles(@Param("mainSid")String mainSid, @Param("type") String type); + @Select("select GROUP_CONCAT(url) url from supplier_files where mainSid=#{mainSid} and type=#{type}") + String selectSupplierFiles(@Param("mainSid") String mainSid, @Param("type") String type); - @Select("select * from supplier_bank_info where codeUnified=#{codeUnified}") + @Select("select * from supplier_bank_info where codeUnified=#{codeUnified}") SupplierBankInfo selectByCode(@Param("codeUnified") String codeUnified); - @Insert("insert INTO supplier_index(code, name,PSid) values (#{code},#{name},#{sid})") - void insertSUpplierIndex( @Param("code")String code,@Param("name") String name,@Param("sid")String sid); + @Insert("insert INTO supplier_index(sid, codeUnified, name ,PSid ,code , nameUnified) values (UUID(),#{name},#{codeUnified},#{sid},#{code},#{name})") + void insertSUpplierIndex(@Param("name") String name, @Param("codeUnified") String codeUnified, @Param("sid") String sid, @Param("code") String code); } \ No newline at end of file diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoRest.java index a3dbfe5d..cb926a7f 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoRest.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoRest.java @@ -30,12 +30,17 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.supervise.customer.api.supplierbankinfo.*; import com.yxt.supervise.customer.api.suppliercontractinfo.SupplierContractInfoDto; +import com.yxt.supervise.customer.api.supplierindex.SupplierIndexDetailsVo; import com.yxt.supervise.customer.biz.suppliercontractinfo.SupplierContractInfoService; +import com.yxt.supervise.customer.biz.supplierindex.SupplierIndexService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; +import java.util.List; + /** * Project: supervise(supervise)
* File: SupplierBankInfoFeignFallback.java
@@ -58,6 +63,9 @@ public class SupplierBankInfoRest implements SupplierBankInfoFeign { private SupplierBankInfoService supplierBankInfoService; @Autowired private SupplierContractInfoService supplierContractInfoService; + @Autowired + private SupplierIndexService supplierIndexService; + @Override @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") @@ -91,8 +99,19 @@ public class SupplierBankInfoRest implements SupplierBankInfoFeign { public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); SupplierBankInfoDetailsVo vo = supplierBankInfoService.fetchDetailsVoBySid(sid); + String[] contractFiles = vo.getContractInfo().getContractFiles(); SupplierContractInfoDto supplierContractInfo=supplierContractInfoService.fetchByMainSid(sid); - vo.setSupplierContractInfoDto(supplierContractInfo); + supplierContractInfo.setContractFiles(contractFiles); + vo.setContractInfo(supplierContractInfo); + List supplierIndexDetailsVos = supplierIndexService.fetchDetailsVosBycodeUnified(vo.getCodeUnified()); + List codeIndex = new ArrayList<>(); + for (SupplierIndexDetailsVo supplierIndexDetailsVo : supplierIndexDetailsVos) { + String code = supplierIndexDetailsVo.getCode(); + if (!code.equals(vo.getCodeUnified())){ + codeIndex.add(code); + } + } + vo.setCodeIndex(codeIndex); return rb.success().setData(vo); } } diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java index 5a4e028d..0ec1069d 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java @@ -36,6 +36,7 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.supervise.customer.api.supplierbankinfo.*; import com.yxt.supervise.customer.api.suppliercontractinfo.SupplierContractInfoDto; import com.yxt.supervise.customer.biz.suppliercontractinfo.SupplierContractInfoService; +import com.yxt.supervise.customer.biz.supplierindex.SupplierIndexService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -59,6 +60,9 @@ import java.util.*; public class SupplierBankInfoService extends MybatisBaseService { @Resource private SupplierContractInfoService supplierContractInfoService; + @Resource + private SupplierIndexService supplierIndexService; + private QueryWrapper createQueryWrapper(SupplierBankInfoQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -106,7 +110,13 @@ public class SupplierBankInfoService extends MybatisBaseService codeIndex = dto.getCodeIndex(); + baseMapper.insertSUpplierIndex(entity.getName(),entity.getCodeUnified(),entity.getSid(),entity.getCodeUnified()); + for (String index : codeIndex) { + if (!index.equals(entity.getCodeUnified())){ + baseMapper.insertSUpplierIndex(entity.getName(),entity.getCodeUnified(),entity.getSid(),index); + } + } baseMapper.deleteSupplierFiles(entity.getSid(),"1"); String[] businessLicenseFiles = dto.getBusinessLicenseFiles(); if(businessLicenseFiles!=null){ @@ -124,7 +134,7 @@ public class SupplierBankInfoService extends MybatisBaseService> maps=new ArrayList<>(); for(String s:contractFiles){ @@ -139,7 +149,7 @@ public class SupplierBankInfoService extends MybatisBaseService codeIndex = dto.getCodeIndex(); + baseMapper.insertSUpplierIndex(entity.getName(),entity.getCodeUnified(),dtoSid,entity.getCodeUnified()); + for (String index : codeIndex) { + if (!index.equals(entity.getCodeUnified())){ + baseMapper.insertSUpplierIndex(entity.getName(),entity.getCodeUnified(),entity.getSid(),index); + } + } baseMapper.deleteSupplierFiles(entity.getSid(),"1"); String[] businessLicenseFiles = dto.getBusinessLicenseFiles(); if(businessLicenseFiles!=null){ @@ -167,7 +185,7 @@ public class SupplierBankInfoService extends MybatisBaseService> maps=new ArrayList<>(); for(String s:contractFiles){ @@ -180,7 +198,7 @@ public class SupplierBankInfoService extends MybatisBaseService { void insertSupplierIndex(SupplierIndex si); @Select("select * from supplier_index where code=#{code} or name=#{name}") List selectByCodeAndName(@Param("code") String code, @Param("name") String name); + + @Delete("delete from supplier_index where PSid = #{dtoSid}") + void delByMainSid(String dtoSid); } \ No newline at end of file diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierindex/SupplierIndexService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierindex/SupplierIndexService.java index b03be1e4..ec0b07ce 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierindex/SupplierIndexService.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierindex/SupplierIndexService.java @@ -104,4 +104,8 @@ public class SupplierIndexService extends MybatisBaseService