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 | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 107 insertions(+), 6 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..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
@@ -12,7 +12,10 @@
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;
@@ -22,6 +25,7 @@
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;
@@ -44,14 +48,21 @@
@ApiOperation("鑾峰彇鍚岃浜�")
@GetMapping("/peerList")
- public AjaxResult peerList(String nickName, String deptId)
+ @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())
- .eq(StringUtils.isNotEmpty(nickName), SysUser::getNickName,nickName)
- .eq(deptId!=null, SysUser::getDeptId,deptId)
+ .likeRight(StringUtils.isNotEmpty(nickName), SysUser::getNickName,nickName)
+ .apply( StringUtils.format(queryScope, deptId, deptId))
);
list.forEach(user->{
SysDept sysDept = deptService.selectDeptById(user.getDeptId());
@@ -61,7 +72,28 @@
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)
{
@@ -70,7 +102,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 +121,7 @@
}
- @ApiOperation("瀹℃壒浜哄垪琛�")
+ @ApiOperation("鍒楄〃鈥斺�斿鎵逛汉寰呭鎵�")
@GetMapping("/checkList")
public TableDataInfo checkList(EnforceOrderQueryBo bo)
{
@@ -88,6 +129,40 @@
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")
@@ -97,6 +172,21 @@
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')")
@@ -151,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