From 11bad45a2c66634737382d5a5fb03db392a37e2e Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 27 May 2024 10:08:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E6=8C=82?= =?UTF-8?q?=E8=BD=A6=E5=BC=80=E5=8F=91=20=E5=94=AE=E5=90=8E=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E4=BF=A1=E6=81=AF=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussalesorder/BusSalesOrderService.java | 2 - .../BusSalesOrderTrailerService.java | 32 +++++++------ .../AppSalesOrderTrailerDetailsVo.java | 6 ++- .../saleOrders/trailer/TrailerVo.java | 4 +- .../saleOrders/AppBusSalesOrderService.java | 12 +++-- .../as/api/asservicetype/AsServiceTypeVo.java | 2 + .../asservicegroup/AsServiceGroupMapper.java | 6 +++ .../asservicegroup/AsServiceGroupRest.java | 4 +- .../asservicegroup/AsServiceGroupService.java | 17 +++++-- .../AsServiceSubjectMapper.java | 6 +++ .../AsServiceSubjectRest.java | 4 +- .../AsServiceSubjectService.java | 19 ++++++-- .../asservicetype/AsServiceTypeMapper.java | 6 +++ .../biz/asservicetype/AsServiceTypeRest.java | 4 +- .../asservicetype/AsServiceTypeService.java | 16 ++++++- .../BaseSupplierInfoMapper.java | 6 +++ .../BaseSupplierInfoService.java | 10 +++- .../basesuppliertype/BaseSupplierTypeDto.java | 2 + .../BaseSupplierTypeMapper.java | 8 ++-- .../BaseSupplierTypeService.java | 48 +++++++++++++++++-- .../PmsSupplierTypeMapper.java | 4 +- .../PmsSupplierTypeService.java | 23 +++++---- .../yxtbase/supplier/BaseSupplierInfoDto.java | 2 + .../yxtbase/supplier/BaseSupplierTypeDto.java | 2 + 24 files changed, 184 insertions(+), 61 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index ec9c91d316..42727e4527 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -1904,8 +1904,6 @@ public class BusSalesOrderService extends MybatisBaseService busSalesOrderTrailerDetailsVos = baseMapper.fetchAllByOrderSid(orderSid); for (BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo : busSalesOrderTrailerDetailsVos) { BusSalesOrderTrailer busSalesOrderTrailer = fetchBySid(busSalesOrderTrailerDetailsVo.getSid()); - String certFile = busSalesOrderTrailer.getCertFile(); - String[] certFiles = certFile.split(","); + List contractFiless = new ArrayList<>(); List certFiless = new ArrayList<>(); - for (String file : certFiles) { - String url = fileUploadComponent.getUrlPrefix() + file; - BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile(); - busSalesOrderTrailerFile.setUrl(url); - certFiless.add(busSalesOrderTrailerFile); + String certFile = busSalesOrderTrailer.getCertFile(); + if (StringUtils.isNotBlank(certFile)){ + String[] certFiles = certFile.split(","); + for (String file : certFiles) { + String url = fileUploadComponent.getUrlPrefix() + file; + BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile(); + busSalesOrderTrailerFile.setUrl(url); + certFiless.add(busSalesOrderTrailerFile); + } } String contractFile = busSalesOrderTrailer.getContractFile(); - String[] contractFiles = contractFile.split(","); - List contractFiless = new ArrayList<>(); - for (String file : contractFiles) { - String url = fileUploadComponent.getUrlPrefix() + file; - BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile(); - busSalesOrderTrailerFile.setUrl(url); - contractFiless.add(busSalesOrderTrailerFile); + if (StringUtils.isNotBlank(contractFile)){ + String[] contractFiles = contractFile.split(","); + for (String file : contractFiles) { + String url = fileUploadComponent.getUrlPrefix() + file; + BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile(); + busSalesOrderTrailerFile.setUrl(url); + contractFiless.add(busSalesOrderTrailerFile); + } } busSalesOrderTrailerDetailsVo.setCertFile(certFiless); busSalesOrderTrailerDetailsVo.setContractFile(contractFiless); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/AppSalesOrderTrailerDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/AppSalesOrderTrailerDetailsVo.java index c3dc4d2ca8..688f7332cb 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/AppSalesOrderTrailerDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/AppSalesOrderTrailerDetailsVo.java @@ -72,9 +72,11 @@ public class AppSalesOrderTrailerDetailsVo implements Vo { private List contractFile = new ArrayList<>(); // 合同附件 @ApiModelProperty("同车型合格证附件") private List certFile = new ArrayList<>(); // 同车型合格证附件 - @ApiModelProperty("序号") - private Integer sort; // 序号 @ApiModelProperty("0不过票，1过票") private Integer isCompPassTicket; // 0不过票，1过票 + @ApiModelProperty("挂车标识") + private String trailerName; + @ApiModelProperty("合计") + private BigDecimal totalPrice; } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/TrailerVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/TrailerVo.java index a3f96d422d..b1b116e601 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/TrailerVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/TrailerVo.java @@ -1,9 +1,9 @@ package com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountListVo; import com.yxt.common.core.vo.Vo; import lombok.Data; +import java.math.BigDecimal; import java.util.List; /** @@ -15,6 +15,6 @@ import java.util.List; public class TrailerVo implements Vo { private static final long serialVersionUID = -1835469698115349175L; - private String total; + private BigDecimal total; private List records; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index 84dfc4e6df..68b206e2d2 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java @@ -215,8 +215,6 @@ public class AppBusSalesOrderService { } else { return rb.setMsg(resultBean.getMsg()); } - - } /** @@ -952,6 +950,7 @@ public class AppBusSalesOrderService { TrailerVo trailerVo = new TrailerVo(); List data = busSalesOrderTrailerFeign.fetchDetailsByOrderSid(orderSid).getData(); List appSalesOrderTrailerDetailsVos = new ArrayList<>(); + BigDecimal total = new BigDecimal("0"); for (BusSalesOrderTrailerDetailsVo datum : data) { AppSalesOrderTrailerDetailsVo appSalesOrderTrailerDetailsVo = new AppSalesOrderTrailerDetailsVo(); BeanUtil.copyProperties(datum,appSalesOrderTrailerDetailsVo,"contractFile","certFile"); @@ -968,9 +967,16 @@ public class AppBusSalesOrderService { appSalesOrderTrailerDetailsVo.setContractFile(contractFileString); appSalesOrderTrailerDetailsVo.setCertFile(certFileString); appSalesOrderTrailerDetailsVo.setAppearanceSizeLong("长" + appSalesOrderTrailerDetailsVo.getAppearanceSizeLong() + "m"); + appSalesOrderTrailerDetailsVo.setTotalPrice(appSalesOrderTrailerDetailsVo.getSingleFinalPrice().multiply(new BigDecimal(appSalesOrderTrailerDetailsVo.getTrailerCount()))); + total = total.add(appSalesOrderTrailerDetailsVo.getTotalPrice()); appSalesOrderTrailerDetailsVos.add(appSalesOrderTrailerDetailsVo); } - tr + for (int i = 0; i < appSalesOrderTrailerDetailsVos.size(); i++) { + AppSalesOrderTrailerDetailsVo appSalesOrderTrailerDetailsVo = appSalesOrderTrailerDetailsVos.get(i); + appSalesOrderTrailerDetailsVo.setTrailerName("挂车" + (i + 1)); + } + trailerVo.setRecords(appSalesOrderTrailerDetailsVos); + trailerVo.setTotal(total); return rb.success().setData(trailerVo); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeVo.java index 83c8ca789d..5c1f496144 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeVo.java @@ -57,6 +57,8 @@ public class AsServiceTypeVo implements Vo { private Integer sortNo; @ApiModelProperty("服务类别名称") private String serviceTypeName; + @ApiModelProperty("服务类别编码") + private String serviceTypeCode; @ApiModelProperty("提成比例") private BigDecimal percentageRate; @ApiModelProperty("提成金额") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.java index 99a22b752d..decc2a5bb0 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.java @@ -65,4 +65,10 @@ public interface AsServiceGroupMapper extends BaseMapper { List selectListVo(); List getGroupList(@Param("useOrgSid") String useOrgSid); + + @Select("select count(*) from as_service_group where groupName = #{groupName} and useOrgSid = #{useOrgSid}") + int checkByCodeAndUseOrgSid(@Param("groupName") String groupName,@Param("useOrgSid") String useOrgSid); + + @Select("select count(*) from as_service_group where groupName = #{groupName} and useOrgSid = #{useOrgSid} and sid != #{dtoSid}") + int checkSidByCodeAndUseOrgSid(@Param("groupName") String groupName,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupRest.java index 44975d50cb..f211736daf 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupRest.java @@ -76,9 +76,7 @@ public class AsServiceGroupRest { @ApiOperation("新增或修改") @PostMapping("/save") public ResultBean save(@RequestBody AsServiceGroupDto dto) { - ResultBean rb = ResultBean.fireFail(); - asServiceGroupService.saveOrUpdateDto(dto); - return rb.success(); + return asServiceGroupService.saveOrUpdateDto(dto); } @ApiOperation("根据sid批量删除") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java index b7770e2ec9..a5e78a6004 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java @@ -75,13 +75,15 @@ public class AsServiceGroupService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } - public void saveOrUpdateDto(AsServiceGroupDto dto){ + public ResultBean saveOrUpdateDto(AsServiceGroupDto dto){ + ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { String deptName = ""; @@ -112,10 +114,19 @@ public class AsServiceGroupService extends MybatisBaseService 0){ + return rb.setMsg("编码已存在"); + } + this.insertByDto(dto); + return rb.success(); } + int i = baseMapper.checkSidByCodeAndUseOrgSid(dto.getGroupName(), dto.getUseOrgSid(),dtoSid); + if (i > 0){ + return rb.setMsg("编码已存在"); + } this.updateByDto(dto); + return rb.success(); } public void insertByDto(AsServiceGroupDto dto){ diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectMapper.java index 72e9abbdef..7bace1592c 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectMapper.java @@ -62,4 +62,10 @@ public interface AsServiceSubjectMapper extends BaseMapper { @Select("select * from as_service_subject") List selectListVo(); + + @Select("select count(*) from as_service_subject where subjectCode = #{subjectCode} and useOrgSid = #{useOrgSid}") + int checkByCodeAndUseOrgSid(@Param("subjectCode") String subjectCode,@Param("useOrgSid") String useOrgSid); + + @Select("select count(*) from as_service_subject where subjectCode = #{subjectCode} and useOrgSid = #{useOrgSid} and sid != #{dtoSid}") + int checkSidByCodeAndUseOrgSid(@Param("subjectCode") String subjectCode,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectRest.java index 80aabbab04..87b4618a88 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectRest.java @@ -71,9 +71,7 @@ public class AsServiceSubjectRest{ @ApiOperation("新增或修改") @PostMapping("/save") public ResultBean save(@RequestBody AsServiceSubjectDto dto){ - ResultBean rb = ResultBean.fireFail(); - asServiceSubjectService.saveOrUpdateDto(dto); - return rb.success(); + return asServiceSubjectService.saveOrUpdateDto(dto); } @ApiOperation("根据sid批量删除") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectService.java index aad23f4c58..1255f979ca 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectService.java @@ -78,13 +78,15 @@ public class AsServiceSubjectService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } - public void saveOrUpdateDto(AsServiceSubjectDto dto){ + public ResultBean saveOrUpdateDto(AsServiceSubjectDto dto){ + ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { String deptName = ""; @@ -115,10 +117,19 @@ public class AsServiceSubjectService extends MybatisBaseService 0){ + return rb.setMsg("编码已存在"); + } + this.insertByDto(dto); + return rb.success(); + } + int i = baseMapper.checkSidByCodeAndUseOrgSid(dto.getSubjectCode(), dto.getUseOrgSid(),dtoSid); + if (i > 0){ + return rb.setMsg("编码已存在"); + } this.updateByDto(dto); + return rb.success(); } public void insertByDto(AsServiceSubjectDto dto){ diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeMapper.java index ca72c2a100..a47fad2897 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeMapper.java @@ -62,4 +62,10 @@ public interface AsServiceTypeMapper extends BaseMapper { @Select("select * from as_service_type") List selectListVo(); + + @Select("select count(*) from as_service_type where serviceTypeCode = #{serviceTypeCode} and useOrgSid = #{useOrgSid}") + int checkByCodeAndUseOrgSid(@Param("serviceTypeCode") String serviceTypeCode,@Param("useOrgSid") String useOrgSid); + + @Select("select count(*) from as_service_type where serviceTypeCode = #{serviceTypeCode} and useOrgSid = #{useOrgSid} and sid != #{dtoSid}") + int checkSidByCodeAndUseOrgSid(@Param("serviceTypeCode") String serviceTypeCode,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeRest.java index 6979148bf7..7b531b3427 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeRest.java @@ -70,9 +70,7 @@ public class AsServiceTypeRest{ @ApiOperation("新增或修改") @PostMapping("/save") public ResultBean save(@RequestBody AsServiceTypeDto dto){ - ResultBean rb = ResultBean.fireFail(); - asServiceTypeService.saveOrUpdateDto(dto); - return rb.success(); + return asServiceTypeService.saveOrUpdateDto(dto); } @ApiOperation("根据sid批量删除") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java index 3e7aefa6df..c84b03dca2 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java @@ -78,13 +78,15 @@ public class AsServiceTypeService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } - public void saveOrUpdateDto(AsServiceTypeDto dto) { + public ResultBean saveOrUpdateDto(AsServiceTypeDto dto) { + ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { String deptName = ""; @@ -115,10 +117,20 @@ public class AsServiceTypeService extends MybatisBaseService 0){ + return rb.setMsg("编码已存在"); + } this.insertByDto(dto); - return; + return rb.success(); + } + int i = baseMapper.checkSidByCodeAndUseOrgSid(dto.getServiceTypeCode(), dto.getUseOrgSid(),dtoSid); + if (i > 0){ + return rb.setMsg("编码已存在"); } this.updateByDto(dto); + return rb.success(); } public void insertByDto(AsServiceTypeDto dto) { diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoMapper.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoMapper.java index 584ff9122b..072ba612cc 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoMapper.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoMapper.java @@ -64,4 +64,10 @@ public interface BaseSupplierInfoMapper extends BaseMapper { @Select("select * from base_supplier_info where createOrgSid = #{createOrgSid} and isDelete = '0'") List choiceSupplierInfo(String createOrgSid); + + @Select("select count(*) from base_supplier_info where supplierCode = #{supplierCode} and useOrgSid = #{useOrgSid} and isDelete = '0'") + int checkByCodeAndUseOrgSid(@Param("supplierCode") String supplierCode,@Param("useOrgSid") String useOrgSid); + + @Select("select count(*) from base_supplier_info where supplierCode = #{supplierCode} and useOrgSid = #{useOrgSid} and isDelete = '0' and sid != #{dtoSid}") + int checkSidByCodeAndUseOrgSid(@Param("supplierCode") String supplierCode,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid); } \ No newline at end of file diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java index ab6c1863a8..14270dbb75 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java @@ -128,13 +128,21 @@ public class BaseSupplierInfoService extends MybatisBaseService 0){ + return rb.setMsg("编码已存在"); + } String sid = this.insertByDto(dto); for (BaseSupplierBankDto baseSupplierBankDto : baseSupplierBankDtoList) { baseSupplierBankDto.setSupplierSid(sid); baseSupplierBankService.saveOrUpdateDto(baseSupplierBankDto); } return rb.success(); - } + } + int i = baseMapper.checkSidByCodeAndUseOrgSid(dto.getSupplierCode(), dto.getUseOrgSid(),dtoSid); + if (i > 0){ + return rb.setMsg("编码已存在"); + } this.updateByDto(dto); baseSupplierBankService.deleteBySupplierSid(dtoSid); for (BaseSupplierBankDto baseSupplierBankDto : baseSupplierBankDtoList) { diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeDto.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeDto.java index cc8f8ae271..a8274985eb 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeDto.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeDto.java @@ -61,4 +61,6 @@ public class BaseSupplierTypeDto implements Dto { @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid + @ApiModelProperty("组织全路径") + private String orgPath; } \ No newline at end of file diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeMapper.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeMapper.java index 4aab553793..eb6539c3e7 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeMapper.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeMapper.java @@ -58,9 +58,9 @@ public interface BaseSupplierTypeMapper extends BaseMapper { @Select("select * from base_supplier_type") List selectListVo(); - @Select("SELECT COUNT(*) FROM base_supplier_type WHERE supplierTypeCode = #{supplierTypeCode} AND createOrgSid = #{createOrgSid}") - int checkSaveCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("createOrgSid") String createOrgSid); + @Select("SELECT COUNT(*) FROM base_supplier_type WHERE supplierTypeCode = #{supplierTypeCode} AND useOrgSid = #{useOrgSid}") + int checkSaveCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("useOrgSid") String useOrgSid); - @Select("SELECT COUNT(*) FROM base_supplier_type WHERE supplierTypeCode = #{supplierTypeCode} AND createOrgSid = #{createOrgSid} AND sid != #{dtoSid}") - int checkUpdateCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("createOrgSid") String createOrgSid,@Param("dtoSid") String dtoSid); + @Select("SELECT COUNT(*) FROM base_supplier_type WHERE supplierTypeCode = #{supplierTypeCode} AND useOrgSid = #{useOrgSid} AND sid != #{dtoSid}") + int checkUpdateCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid); } \ No newline at end of file diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java index 04edda83de..91ea894faf 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java @@ -28,14 +28,21 @@ package com.yxt.base.biz.base.basesuppliertype; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.base.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.base.feign.portal.sysorganization.SysOrganizationVo; +import com.yxt.base.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; +import java.util.List; + /** * Project: yxt-base(仓储基础信息供应商)
* File: BaseSupplierTypeService.java
@@ -51,7 +58,12 @@ import org.springframework.stereotype.Service; */ @Service public class BaseSupplierTypeService extends MybatisBaseService { - + + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + public PagerVo listPageVo(PagerQuery pq) { BaseSupplierTypeQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -64,17 +76,43 @@ public class BaseSupplierTypeService extends MybatisBaseService split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData(); + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + deptName = sysOrganization.getName() + "/" + sysOrganization1.getName(); + deptName = sysOrganization1.getName(); + deptSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + deptName = sysOrganization.getName(); + deptName = sysOrganization.getName(); + deptSid = sysOrganization.getSid(); + } + dto.setUseOrgSid(deptSid); + createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + //创建组织使用组织 + ResultBean organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid); + if (organizationResultBean.getData() != null) { + dto.setCreateOrgSid(createOrgSid); + dto.setCreateOrgName(organizationResultBean.getData().getName()); + } + } + int i = baseMapper.checkSaveCode(dto.getSupplierTypeCode(),dto.getUseOrgSid()); if (i > 0){ return rb.setMsg("新增编码已存在，请重新输入"); } this.insertByDto(dto); return rb.success(); } - int i = baseMapper.checkUpdateCode(supplierTypeCode,createOrgSid,dtoSid); + int i = baseMapper.checkUpdateCode(dto.getSupplierTypeCode(),dto.getUseOrgSid(),dtoSid); if (i > 0){ return rb.setMsg("修改编码已存在，请重新输入"); } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.java index 1894711d6b..b44616e3d3 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.java @@ -54,6 +54,6 @@ public interface PmsSupplierTypeMapper extends BaseMapper { @Delete("delete from yxt_base.base_supplier_type where sid = #{sid}") void del(String sid); - @Select("select * from yxt_base.base_supplier_type where createOrgSid = #{createOrgSid}") - List selSupplierType(String createOrgSid); + @Select("select * from yxt_base.base_supplier_type where useOrgSid = #{useOrgSid}") + List selSupplierType(String useOrgSid); } \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java index 952184e283..ab4379ce8c 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java @@ -42,6 +42,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; import java.util.List; /** @@ -86,12 +87,6 @@ public class PmsSupplierTypeService extends MybatisBaseService selSupplierType(String orgPath) { - String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); - List pmsSupplierTypeDowns = baseMapper.selSupplierType(createOrgSid); + String useOrgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData(); + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + useOrgSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + useOrgSid = sysOrganization.getSid(); + } + } + List pmsSupplierTypeDowns = baseMapper.selSupplierType(useOrgSid); return pmsSupplierTypeDowns; } } \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierInfoDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierInfoDto.java index 57468b509b..2a0db5e894 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierInfoDto.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierInfoDto.java @@ -117,6 +117,8 @@ public class BaseSupplierInfoDto implements Dto { private String createOrgName; // 创建组织名称 @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid + @ApiModelProperty("组织全路径") + private String orgPath; @ApiModelProperty("开户行信息") private List baseSupplierBankList = new ArrayList<>(); } \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierTypeDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierTypeDto.java index 309792c658..287ad36f74 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierTypeDto.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierTypeDto.java @@ -61,4 +61,6 @@ public class BaseSupplierTypeDto implements Dto { @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid + @ApiModelProperty("组织全路径") + private String orgPath; } \ No newline at end of file