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/service/impl/WorkApproveServiceImpl.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/WorkApproveServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/WorkApproveServiceImpl.java
index cc77129..9afae3e 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/WorkApproveServiceImpl.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/WorkApproveServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gkhy.safePlatform.targetDuty.model.dto.req.ExcApprove;
import com.gkhy.safePlatform.targetDuty.model.dto.req.SubmitApprove;
import com.gkhy.safePlatform.targetDuty.repository.WorkApproveRepository;
import com.gkhy.safePlatform.targetDuty.entity.WorkApprove;
@@ -31,9 +32,9 @@
@Autowired
private WorkApproveRepository workApproveRepository;
-
-
-
+
+
+
@Override
public ResultVO queryAll(PageQuery<WorkApproveQueryCriteria> pageQuery) {
Long pageIndex = pageQuery.getPageIndex();
@@ -47,7 +48,7 @@
return new SearchResultVO<>(
true,
pageIndex,
- pageSize,
+ pageSize,page.getPages(),
page.getTotal(),
respList,
ResultCodes.OK
@@ -63,8 +64,15 @@
@Override
public void submitApprove(SubmitApprove submitApprove) {
WorkApprove workApprove = BeanCopyUtils.copyBean(submitApprove, WorkApprove.class);
-// workApprove.setWorkName();
+ workApprove.setWorkName(submitApprove.getTitle());
// workApprove.setApprovePersonId();
this.save(workApprove);
}
-}
\ No newline at end of file
+
+ @Override
+ public void excApprove(ExcApprove excApprove) {
+ WorkApprove workApprove = BeanCopyUtils.copyBean(excApprove, WorkApprove.class);
+ workApprove.setApproveStatus(3);
+ this.updateById(workApprove);
+ }
+}
--
Gitblit v1.9.2