06-26

src/main/java/com/yxt/supplier/apiadmin/SupplierBankRest.java

@@ -49,7 +49,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @Api(tags = "供应商开户行信息")
 @RestController
-@RequestMapping("/apiadmin/base/basesupplierbank")
+@RequestMapping("/apiadmin/supplierbank")
 public class SupplierBankRest {
 
 	@Autowired

src/main/java/com/yxt/supplier/apiadmin/SupplierFileRest.java

@@ -49,7 +49,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @Api(tags = "供应商附件")
 @RestController
-@RequestMapping("/apiadmin/base/basesupplierfile")
+@RequestMapping("/apiadmin/supplierfile")
 public class SupplierFileRest {
 
 	@Autowired

src/main/java/com/yxt/supplier/apiadmin/SupplierInfoRest.java

@@ -51,7 +51,7 @@ import java.util.List;
  */
 @Api(tags = "供应商信息")
 @RestController
-@RequestMapping("/apiadmin/base/basesupplierinfo")
+@RequestMapping("/apiadmin/supplierinfo")
 public class SupplierInfoRest {
 
 	@Autowired

src/main/java/com/yxt/supplier/apiadmin/SupplierTypeRest.java

@@ -49,7 +49,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @Api(tags = "供应商类型")
 @RestController
-@RequestMapping("/apiadmin/base/basesuppliertype")
+@RequestMapping("/apiadmin/suppliertype")
 public class SupplierTypeRest {
 
 	@Autowired
@@ -86,4 +86,14 @@ public class SupplierTypeRest {
 		SupplierTypeDetailsVo vo = supplierTypeService.fetchDetailsVoBySid(sid);
 		return rb.success().setData(vo);
 	}
+	@ApiOperation("根据SID获取一条记录")
+	@GetMapping("/checkSaveCode/{sid}/")
+	public ResultBean<Integer> checkSaveCode(@PathVariable("supplierTypeCode") String supplierTypeCode,@PathVariable("useOrgSid") String useOrgSid){
+		return supplierTypeService.checkSaveCode(supplierTypeCode,useOrgSid);
+	}
+	@ApiOperation("根据SID获取一条记录")
+	@GetMapping("/checkUpdateCode/{sid}/{}")
+	public ResultBean<Integer> checkUpdateCode(@PathVariable("supplierTypeCode") String supplierTypeCode,@PathVariable("useOrgSid") String useOrgSid,@PathVariable("orgSid")String dtoSid){
+		return supplierTypeService.checkUpdateCode(supplierTypeCode,useOrgSid,dtoSid);
+	}
 }

src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.java

@@ -57,4 +57,9 @@ public interface SupplierTypeMapper extends BaseMapper<SupplierType> {
 	
 	@Select("select * from supplier_type")
 	List<SupplierTypeVo> selectListVo();
+	@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 useOrgSid = #{useOrgSid} AND sid != #{dtoSid}")
+	int checkUpdateCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid);
 }

src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeService.java

@@ -31,9 +31,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 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.stereotype.Service;
+import org.springframework.web.bind.annotation.PathVariable;
 
 /**
  * Project: yxt-base(仓储基础信息供应商) <br/>
@@ -91,4 +93,11 @@ public class SupplierTypeService extends MybatisBaseService<SupplierTypeMapper,
 		BeanUtil.copyProperties(entity, vo);
 		return vo;
 	}
+	public ResultBean<Integer> checkSaveCode(String supplierTypeCode, String orgSid){
+		return new ResultBean<Integer>().success().setData(baseMapper.checkSaveCode(supplierTypeCode,orgSid));
+	}
+	public ResultBean<Integer>  checkUpdateCode(String supplierTypeCode, String orgSid,String dtoSid){
+		return new ResultBean<Integer>().success().setData(baseMapper.checkUpdateCode(supplierTypeCode,orgSid,dtoSid));
+	}
+
 }

src/main/resources/application-dev.yml

@@ -11,12 +11,12 @@ spring:
   cloud:
     nacos:
       discovery:
-        namespace: common
+#        namespace: common
-        server-addr: 39.104.100.138:8848
+        server-addr: 127.0.0.1:8848
         register-enabled: false
   redis:
     database: 3  # Redis数据库索引（默认为0）
-    host: 39.104.100.138
+    host: 127.0.0.1
     jedis:
       pool:
         max-active: -1  #连接池最大连接数（使用负值表示没有限制）