From 69155f0115473d6c17bb7441bc1c7b06e05173ef Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 27 八月 2024 10:45:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceComplaintLogController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceComplaintLogController.java b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceComplaintLogController.java
index b658a0e..3c0cb27 100644
--- a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceComplaintLogController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceComplaintLogController.java
@@ -7,9 +7,11 @@
import com.project.common.core.page.TableDataInfo;
import com.project.common.enums.BusinessType;
import com.project.common.utils.poi.ExcelUtil;
+import com.project.enforce.domain.bo.editBo.ComplaintResultBo;
import com.project.enforce.domain.bo.editBo.EnforceComplaintLogBo;
import com.project.enforce.domain.bo.queryBo.EnforceComplaintLogQueryBo;
import com.project.enforce.domain.vo.EnforceComplaintLogVo;
+import com.project.enforce.domain.vo.OrderNodeVo;
import com.project.enforce.service.IEnforceComplaintLogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -34,7 +36,7 @@
private final IEnforceComplaintLogService iEnforceComplaintLogService;
- @ApiOperation("鏌ヨ鎶曡瘔璁板綍鍒楄〃")
+ @ApiOperation("鈥斺�旇褰曞垪琛�")
@GetMapping("/list")
public TableDataInfo list(EnforceComplaintLogQueryBo bo)
{
@@ -43,6 +45,26 @@
return getDataTable(list);
}
+
+ @ApiOperation("鎴戠殑鎶曡瘔鈥斺�旇褰曞垪琛�")
+ @GetMapping("/complaintList")
+ public TableDataInfo complaintList(EnforceComplaintLogQueryBo bo)
+ {
+ startPage();
+ List<EnforceComplaintLogVo> list = iEnforceComplaintLogService.complaintList(bo);
+ return getDataTable(list);
+ }
+
+
+
+ @ApiOperation("璇夋眰寤鸿鈥斺�旇褰曞垪琛�")
+ @GetMapping("/pleaseList")
+ public TableDataInfo pleaseList(EnforceComplaintLogQueryBo bo)
+ {
+ startPage();
+ List<EnforceComplaintLogVo> list = iEnforceComplaintLogService.queryPleaseList(bo);
+ return getDataTable(list);
+ }
@ApiOperation("瀵煎嚭鎶曡瘔璁板綍鍒楄〃")
@@ -66,7 +88,7 @@
}
- @ApiOperation("鏂板鎶曡瘔璁板綍")
+ @ApiOperation("鍙戣捣鎶曡瘔")
//@PreAuthorize("@ss.hasPermi('enforce:log:add')")
@Log(title = "鎶曡瘔璁板綍", businessType = BusinessType.INSERT)
@PostMapping("/add")
@@ -97,4 +119,34 @@
{
return toAjax(iEnforceComplaintLogService.deleteByIds(Arrays.asList(ids)) ? 1 : 0);
}
+
+
+ @ApiOperation("鍝嶅簲鎶曡瘔")
+ //@PreAuthorize("@ss.hasPermi('enforce:log:edit')")
+ @Log(title = "鍝嶅簲鎶曡瘔", businessType = BusinessType.UPDATE)
+ @PostMapping("/inComplaint")
+ @RepeatSubmit
+ public AjaxResult inComplaint(@RequestBody ComplaintResultBo bo)
+ {
+ return toAjax(iEnforceComplaintLogService.inComplaint(bo) ? 1 : 0);
+ }
+
+ @ApiOperation("澶勭悊缁撴灉")
+ //@PreAuthorize("@ss.hasPermi('enforce:log:edit')")
+ @Log(title = "澶勭悊缁撴灉", businessType = BusinessType.UPDATE)
+ @PostMapping("/doComplaint")
+ @RepeatSubmit
+ public AjaxResult doComplaint(@RequestBody ComplaintResultBo bo)
+ {
+ return toAjax(iEnforceComplaintLogService.doComplaint(bo) ? 1 : 0);
+ }
+
+
+ @ApiOperation("鎶曡瘔鍗曡妭鐐�")
+ @GetMapping("/orderNodeList")
+ public AjaxResult orderNodeList(@RequestParam("id") Long id)
+ {
+ List<OrderNodeVo> list = iEnforceComplaintLogService.orderNodeList(id);
+ return AjaxResult.success(list);
+ }
}
--
Gitblit v1.9.1