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/EmergencyDrillPlanServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java
index 208090e..786b6bf 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java
@@ -59,7 +59,7 @@
return new SearchResultVO<>(
true,
pageIndex,
- pageSize,
+ pageSize,page.getPages(),
page.getTotal(),
respList,
ResultCodes.OK
@@ -170,7 +170,7 @@
if (!CollectionUtils.isEmpty(emergencyDrillPlanReqDTO.getFileList())) {
updateEmergencyDrillPlanFile(uid, emergencyDrillPlanInfo.getId(), nowDate, emergencyDrillPlanReqDTO.getFileList());
}
- // 更新急演练计划应急队伍表
+ // 更新急演练计划应急人员表
if (!CollectionUtils.isEmpty(emergencyDrillPlanReqDTO.getUserList())) {
updateEmergencyDrillPlanUser(uid, emergencyDrillPlanInfo.getId(), nowDate, emergencyDrillPlanReqDTO.getUserList());
}
@@ -264,7 +264,7 @@
@Override
public ResultVO batchDeleteEmergencyDrillPlan(String ids) {
if (StringUtils.isBlank(ids)) {
- throw new EmergencyException(EmergencyResultCodes.DRILL_PLAN_NOT_EXIST);
+ throw new EmergencyException(EmergencyResultCodes.DRILL_PLAN_NULL);
} else {
String[] idArr = ids.split(",");
for (String id : idArr) {
@@ -284,7 +284,7 @@
emergencyDrillPlanInfoService.deleteEmergencyDrillPlan(DrillPlanId);
//删除附件
emergencyDrillPlanFileInfoService.deleteEmergencyDrillPlanFileByDrillPlanId(DrillPlanId);
- //删除应急队伍
+ //删除人员
emergencyDrillPlanUserInfoService.deleteEmergencyDrillPlanUserByDrillPlanId(DrillPlanId);
}
}
--
Gitblit v1.9.2