From cdae0ab44688a46f3736e32116a2628c8331efd2 Mon Sep 17 00:00:00 2001 From: qiankanghui Date: Sun, 20 Sep 2026 09:07:09 +0800 Subject: [PATCH] =?UTF-8?q?feat(srm):=20=E5=B0=86=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E8=B5=84=E8=B4=A8=E6=96=87=E6=A1=A3=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E6=8F=90=E9=86=92=E6=97=B6=E9=97=B4=E4=BB=8E7=E5=A4=A9?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BA1=E4=B8=AA=E6=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改控制器中供应商文档过期提醒接口的时间计算逻辑 - 更新数据访问层方法名从selectSupplierIdsWithDocExpireWithin7Days到selectSupplierIdsWithDocExpireWithin1Month - 调整SQL映射文件中日期计算从7天改为1个月 - 更新服务层接口和实现类中的相关方法注释和调用 - 统一修改相关JavaDoc注释中的时间描述 --- .../xujie/modules/srm/controller/SrmSupplierController.java | 2 +- .../com/xujie/modules/srm/mapper/SrmSupplierMapper.java | 4 ++-- .../com/xujie/modules/srm/service/SrmSupplierService.java | 2 +- .../modules/srm/service/impl/SrmSupplierServiceImpl.java | 2 +- src/main/resources/mapper/srm/SrmSupplierMapper.xml | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) 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}