From aace11a7e1201a8d1fc0b50b659368918d23e794 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 02 八月 2022 16:43:59 +0800
Subject: [PATCH] 一览接口fix

---
 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/WorkApproveController.java |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/WorkApproveController.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/WorkApproveController.java
index 7a3e629..9a14123 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/WorkApproveController.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/WorkApproveController.java
@@ -6,8 +6,10 @@
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gkhy.safePlatform.targetDuty.entity.WorkApprove;
+import com.gkhy.safePlatform.targetDuty.model.dto.req.ExcApprove;
 import com.gkhy.safePlatform.targetDuty.model.dto.req.SubmitApprove;
 import com.gkhy.safePlatform.targetDuty.service.WorkApproveService;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import com.gkhy.safePlatform.commons.query.PageQuery;
 import com.gkhy.safePlatform.commons.utils.PageUtils;
@@ -44,10 +46,10 @@
      */
     @PostMapping(value = "/page/list")
     public ResultVO selectAll(@RequestBody PageQuery<WorkApproveQueryCriteria> pageQuery){
-		PageUtils.checkCheck(pageQuery.getPageIndex(), pageQuery.getPageSize());
+		PageUtils.checkCheck(pageQuery);
 		return this.workApproveService.queryAll(pageQuery);
     }
-	
+
 
     /**
      * 通过主键查询单条数据
@@ -72,6 +74,22 @@
         return new ResultVO<>(ResultCodes.OK);
     }
 
+
+    /**
+     * 审批
+     *
+     * @param excApprove 实体对象
+     * @return 修改结果
+     */
+    @PostMapping(value = "/excApprove")
+    public ResultVO excApprove(@RequestBody ExcApprove excApprove) {
+        if(excApprove.getId() == null){
+            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
+        }
+        workApproveService.excApprove(excApprove);
+        return new ResultVO<>(ResultCodes.OK);
+    }
+
     /**
      * 删除数据
      *
@@ -85,4 +103,4 @@
         this.workApproveService.removeByIds(idList);
         return new ResultVO<>(ResultCodes.OK);
     }
-}
\ No newline at end of file
+}

--
Gitblit v1.9.2