diff --git a/src/main/java/com/xujie/modules/srm/controller/SrmSupplierController.java b/src/main/java/com/xujie/modules/srm/controller/SrmSupplierController.java index 2470705..6295e68 100644 --- a/src/main/java/com/xujie/modules/srm/controller/SrmSupplierController.java +++ b/src/main/java/com/xujie/modules/srm/controller/SrmSupplierController.java @@ -156,6 +156,20 @@ public class SrmSupplierController { return R.ok().put("row",row); } + /** + * @Description 按site查询供应商文档类型(去重) - rqrq + * @author rqrq + */ + @PostMapping(value = "/listSupplierDocTypeBySite") + @ResponseBody + public R listSupplierDocTypeBySite(@RequestBody SrmSupplierData data) { + if (data == null || data.getSite() == null || data.getSite().trim().isEmpty()) { + return R.error("site 不能为空"); + } + List rows = srmSupplierService.listSupplierDocTypeBySite(data.getSite()); + return R.ok().put("rows", rows); + } + /** 首页:资质文档 validTo 早于今天+7 天的供应商(当前用户可见),返回数量与 id 列表 */ @PostMapping(value = "/supplierDocExpireReminder") @ResponseBody diff --git a/src/main/java/com/xujie/modules/srm/mapper/SrmSupplierMapper.java b/src/main/java/com/xujie/modules/srm/mapper/SrmSupplierMapper.java index 731a39e..d17d2d6 100644 --- a/src/main/java/com/xujie/modules/srm/mapper/SrmSupplierMapper.java +++ b/src/main/java/com/xujie/modules/srm/mapper/SrmSupplierMapper.java @@ -26,8 +26,9 @@ public interface SrmSupplierMapper extends BaseMapper { IPage queryPage(Page page, @Param("query") SrmSupplierGroupRequsetData data); void saveSrmSupplierGroupRequsetData(SrmSupplierGroupRequsetData data); - void confirmRequest(SrmSupplierGroupRequsetData data); - void updateSupplierGroup(SrmSupplierGroupRequsetData data); + int confirmRequest(SrmSupplierGroupRequsetData data); + int updateSupplierGroup(SrmSupplierGroupRequsetData data); + SrmSupplierGroupRequsetData getSupplierGroupRequestById(@Param("id") Integer id); List getNewSupplierContract(SrmSupplierContractData data); @@ -65,6 +66,14 @@ public interface SrmSupplierMapper extends BaseMapper { PurQuotationHeaderData getSupplierInfo(SrmSupplier supplier); + /** + * @Description 按site查询供应商文档类型(去重) - rqrq + * @param site 站点 + * @return 文档类型列表 + * @author rqrq + */ + List listSupplierDocTypeBySite(@Param("site") String site); + /** * 合同 srm_supplierContract.validTo 早于「今天+7天」且存在对应续约申请行时,返回 srm_contractRequset.id(已按供应商权限过滤) */ diff --git a/src/main/java/com/xujie/modules/srm/service/SrmSupplierService.java b/src/main/java/com/xujie/modules/srm/service/SrmSupplierService.java index 72a52c3..6ead89a 100644 --- a/src/main/java/com/xujie/modules/srm/service/SrmSupplierService.java +++ b/src/main/java/com/xujie/modules/srm/service/SrmSupplierService.java @@ -53,6 +53,11 @@ public interface SrmSupplierService { PurQuotationHeaderData getSupplierInfo(SrmSupplier supplier); + /** + * 按site查询供应商文档类型(去重) - rqrq + */ + List listSupplierDocTypeBySite(String site); + /** * 首页提醒:关联合同 validTo < 今天+7 天的续约申请(当前用户可见供应商),返回申请 id 列表与数量 */ diff --git a/src/main/java/com/xujie/modules/srm/service/impl/SrmSupplierServiceImpl.java b/src/main/java/com/xujie/modules/srm/service/impl/SrmSupplierServiceImpl.java index 19c5d65..31f03ee 100644 --- a/src/main/java/com/xujie/modules/srm/service/impl/SrmSupplierServiceImpl.java +++ b/src/main/java/com/xujie/modules/srm/service/impl/SrmSupplierServiceImpl.java @@ -94,12 +94,43 @@ public class SrmSupplierServiceImpl extends ServiceImpl getNewSupplierContract(SrmSupplierContractData data){ List result= srmSupplierMapper.getNewSupplierContract(data); @@ -298,6 +329,14 @@ public class SrmSupplierServiceImpl extends ServiceImpl listSupplierDocTypeBySite(String site) { + if (site == null || site.trim().isEmpty()) { + return Collections.emptyList(); + } + return srmSupplierMapper.listSupplierDocTypeBySite(site.trim()); + } + @Override public Map getSupplierContractRequestExpireReminder(String site) { SysUserEntity user = (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); diff --git a/src/main/resources/mapper/srm/SrmSupplierMapper.xml b/src/main/resources/mapper/srm/SrmSupplierMapper.xml index 07bfa31..2a5b5d6 100644 --- a/src/main/resources/mapper/srm/SrmSupplierMapper.xml +++ b/src/main/resources/mapper/srm/SrmSupplierMapper.xml @@ -223,6 +223,25 @@ update srm_supplier set supplier_group=#{newSupplierGroup} where site=#{site} and supplier_no=#{supplierNo} + + + + +