From cdb4df5b86eefa7c36e4746b7fc00d7d15b52ce6 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期五, 21 六月 2024 19:53:34 +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 0042cd2..d87f258 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
@@ -13,6 +13,7 @@
import com.project.common.utils.poi.ExcelUtil;
import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
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 +62,7 @@
return AjaxResult.success(list);
}
- @ApiOperation("鎵ф硶鍗曞垪琛�")
+ @ApiOperation("鍒楄〃鈥斺�旀墽娉曠敵璇峰崟")
@GetMapping("/list")
public TableDataInfo list(EnforceOrderQueryBo bo)
{
@@ -70,7 +71,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 +90,7 @@
}
- @ApiOperation("瀹℃壒浜哄垪琛�")
+ @ApiOperation("鍒楄〃鈥斺�斿鎵逛汉寰呭鎵�")
@GetMapping("/checkList")
public TableDataInfo checkList(EnforceOrderQueryBo bo)
{
@@ -89,6 +99,31 @@
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("鎵ф硶鍗曡妭鐐�")
@GetMapping("/orderNodeList")
public AjaxResult orderNodeList(@RequestParam("orderId") Long orderId)
--
Gitblit v1.9.1