From 12ada3a7e6680d5ab92901410e3cedd9b8077e56 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 16 十二月 2023 17:08:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/DisposeRecordController.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 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 624d095..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
@@ -1,6 +1,8 @@
package com.ycl.controller.caseHandler;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.bo.AdminUserDetails;
import com.ycl.controller.BaseController;
@@ -8,12 +10,16 @@
import com.ycl.vo.MyBacklogVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDateTime;
/**
@@ -39,9 +45,27 @@
**/
@ApiOperation(value = "鏌ヨ", response = MyBacklogVO.class)
@GetMapping("/query")
- public CommonResult searchMyTask(@RequestParam Integer caseId) {
+ @LogSave(operationType = "鎴戠殑寰呭姙", contain = "鏌ヨ")
+ public CommonResult searchMyTask(@RequestParam(required = false) String num,
+ @RequestParam Integer pageSize,
+ @RequestParam Integer current,
+ @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(caseId, user.getUserId()));
+ 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