From c27ad3dcb8b67a6c10a99c98b9bd6dd1f08b7967 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 01 三月 2022 10:43:15 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/sc/manager/controller/IssueController.java |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/sc/manager/controller/IssueController.java b/src/main/java/com/zy/sc/manager/controller/IssueController.java
index f2a0db8..11233ae 100644
--- a/src/main/java/com/zy/sc/manager/controller/IssueController.java
+++ b/src/main/java/com/zy/sc/manager/controller/IssueController.java
@@ -1,22 +1,24 @@
 package com.zy.sc.manager.controller;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.sc.manager.entity.Issue;
-import com.zy.sc.manager.service.IssueService;
 import com.core.annotations.ManagerAuth;
 import com.core.common.BaseRes;
 import com.core.common.Cools;
+import com.core.common.DateUtils;
 import com.core.common.R;
 import com.zy.sc.common.web.BaseController;
+import com.zy.sc.manager.entity.Issue;
+import com.zy.sc.manager.service.IssueService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 public class IssueController extends BaseController {
@@ -26,7 +28,8 @@
 
     @RequestMapping(value = "/issue/{id}/auth")
     @ManagerAuth
-    public R get(@PathVariable("id") String id) {
+    public R get(@PathVariable("id") String id) throws InterruptedException {
+        Thread.sleep(600);
         return R.ok(issueService.selectById(String.valueOf(id)));
     }
 
@@ -38,6 +41,7 @@
                   @RequestParam(required = false)String orderByType,
                   @RequestParam Map<String, Object> param){
         EntityWrapper<Issue> wrapper = new EntityWrapper<>();
+        wrapper.orderBy("settle").orderBy("create_time", false);
         excludeTrash(param);
         convert(param, wrapper);
         if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
@@ -74,6 +78,17 @@
         return R.ok();
     }
 
+    @RequestMapping(value = "/issue/process/auth")
+    @ManagerAuth
+    public R process(@RequestBody Issue issue) throws InterruptedException {
+        Thread.sleep(1000);
+        if (Cools.isEmpty(issue) || null==issue.getId()){
+            return R.error();
+        }
+        issueService.updateById(issue);
+        return R.ok("鏁版嵁鏇存柊鎴愬姛");
+    }
+
     @RequestMapping(value = "/issue/delete/auth")
     @ManagerAuth
     public R delete(@RequestParam(value="ids[]") Long[] ids){

--
Gitblit v1.9.1