From 61eb0b1ca4f98c93ce03bbb58237c2d6302859cc Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Tue, 10 Sep 2024 17:36:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/SysClient.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/SysClient.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/SysClient.java
index 535beed..50e903a 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/SysClient.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/SysClient.java
@@ -5,6 +5,7 @@
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -25,7 +26,7 @@
* @return ReturnBO
*/
@PostMapping("/api/client/fileInfo/listIdTypeInfoByOwnerIdList")
- ReturnBO listTypeInfoByOwnerIdList(@RequestBody Map<String, Object> term, @RequestParam(value = "mainId") String mainId);
+ ReturnBO listTypeInfoByOwnerIdList(@RequestBody Map<String, Object> term);
/**
* 附件中心-根据多个所属编号查询附件
@@ -34,7 +35,7 @@
* @return ReturnBO
*/
@PostMapping("/api/client/fileInfo/listInfoByOwnerIdList")
- ReturnBO listInfoByOwnerIdList(@RequestBody Map<String, Object> term, @RequestParam(value = "mainId") String mainId);
+ ReturnBO listInfoByOwnerIdList(@RequestBody Map<String, Object> term);
/**
* 附件中心-根据多个所属编号查询附件
@@ -47,6 +48,16 @@
ReturnBO getTimeLimit(@RequestParam String limitTable, @RequestParam(value = "limitType") String limitType);
/**
+ * 获取时限
+ * @url {ctx}/api/client/syTimeLimit/getExpireTime?ownerIds=
+ * @param computeTime
+ * @param limitType
+ * @return
+ */
+ @GetMapping("/api/client/syTimeLimit/getExpireTime")
+ ReturnBO getExpireTime(@RequestParam(value = "computeTime") Date computeTime, @RequestParam(value = "limitType") String limitType);
+
+ /**
* 根据条件删除附件关系
* @url {ctx}/api/v1/fileRelate/removeFileRelate
* @param fileTypeTermsDTO 条件
--
Gitblit v1.8.0