From b0402b407292f0708a1684cc0ca1d5e2d890b753 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期一, 24 六月 2024 15:12:39 +0800
Subject: [PATCH] 多机构管理，问题修改

---
 project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java |   85 +++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 82 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 0042cd2..81c4995 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,7 +12,10 @@
 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;
 import com.project.enforce.domain.vo.EnforceOrderVo;
 import com.project.enforce.domain.vo.OrderNodeVo;
 import com.project.enforce.service.IEnforceOrderService;
@@ -61,7 +64,25 @@
         return AjaxResult.success(list);
     }
 
-    @ApiOperation("鎵ф硶鍗曞垪琛�")
+    @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)
     {
@@ -70,7 +91,16 @@
         return getDataTable(list);
     }
 
-    @ApiOperation("淇℃伅鍏紡鍒楄〃")
+    @ApiOperation("鍒楄〃鈥斺�旀墽娉曟墽琛屽崟")
+    @GetMapping("/execute/list")
+    public TableDataInfo executeList(EnforceOrderQueryBo bo)
+    {
+        startPage();
+        List<EnforceOrderVo> list = iEnforceOrderService.getExecuteList(bo);
+        return getDataTable(list);
+    }
+
+    @ApiOperation("鍒楄〃鈥斺�斾俊鎭叕寮�")
     @GetMapping("/showList")
     public TableDataInfo showList()
     {
@@ -80,7 +110,7 @@
     }
 
 
-    @ApiOperation("瀹℃壒浜哄垪琛�")
+    @ApiOperation("鍒楄〃鈥斺�斿鎵逛汉寰呭鎵�")
     @GetMapping("/checkList")
     public TableDataInfo checkList(EnforceOrderQueryBo bo)
     {
@@ -88,6 +118,40 @@
         List<EnforceOrderVo> list = iEnforceOrderService.queryCheckList(bo);
         return getDataTable(list);
     }
+
+    @ApiOperation("鍒楄〃鈥斺�斿鎵硅褰�")
+    @GetMapping("/checkedList")
+    public TableDataInfo checkedList(OrderCheckedQueryBo bo)
+    {
+        startPage();
+        List<EnforceOrderVo> list = iEnforceOrderService.queryCheckedList(bo);
+        return getDataTable(list);
+    }
+
+    @ApiOperation("鎵ф硶浜烘壂鐮�")
+    @GetMapping("/getScanList")
+    public AjaxResult scan(@RequestParam("companyCode") String companyCode)
+    {
+        List<EnforceOrderVo> list = iEnforceOrderService.getScanList(companyCode);
+        return AjaxResult.success(list);
+    }
+
+    @ApiOperation("纭鎵ф硶")
+    @Log(title = "鎵ф硶闃熷憳纭鎵ф硶", businessType = BusinessType.UPDATE)
+    @PostMapping("/doScanOrder/{orderId}")
+    public AjaxResult doScanOrder(@PathVariable("orderId") Long orderId)
+    {
+        return AjaxResult.success(iEnforceOrderService.doScanOrder(orderId));
+    }
+
+    @ApiOperation("涓婃姤缁撴灉")
+    @Log(title = "鎵ф硶闃熷憳涓婃姤缁撴灉", businessType = BusinessType.UPDATE)
+    @PostMapping("/doResultOrder")
+    public AjaxResult doResultOrder(@RequestBody OrderResultBo resultBo)
+    {
+        return AjaxResult.success(iEnforceOrderService.doResultOrder(resultBo));
+    }
+
 
     @ApiOperation("鎵ф硶鍗曡妭鐐�")
     @GetMapping("/orderNodeList")
@@ -97,6 +161,21 @@
         return AjaxResult.success(list);
     }
 
+    @ApiOperation("鎵ф硶鍗曟姇璇�")
+    @Log(title = "鎵ф硶鍗曟姇璇�", businessType = BusinessType.UPDATE)
+    @PostMapping("/orderComplaint")
+    public AjaxResult orderComplaint(@RequestBody OrderComplaintBo bo)
+    {
+        return AjaxResult.success(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