From 6acee0d1d79a05f7a3a3c386e9df02e9a741f544 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期五, 21 六月 2024 17:21:16 +0800
Subject: [PATCH] 执法单节点添加，审批修改
---
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java | 84 +++++++++++++++++++++++++++++++++---------
1 files changed, 66 insertions(+), 18 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 e5c5896..0042cd2 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
@@ -1,30 +1,31 @@
package com.project.admin.controller.enforce;
-import java.util.List;
-import java.util.Arrays;
-
-import com.project.common.annotation.RepeatSubmit;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import com.project.common.annotation.Log;
+import com.project.common.annotation.RepeatSubmit;
import com.project.common.core.controller.BaseController;
import com.project.common.core.domain.AjaxResult;
+import com.project.common.core.domain.entity.SysDept;
+import com.project.common.core.domain.entity.SysUser;
+import com.project.common.core.page.TableDataInfo;
import com.project.common.enums.BusinessType;
-import com.project.enforce.domain.vo.EnforceOrderVo;
+import com.project.common.utils.SecurityUtils;
+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.queryBo.EnforceOrderQueryBo;
+import com.project.enforce.domain.vo.EnforceOrderVo;
+import com.project.enforce.domain.vo.OrderNodeVo;
import com.project.enforce.service.IEnforceOrderService;
-import com.project.common.utils.poi.ExcelUtil;
-import com.project.common.core.page.TableDataInfo;
+import com.project.system.service.ISysDeptService;
+import com.project.system.service.ISysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
/**
* 鎵ф硶鍗旵ontroller
@@ -38,9 +39,29 @@
public class EnforceOrderController extends BaseController {
private final IEnforceOrderService iEnforceOrderService;
+ private final ISysUserService userService;
+ private final ISysDeptService deptService;
+ @ApiOperation("鑾峰彇鍚岃浜�")
+ @GetMapping("/peerList")
+ public AjaxResult peerList(String nickName, String deptId)
+ {
+ List<SysUser> list = userService.list(userService.lq()
+ .ne(SysUser::getUserType,"02")
+ .ne(SysUser::getUserName,"admin")
+ .ne(SysUser::getUserId, SecurityUtils.getUserId())
+ .eq(StringUtils.isNotEmpty(nickName), SysUser::getNickName,nickName)
+ .eq(deptId!=null, SysUser::getDeptId,deptId)
+ );
+ list.forEach(user->{
+ SysDept sysDept = deptService.selectDeptById(user.getDeptId());
+ sysDept.setDeptName(deptService.getDeptAllName(sysDept.getDeptId()));
+ user.setDept(sysDept);
+ });
+ return AjaxResult.success(list);
+ }
- @ApiOperation("鏌ヨ鎵ф硶鍗曞垪琛�")
+ @ApiOperation("鎵ф硶鍗曞垪琛�")
@GetMapping("/list")
public TableDataInfo list(EnforceOrderQueryBo bo)
{
@@ -49,6 +70,32 @@
return getDataTable(list);
}
+ @ApiOperation("淇℃伅鍏紡鍒楄〃")
+ @GetMapping("/showList")
+ public TableDataInfo showList()
+ {
+ startPage();
+ List<EnforceOrderVo> list = iEnforceOrderService.showList();
+ return getDataTable(list);
+ }
+
+
+ @ApiOperation("瀹℃壒浜哄垪琛�")
+ @GetMapping("/checkList")
+ public TableDataInfo checkList(EnforceOrderQueryBo bo)
+ {
+ startPage();
+ List<EnforceOrderVo> list = iEnforceOrderService.queryCheckList(bo);
+ return getDataTable(list);
+ }
+
+ @ApiOperation("鎵ф硶鍗曡妭鐐�")
+ @GetMapping("/orderNodeList")
+ public AjaxResult orderNodeList(@RequestParam("orderId") Long orderId)
+ {
+ List<OrderNodeVo> list = iEnforceOrderService.orderNodeList(orderId);
+ return AjaxResult.success(list);
+ }
@ApiOperation("瀵煎嚭鎵ф硶鍗曞垪琛�")
@@ -59,7 +106,7 @@
public AjaxResult export(EnforceOrderQueryBo bo)
{
List<EnforceOrderVo> list = iEnforceOrderService.queryList(bo);
- ExcelUtil<EnforceOrderVo> util = new ExcelUtil<EnforceOrderVo>(EnforceOrderVo.class);
+ ExcelUtil<EnforceOrderVo> util = new ExcelUtil<>(EnforceOrderVo.class);
return util.exportExcel(list, "鎵ф硶鍗�");
}
@@ -72,6 +119,7 @@
}
+
@ApiOperation("鏂板鎵ф硶鍗�")
//@PreAuthorize("@ss.hasPermi('enforce:order:add')")
@Log(title = "鎵ф硶鍗�", businessType = BusinessType.INSERT)
--
Gitblit v1.9.1