From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
java110-core/src/main/java/com/java110/core/smo/common/IResourceEntryStoreInnerServiceSMO.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/smo/common/IResourceEntryStoreInnerServiceSMO.java b/java110-core/src/main/java/com/java110/core/smo/common/IResourceEntryStoreInnerServiceSMO.java
index ca14476..4673827 100644
--- a/java110-core/src/main/java/com/java110/core/smo/common/IResourceEntryStoreInnerServiceSMO.java
+++ b/java110-core/src/main/java/com/java110/core/smo/common/IResourceEntryStoreInnerServiceSMO.java
@@ -7,7 +7,6 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
@@ -27,13 +26,38 @@
/**
+ * 鏌ヨ鐢ㄦ埛浠诲姟鏁�
+ * @param user
+ * @return
+ */
+ @RequestMapping(value = "/getUserTaskCount", method = RequestMethod.POST)
+ public long getUserTaskCount(@RequestBody AuditUser user);
+
+ /**
* 鑾峰彇鐢ㄦ埛浠诲姟
* @param user 鐢ㄦ埛淇℃伅
*/
- @RequestMapping(value = "/startProcess", method = RequestMethod.POST)
+ @RequestMapping(value = "/getUserTasks", method = RequestMethod.POST)
public List<ResourceOrderDto> getUserTasks(@RequestBody AuditUser user);
/**
+ * 鍚屾剰
+ * @param resourceOrderDto
+ * @return
+ */
+ @RequestMapping(value = "/agreeCompleteTask", method = RequestMethod.POST)
+ public boolean agreeCompleteTask(@RequestBody ResourceOrderDto resourceOrderDto);
+
+
+ /**
+ * 鍙嶉┏
+ * @param resourceOrderDto
+ * @return
+ */
+ @RequestMapping(value = "/refuteCompleteTask", method = RequestMethod.POST)
+ public boolean refuteCompleteTask(@RequestBody ResourceOrderDto resourceOrderDto);
+
+ /**
* 瀹屾垚浠诲姟
* @param resourceOrderDto
*/
--
Gitblit v1.8.0