From 4235a19418b6a4cd404653d85f515a243edb8f57 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Mon, 22 Jul 2024 11:12:49 +0800 Subject: [PATCH] 7/22 --- src/main/java/com/yxt/supplier/apiadmin/SupplierTypeRest.java | 2 +- .../java/com/yxt/supplier/biz/supplierinfo/SupplierInfo.java | 2 +- .../yxt/supplier/biz/supplierinfo/SupplierInfoDetailsVo.java | 2 ++ .../com/yxt/supplier/biz/supplierinfo/SupplierInfoDto.java | 4 ++++ .../com/yxt/supplier/biz/supplierinfo/SupplierInfoVo.java | 2 ++ .../com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.java | 2 +- 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/yxt/supplier/apiadmin/SupplierTypeRest.java b/src/main/java/com/yxt/supplier/apiadmin/SupplierTypeRest.java index 9d78307..1d59f74 100644 --- a/src/main/java/com/yxt/supplier/apiadmin/SupplierTypeRest.java +++ b/src/main/java/com/yxt/supplier/apiadmin/SupplierTypeRest.java @@ -94,7 +94,7 @@ public class SupplierTypeRest { } @ApiOperation("根据SID获取一条记录") @GetMapping("/checkUpdateCode/{supplierTypeCode}/{useOrgSid}/{dtoSid}") - public ResultBean checkUpdateCode(@PathVariable("supplierTypeCode") String supplierTypeCode,@PathVariable("useOrgSid") String useOrgSid,@PathVariable("orgSid")String dtoSid){ + public ResultBean checkUpdateCode(@PathVariable("supplierTypeCode") String supplierTypeCode,@PathVariable("useOrgSid") String useOrgSid,@PathVariable("dtoSid")String dtoSid){ return supplierTypeService.checkUpdateCode(supplierTypeCode,useOrgSid,dtoSid); } diff --git a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfo.java b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfo.java index 7b51d90..1ad98e5 100644 --- a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfo.java +++ b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfo.java @@ -108,5 +108,5 @@ public class SupplierInfo extends BaseEntity { private String createOrgName; // 创建组织名称 @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - + private double taxRate; } diff --git a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoDetailsVo.java b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoDetailsVo.java index a684400..5d27559 100644 --- a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoDetailsVo.java +++ b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoDetailsVo.java @@ -115,4 +115,6 @@ public class SupplierInfoDetailsVo implements Vo { private List baseSupplierBankList; private String userSid; private String orgPath; + private double taxRate; + private String remarks; } \ No newline at end of file diff --git a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoDto.java b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoDto.java index d9ab6e0..7cfd376 100644 --- a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoDto.java +++ b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoDto.java @@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.awt.*; import java.util.List; /** @@ -115,4 +116,7 @@ public class SupplierInfoDto implements Dto { private List baseSupplierBankList; private String userSid; private String orgPath; + private double taxRate; + private String remarks; + private String orgSid; } \ No newline at end of file diff --git a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoVo.java b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoVo.java index cb8f5bb..2496cee 100644 --- a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoVo.java +++ b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoVo.java @@ -66,4 +66,6 @@ public class SupplierInfoVo implements Vo { private String createOrgSid;//创建组织sid private String userSid; private String orgPath; + private double taxRate; + private String remarks; } diff --git a/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.java b/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.java index c0c3ef5..6089d6a 100644 --- a/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.java +++ b/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.java @@ -64,6 +64,6 @@ public interface SupplierTypeMapper extends BaseMapper { @Select("SELECT COUNT(*) FROM 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); - @Select("select * from supplier_type a LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid where s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete = '0'") + @Select("select * from supplier_type a LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid where s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete = '0' and a.isEnable='1'") List selSupplierType(String useOrgSid); } \ No newline at end of file