From 2562d6ce39aa405514c9e22ff0237f3f145040b6 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 27 八月 2024 10:45:29 +0800
Subject: [PATCH] 企业二维码样式修改

---
 project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java |   65 ++++++++++++++++++++++++++++++--
 1 files changed, 61 insertions(+), 4 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 d87f258..3276c3e 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,6 +12,8 @@
 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;
@@ -23,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;
@@ -45,14 +48,15 @@
 
     @ApiOperation("鑾峰彇鍚岃浜�")
     @GetMapping("/peerList")
+    @Cacheable(value = "sysUser: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)
+                .like(StringUtils.isNotEmpty(nickName), SysUser::getNickName,nickName)
+                .eq(deptId!=null, SysUser::getDeptId, deptId)
         );
         list.forEach(user->{
             SysDept sysDept = deptService.selectDeptById(user.getDeptId());
@@ -60,6 +64,24 @@
             user.setDept(sysDept);
         });
         return AjaxResult.success(list);
+    }
+
+    @ApiOperation("鍒楄〃鈥斺�旀棤鐗规畩鏌ヨ")
+    @GetMapping("/commonList")
+    public TableDataInfo commonList(EnforceOrderQueryBo bo)
+    {
+        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("鍒楄〃鈥斺�旀墽娉曠敵璇峰崟")
@@ -71,7 +93,7 @@
         return getDataTable(list);
     }
 
-    @ApiOperation("鍒楄〃鈥斺�旀墽娉曞緟涓婃姤")
+    @ApiOperation("鍒楄〃鈥斺�旀墽娉曟墽琛屽崟")
     @GetMapping("/execute/list")
     public TableDataInfo executeList(EnforceOrderQueryBo bo)
     {
@@ -121,8 +143,17 @@
     @PostMapping("/doScanOrder/{orderId}")
     public AjaxResult doScanOrder(@PathVariable("orderId") Long orderId)
     {
-        return AjaxResult.success(iEnforceOrderService.doScanOrder(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")
@@ -132,6 +163,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')")
@@ -186,4 +232,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