From 5944c9ea054165cc4adfa79254f9b724abc371db Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 03 九月 2024 13:52:00 +0800
Subject: [PATCH] 执法记录条件
---
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java | 191 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 170 insertions(+), 21 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..dfec893 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,35 @@
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.enums.BusinessType;
-import com.project.enforce.domain.vo.EnforceOrderVo;
-import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
-import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
-import com.project.enforce.service.IEnforceOrderService;
-import com.project.common.utils.poi.ExcelUtil;
+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.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.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;
+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.cache.annotation.Cacheable;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
/**
* 鎵ф硶鍗旵ontroller
@@ -38,9 +43,57 @@
public class EnforceOrderController extends BaseController {
private final IEnforceOrderService iEnforceOrderService;
+ private final ISysUserService userService;
+ private final ISysDeptService deptService;
+ @ApiOperation("鑾峰彇鍚岃浜�")
+ @GetMapping("/peerList")
+ @Cacheable(value = "sysUser:peerList")
+ public AjaxResult peerList(String nickName, Long deptId)
+ {
+ String queryScope = " (dept_id = {} OR dept_id IN ( SELECT dept_id FROM sys_dept WHERE find_in_set({}, ancestors) )) ";
+ if (deptId==null){
+ deptId = deptService.getCheckDeptIdByLoginDeptId(SecurityUtils.getDeptId());
+ } else {
+ deptId = deptService.getCheckDeptIdByLoginDeptId(deptId);
+ }
+ List<SysUser> list = userService.list(userService.lq()
+ .ne(SysUser::getUserType,"02")
+ .ne(SysUser::getUserName,"admin")
+ .ne(SysUser::getUserId, SecurityUtils.getUserId())
+ .likeRight(StringUtils.isNotEmpty(nickName), SysUser::getNickName,nickName)
+ .apply( StringUtils.format(queryScope, deptId, 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("/commonList")
+ public TableDataInfo commonList(EnforceOrderQueryBo bo)
+ {
+ if (bo.getCheckDeptId()==null){
+ bo.setCheckDeptId(deptService.getCheckDeptIdByLoginDeptId(SecurityUtils.getDeptId()));
+ }
+ 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)
{
@@ -49,7 +102,91 @@
return getDataTable(list);
}
+ @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()
+ {
+ 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("/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 toAjax(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)
+ {
+ List<OrderNodeVo> list = iEnforceOrderService.orderNodeList(orderId);
+ return AjaxResult.success(list);
+ }
+
+ @ApiOperation("鎵ф硶鍗曟姇璇�")
+ @Log(title = "鎵ф硶鍗曟姇璇�", businessType = BusinessType.UPDATE)
+ @PostMapping("/orderComplaint")
+ public AjaxResult orderComplaint(@RequestBody OrderComplaintBo bo)
+ {
+ return toAjax(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')")
@@ -59,7 +196,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, "鎵ф硶鍗�");
}
@@ -70,6 +207,7 @@
{
return AjaxResult.success(iEnforceOrderService.queryById(orderId));
}
+
@ApiOperation("鏂板鎵ф硶鍗�")
@@ -103,4 +241,15 @@
{
return toAjax(iEnforceOrderService.deleteByIds(Arrays.asList(orderIds)) ? 1 : 0);
}
+
+
+ @ApiOperation("浼佷笟纭鈥斺�旀墽娉曞崟")
+ //@PreAuthorize("@ss.hasPermi('enforce:order:remove')")
+ @Log(title = "浼佷笟纭鎵ф硶鍗�" , businessType = BusinessType.UPDATE)
+ @PostMapping("/confirm/{orderId}")
+ @RepeatSubmit
+ public AjaxResult remove(@PathVariable Long orderId)
+ {
+ return toAjax(iEnforceOrderService.confirm(orderId) ? 1 : 0);
+ }
}
--
Gitblit v1.9.1