From 0a7159370767b04ef9243f18270d155d527691d4 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 25 六月 2024 11:42:15 +0800
Subject: [PATCH] 审批修改，时间倒叙
---
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 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 d87f258..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,6 +12,8 @@
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;
@@ -62,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)
@@ -71,7 +91,7 @@
return getDataTable(list);
}
- @ApiOperation("鍒楄〃鈥斺�旀墽娉曞緟涓婃姤")
+ @ApiOperation("鍒楄〃鈥斺�旀墽娉曟墽琛屽崟")
@GetMapping("/execute/list")
public TableDataInfo executeList(EnforceOrderQueryBo bo)
{
@@ -124,6 +144,15 @@
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")
public AjaxResult orderNodeList(@RequestParam("orderId") Long orderId)
@@ -132,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