From 55fefdfac9a281cc57a1b3bad1fd061eec4b066d Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期四, 27 六月 2024 09:52:05 +0800
Subject: [PATCH] 统计状态过滤
---
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java | 26 ++++++++++++++++++++++----
1 files changed, 22 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 ed62903..bf08edc 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
@@ -53,7 +53,7 @@
.ne(SysUser::getUserType,"02")
.ne(SysUser::getUserName,"admin")
.ne(SysUser::getUserId, SecurityUtils.getUserId())
- .eq(StringUtils.isNotEmpty(nickName), SysUser::getNickName,nickName)
+ .like(StringUtils.isNotEmpty(nickName), SysUser::getNickName,nickName)
.eq(deptId!=null, SysUser::getDeptId,deptId)
);
list.forEach(user->{
@@ -62,6 +62,24 @@
user.setDept(sysDept);
});
return AjaxResult.success(list);
+ }
+
+ @ApiOperation("鍒楄〃鈥斺�旀棤鐗规畩鏌ヨ")
+ @GetMapping("/commonList")
+ public TableDataInfo commonList(EnforceOrderQueryBo bo)
+ {
+ startPage();
+ List<EnforceOrderVo> list = iEnforceOrderService.queryCommonList(bo);
+ return getDataTable(list);
+ }
+
+ @ApiOperation("鍒楄〃鈥斺�斾紒涓氭墽娉曡褰�")
+ @GetMapping("/companyList")
+ public TableDataInfo companyList(EnforceOrderQueryBo bo)
+ {
+ startPage();
+ List<EnforceOrderVo> list = iEnforceOrderService.queryCompanyList(bo);
+ return getDataTable(list);
}
@ApiOperation("鍒楄〃鈥斺�旀墽娉曠敵璇峰崟")
@@ -123,7 +141,7 @@
@PostMapping("/doScanOrder/{orderId}")
public AjaxResult doScanOrder(@PathVariable("orderId") Long orderId)
{
- return AjaxResult.success(iEnforceOrderService.doScanOrder(orderId));
+ return toAjax(iEnforceOrderService.doScanOrder(orderId));
}
@ApiOperation("涓婃姤缁撴灉")
@@ -146,9 +164,9 @@
@ApiOperation("鎵ф硶鍗曟姇璇�")
@Log(title = "鎵ф硶鍗曟姇璇�", businessType = BusinessType.UPDATE)
@PostMapping("/orderComplaint")
- public AjaxResult orderComplaint(OrderComplaintBo bo)
+ public AjaxResult orderComplaint(@RequestBody OrderComplaintBo bo)
{
- return AjaxResult.success(iEnforceOrderService.orderComplaint(bo));
+ return toAjax(iEnforceOrderService.orderComplaint(bo));
}
@ApiOperation("鎵ф硶鍗曟姇璇夎妭鐐�")
--
Gitblit v1.9.1