From d4c032bd81ac3320a2ef54a83fe24decc0e6b63c Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 02 八月 2022 19:06:10 +0800
Subject: [PATCH] 事故模块人员/部门传值
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java
index 5aad17f..e7a62f1 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java
@@ -61,7 +61,7 @@
return new SearchResultVO<>(
true,
pageIndex,
- pageSize,
+ pageSize,page.getPages(),
page.getTotal(),
respList,
ResultCodes.OK
@@ -200,7 +200,7 @@
EmergencyPlanInfo emergencyPlanInfo = new EmergencyPlanInfo();
BeanUtils.copyProperties(emergencyPlanReqDTO,emergencyPlanInfo);
emergencyPlanInfo.setUpdateUid(uid);
- emergencyPlanInfo.setGmtModitify(new Date());
+ emergencyPlanInfo.setGmtModitify(nowDate);
emergencyPlanInfoService.updateEmergencyPlan(emergencyPlanInfo);
// 更新应急预案区域表
@@ -404,6 +404,7 @@
throw new EmergencyException(EmergencyResultCodes.PLAN_NOT_EXIST);
}else{
Long PlanId = emergencyPlanInfoDetailDO.getId();
+ emergencyPlanInfoService.deleteEmergencyPlan(PlanId);
//删除区域
emergencyPlanAreaInfoService.deleteEmergencyPlanAreaByPlanId(PlanId);
//删除适用部门
--
Gitblit v1.9.2