From ebb1a448339bafc4c4849fdbc2291bd3a28261df Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 09 一月 2024 10:47:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/DisposeRecordController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DisposeRecordController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DisposeRecordController.java
index e7872df..b19625c 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DisposeRecordController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DisposeRecordController.java
@@ -52,9 +52,20 @@
@RequestParam(required = false) Short source,
@RequestParam(required = false) Short type,
@RequestParam(required = false) Short time
- ) {
+ ) {
AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
- return CommonResult.success(iDisposeRecordService.listMyTask(num, user.getUserId(),type,source,time,current,pageSize));
+ return CommonResult.success(iDisposeRecordService.listMyTask(num, user.getUserId(), type, source, time, current, pageSize));
}
+ @ApiOperation(value = "鏌ヨ", response = MyBacklogVO.class)
+ @GetMapping("/query/count")
+ @LogSave(operationType = "鎴戠殑寰呭姙-鎬绘暟", contain = "鏌ヨ鎬绘暟")
+ public CommonResult searchMyTaskCount(@RequestParam(required = false) String num,
+ @RequestParam(required = false) Short source,
+ @RequestParam(required = false) Short type,
+ @RequestParam(required = false) Short time
+ ) {
+ AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ return CommonResult.success(iDisposeRecordService.listMyTaskCount(num, user.getUserId(), type, source, time));
+ }
}
--
Gitblit v1.8.0