From 6a5214854fbb4008a36368af07c0a9100bec5da5 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 25 六月 2024 18:52:04 +0800
Subject: [PATCH] 执法人员去除admin

---
 project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java |   24 +++++++++++++++++++++---
 1 files changed, 21 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 ed62903..741ec2e 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
@@ -64,6 +64,24 @@
         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("鍒楄〃鈥斺�旀墽娉曠敵璇峰崟")
     @GetMapping("/list")
     public TableDataInfo list(EnforceOrderQueryBo bo)
@@ -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