From 366ea52e19897a287355e2e5241f0593befd7d3c Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期四, 27 六月 2024 09:56:00 +0800
Subject: [PATCH] 统计状态过滤
---
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 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 2de01dd..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
@@ -12,6 +12,7 @@
import com.project.common.utils.StringUtils;
import com.project.common.utils.poi.ExcelUtil;
import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
+import com.project.enforce.domain.bo.editBo.OrderComplaintBo;
import com.project.enforce.domain.bo.editBo.OrderResultBo;
import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
import com.project.enforce.domain.bo.queryBo.OrderCheckedQueryBo;
@@ -52,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->{
@@ -61,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("鍒楄〃鈥斺�旀墽娉曠敵璇峰崟")
@@ -72,7 +91,7 @@
return getDataTable(list);
}
- @ApiOperation("鍒楄〃鈥斺�旀墽娉曞緟涓婃姤")
+ @ApiOperation("鍒楄〃鈥斺�旀墽娉曟墽琛屽崟")
@GetMapping("/execute/list")
public TableDataInfo executeList(EnforceOrderQueryBo bo)
{
@@ -122,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("涓婃姤缁撴灉")
@@ -133,6 +152,7 @@
return AjaxResult.success(iEnforceOrderService.doResultOrder(resultBo));
}
+
@ApiOperation("鎵ф硶鍗曡妭鐐�")
@GetMapping("/orderNodeList")
public AjaxResult orderNodeList(@RequestParam("orderId") Long orderId)
@@ -141,6 +161,21 @@
return AjaxResult.success(list);
}
+ @ApiOperation("鎵ф硶鍗曟姇璇�")
+ @Log(title = "鎵ф硶鍗曟姇璇�", businessType = BusinessType.UPDATE)
+ @PostMapping("/orderComplaint")
+ public AjaxResult orderComplaint(@RequestBody OrderComplaintBo bo)
+ {
+ return toAjax(iEnforceOrderService.orderComplaint(bo));
+ }
+
+ @ApiOperation("鎵ф硶鍗曟姇璇夎妭鐐�")
+ @GetMapping("/orderComplaintNodeList")
+ public AjaxResult orderComplaintNodeList(@RequestParam("orderId") Long orderId)
+ {
+ List<OrderNodeVo> list = iEnforceOrderService.orderComplaintNodeList(orderId);
+ return AjaxResult.success(list);
+ }
@ApiOperation("瀵煎嚭鎵ф硶鍗曞垪琛�")
//@PreAuthorize("@ss.hasPermi('enforce:order:export')")
--
Gitblit v1.9.1