From aace11a7e1201a8d1fc0b50b659368918d23e794 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Tue, 02 Aug 2022 16:43:59 +0800
Subject: [PATCH] 一览接口fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyWorkApproveServiceImpl.java | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyWorkApproveServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyWorkApproveServiceImpl.java
index 09acac0..b6f3338 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyWorkApproveServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyWorkApproveServiceImpl.java
@@ -48,7 +48,7 @@
return new SearchResultVO<>(
true,
pageIndex,
- pageSize,
+ pageSize,page.getPages(),
page.getTotal(),
respList,
ResultCodes.OK
@@ -83,18 +83,12 @@
@Override
public ResultVO updateWorkApprove(Long uid, EmergencyWorkApproveReqDTO EmergencyWorkApproveReqDTO) {
Date nowDate = new Date();
- //查询是否存在
- EmergencyWorkApproveInfoDetailDO EmergencyWorkApproveInfoDetailDO = workApproveInfoService.selectWorkApproveById(EmergencyWorkApproveReqDTO.getId());
- if (EmergencyWorkApproveInfoDetailDO == null) {
- throw new EmergencyException(EmergencyResultCodes.TEAM_NOT_EXIST);
- } else {
- EmergencyWorkApproveInfo EmergencyWorkApproveInfo = new EmergencyWorkApproveInfo();
- BeanUtils.copyProperties(EmergencyWorkApproveReqDTO, EmergencyWorkApproveInfo);
- EmergencyWorkApproveInfo.setUpdateUid(uid);
- EmergencyWorkApproveInfo.setGmtModitify(nowDate);
- workApproveInfoService.updateWorkApprove(EmergencyWorkApproveInfo);
- return new ResultVO(ResultCodes.OK);
- }
+ EmergencyWorkApproveInfo EmergencyWorkApproveInfo = new EmergencyWorkApproveInfo();
+ BeanUtils.copyProperties(EmergencyWorkApproveReqDTO, EmergencyWorkApproveInfo);
+ EmergencyWorkApproveInfo.setUpdateUid(uid);
+ EmergencyWorkApproveInfo.setGmtModitify(nowDate);
+ workApproveInfoService.updateWorkApprove(EmergencyWorkApproveInfo);
+ return new ResultVO(ResultCodes.OK);
}
@Override
--
Gitblit v1.9.2