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 9e99dde..6ecc12b 100644 --- a/src/main/java/com/xujie/modules/srm/controller/SrmSupplierController.java +++ b/src/main/java/com/xujie/modules/srm/controller/SrmSupplierController.java @@ -172,7 +172,7 @@ public class SrmSupplierController { return R.ok().put("rows", rows); } - /** 首页:资质文档 validTo 早于今天+7 天的供应商(当前用户可见),返回数量与 id 列表 */ + /** 首页:资质文档 validTo 早于今天+1 个月的供应商(当前用户可见),返回数量与 id 列表 */ @PostMapping(value = "/supplierDocExpireReminder") @ResponseBody public R supplierDocExpireReminder(@RequestBody(required = false) Map body) { 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 4c48b42..70a5139 100644 --- a/src/main/java/com/xujie/modules/srm/mapper/SrmSupplierMapper.java +++ b/src/main/java/com/xujie/modules/srm/mapper/SrmSupplierMapper.java @@ -80,9 +80,9 @@ public interface SrmSupplierMapper extends BaseMapper { List selectContractRequestIdsWithContractValidToWithin7Days(@Param("site") String site); /** - * 文档清单中 validTo 在「今天+7天」之前(含即将过期与已过期)的供应商,返回有权限且可选 site 下的 srm_supplier.id + * 文档清单中 validTo 在「今天+1个月」之前(含即将过期与已过期)的供应商,返回有权限且可选 site 下的 srm_supplier.id */ - List selectSupplierIdsWithDocExpireWithin7Days(@Param("site") String site); + List selectSupplierIdsWithDocExpireWithin1Month(@Param("site") String site); /** * 根据供应商名称查询供应商编码 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 6ead89a..cc02f87 100644 --- a/src/main/java/com/xujie/modules/srm/service/SrmSupplierService.java +++ b/src/main/java/com/xujie/modules/srm/service/SrmSupplierService.java @@ -64,7 +64,7 @@ public interface SrmSupplierService { Map getSupplierContractRequestExpireReminder(String site); /** - * 首页提醒:当前用户可见供应商中,存在资质文档 validTo < 今天+7天 的供应商数量及 id 列表 + * 首页提醒:当前用户可见供应商中,存在资质文档 validTo < 今天+1个月 的供应商数量及 id 列表 * * @param site 可空;非空时仅统计该站点 */ 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 dae2504..08bd1de 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 @@ -432,7 +432,7 @@ public class SrmSupplierServiceImpl extends ServiceImpl getSupplierDocExpireReminder(String site) { SysUserEntity user = (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); - List ids = srmSupplierMapper.selectSupplierIdsWithDocExpireWithin7Days(site); + List ids = srmSupplierMapper.selectSupplierIdsWithDocExpireWithin1Month(site); if (ids == null) { ids = Collections.emptyList(); } diff --git a/src/main/resources/mapper/srm/SrmSupplierMapper.xml b/src/main/resources/mapper/srm/SrmSupplierMapper.xml index 523ffa1..b2f2ad5 100644 --- a/src/main/resources/mapper/srm/SrmSupplierMapper.xml +++ b/src/main/resources/mapper/srm/SrmSupplierMapper.xml @@ -532,8 +532,8 @@ - - SELECT DISTINCT a.id FROM srm_supplier a INNER JOIN srm_document_list_definition d @@ -541,7 +541,7 @@ d.objectType = 'supplier' AND d.validTo IS NOT NULL - AND d.validTo < DATEADD(day, 7, CAST(GETDATE() AS DATE)) + AND d.validTo < DATEADD(month, 1, CAST(GETDATE() AS DATE)) AND d.uploaded_flag = 'N' AND a.site = #{site}