From f1864f6d2d85b49fc901b22e9f6759a5d0fb360b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 26 十一月 2024 09:33:03 +0800
Subject: [PATCH] 开发更新
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwPatrolTaskCloudController.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwPatrolTaskCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwPatrolTaskCloudController.java
index e764b46..ad901bc 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwPatrolTaskCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwPatrolTaskCloudController.java
@@ -36,6 +36,7 @@
@PostMapping("/create")
@CloudRequiredPermission("business:ywpatroltask:create")
public ApiResponse create(@RequestBody YwPatrolTask ywPatrolTask,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ ywPatrolTask.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(ywPatrolTaskService.create(ywPatrolTask));
}
@@ -43,7 +44,7 @@
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:ywpatroltask:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
- ywPatrolTaskService.deleteById(id);
+ ywPatrolTaskService.deleteById(id,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -56,7 +57,7 @@
for (String id : idArray) {
idList.add(Integer.valueOf(id));
}
- ywPatrolTaskService.deleteByIdInBatch(idList);
+ ywPatrolTaskService.deleteByIdInBatch(idList,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -64,6 +65,7 @@
@PostMapping("/updateById")
@CloudRequiredPermission("business:ywpatroltask:update")
public ApiResponse updateById(@RequestBody YwPatrolTask ywPatrolTask,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ ywPatrolTask.setLoginUserInfo(this.getLoginUser(token));
ywPatrolTaskService.updateById(ywPatrolTask);
return ApiResponse.success(null);
}
@@ -72,6 +74,7 @@
@PostMapping("/page")
@CloudRequiredPermission("business:ywpatroltask:query")
public ApiResponse<PageData<YwPatrolTask>> findPage (@RequestBody PageWrap<YwPatrolTask> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(ywPatrolTaskService.findPage(pageWrap));
}
@@ -79,6 +82,18 @@
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:ywpatroltask:exportExcel")
public void exportExcel (@RequestBody PageWrap<YwPatrolTask> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
+ List<YwPatrolTask> ywPatrolTaskList = ywPatrolTaskService.findPage(pageWrap).getRecords();
+ for (YwPatrolTask ywPatrolTask:ywPatrolTaskList) {
+ if((Constants.equalsInteger(ywPatrolTask.getStatus(),Constants.ZERO) || Constants.equalsInteger(ywPatrolTask.getStatus(),Constants.ONE))
+ && ywPatrolTask.getEndDate().getTime() < System.currentTimeMillis()
+ ){
+ ywPatrolTask.setStatus(Constants.TWO);
+ }
+
+ }
+
+
ExcelExporter.build(YwPatrolTask.class).export(ywPatrolTaskService.findPage(pageWrap).getRecords(), "杩愮淮宸℃浠诲姟淇℃伅琛�", response);
}
@@ -88,4 +103,13 @@
public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(ywPatrolTaskService.findById(id));
}
+ @ApiOperation("浠诲姟鍙栨秷")
+ @GetMapping("/taskCancel")
+ @CloudRequiredPermission("business:ywpatroltask:query")
+ public ApiResponse taskCancel(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ ywPatrolTaskService.taskCancel(id,this.getLoginUser(token));
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
}
--
Gitblit v1.9.3