From b52a64563d5677405ff2bb2f2e96065d8bbb100d Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期六, 22 六月 2024 10:14:52 +0800
Subject: [PATCH] 配置文件

---
 project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java |   78 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 75 insertions(+), 3 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 8458e58..d87f258 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
@@ -4,13 +4,21 @@
 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.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.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;
@@ -32,8 +40,29 @@
 public class EnforceOrderController extends BaseController {
 
     private final IEnforceOrderService iEnforceOrderService;
+    private final ISysUserService userService;
+    private final ISysDeptService deptService;
 
-    @ApiOperation("鎵ф硶鍗曞垪琛�")
+    @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("鍒楄〃鈥斺�旀墽娉曠敵璇峰崟")
     @GetMapping("/list")
     public TableDataInfo list(EnforceOrderQueryBo bo)
     {
@@ -42,7 +71,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()
     {
@@ -52,13 +90,46 @@
     }
 
 
-    @ApiOperation("瀹℃壒浜哄垪琛�")
+    @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 AjaxResult.success(iEnforceOrderService.doScanOrder(orderId));
+    }
+
+    @ApiOperation("鎵ф硶鍗曡妭鐐�")
+    @GetMapping("/orderNodeList")
+    public AjaxResult orderNodeList(@RequestParam("orderId") Long orderId)
+    {
+        List<OrderNodeVo> list = iEnforceOrderService.orderNodeList(orderId);
+        return AjaxResult.success(list);
     }
 
 
@@ -83,6 +154,7 @@
     }
 
 
+
     @ApiOperation("鏂板鎵ф硶鍗�")
     //@PreAuthorize("@ss.hasPermi('enforce:order:add')")
     @Log(title = "鎵ф硶鍗�", businessType = BusinessType.INSERT)

--
Gitblit v1.9.1