From 69155f0115473d6c17bb7441bc1c7b06e05173ef Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 27 八月 2024 10:45:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
index 81c4995..3276c3e 100644
--- a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
@@ -25,6 +25,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
@@ -47,14 +48,15 @@
@ApiOperation("鑾峰彇鍚岃浜�")
@GetMapping("/peerList")
+ @Cacheable(value = "sysUser:peerList")
public AjaxResult peerList(String nickName, String deptId)
{
List<SysUser> list = userService.list(userService.lq()
.ne(SysUser::getUserType,"02")
.ne(SysUser::getUserName,"admin")
.ne(SysUser::getUserId, SecurityUtils.getUserId())
- .eq(StringUtils.isNotEmpty(nickName), SysUser::getNickName,nickName)
- .eq(deptId!=null, SysUser::getDeptId,deptId)
+ .like(StringUtils.isNotEmpty(nickName), SysUser::getNickName,nickName)
+ .eq(deptId!=null, SysUser::getDeptId, deptId)
);
list.forEach(user->{
SysDept sysDept = deptService.selectDeptById(user.getDeptId());
@@ -141,7 +143,7 @@
@PostMapping("/doScanOrder/{orderId}")
public AjaxResult doScanOrder(@PathVariable("orderId") Long orderId)
{
- return AjaxResult.success(iEnforceOrderService.doScanOrder(orderId));
+ return toAjax(iEnforceOrderService.doScanOrder(orderId));
}
@ApiOperation("涓婃姤缁撴灉")
@@ -166,7 +168,7 @@
@PostMapping("/orderComplaint")
public AjaxResult orderComplaint(@RequestBody OrderComplaintBo bo)
{
- return AjaxResult.success(iEnforceOrderService.orderComplaint(bo));
+ return toAjax(iEnforceOrderService.orderComplaint(bo));
}
@ApiOperation("鎵ф硶鍗曟姇璇夎妭鐐�")
@@ -230,4 +232,15 @@
{
return toAjax(iEnforceOrderService.deleteByIds(Arrays.asList(orderIds)) ? 1 : 0);
}
+
+
+ @ApiOperation("浼佷笟纭鈥斺�旀墽娉曞崟")
+ //@PreAuthorize("@ss.hasPermi('enforce:order:remove')")
+ @Log(title = "浼佷笟纭鎵ф硶鍗�" , businessType = BusinessType.UPDATE)
+ @PostMapping("/confirm/{orderId}")
+ @RepeatSubmit
+ public AjaxResult remove(@PathVariable Long orderId)
+ {
+ return toAjax(iEnforceOrderService.confirm(orderId) ? 1 : 0);
+ }
}
--
Gitblit v1.9.1