From 811378d28db922f1e2945015ac9b0154db46ea54 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期六, 06 八月 2022 17:40:40 +0800
Subject: [PATCH] fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java
index 655471e..6b9b87c 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java
@@ -1,6 +1,7 @@
package com.gkhy.safePlatform.emergency.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gkhy.safePlatform.commons.enums.E;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
@@ -18,6 +19,7 @@
import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteQuery;
import com.gkhy.safePlatform.emergency.query.db.EmergencyDrillExecuteDBQuery;
import com.gkhy.safePlatform.emergency.service.EmergencyDrillExecuteService;
+import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillEvaluationInfoService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillExecuteInfoService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillExecuteUserInfoService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillPlanInfoService;
@@ -42,6 +44,9 @@
@Autowired
private EmergencyDrillPlanInfoService emergencyDrillPlanInfoService;
+
+ @Autowired
+ private EmergencyDrillEvaluationInfoService emergencyDrillEvaluationInfoService;
@Override
@@ -85,7 +90,7 @@
emergencyDrillExecuteInfo.setDelFlag(false);
emergencyDrillExecuteInfo.setCreateUid(uid);
emergencyDrillExecuteInfo.setGmtCreate(nowDate);
- emergencyDrillExecuteInfo.setStatus(true);
+ emergencyDrillExecuteInfo.setStatus(false);
emergencyDrillExecuteInfoService.addEmergencyDrillExecute(emergencyDrillExecuteInfo);
// 新增应急演练计划实施实际到场人员表
@@ -93,6 +98,14 @@
addEmergencyDrillExecuteUser(uid, emergencyDrillExecuteInfo.getId(), nowDate, emergencyDrillExecuteReqDTO.getUserList());
}
+ // 新增评价表一行数据
+ EmergencyDrillEvaluationInfo emergencyDrillEvaluationInfo = new EmergencyDrillEvaluationInfo();
+ emergencyDrillEvaluationInfo.setDelFlag(false);
+ emergencyDrillEvaluationInfo.setCreateUid(uid);
+ emergencyDrillEvaluationInfo.setGmtCreate(nowDate);
+ emergencyDrillEvaluationInfo.setDrillExecuteId(emergencyDrillExecuteInfo.getId());
+ emergencyDrillEvaluationInfoService.addEmergencyDrillEvaluation(emergencyDrillEvaluationInfo);
+
return new ResultVO<>(ResultCodes.OK);
}
}
@@ -196,13 +209,12 @@
}
@Override
- public ResultVO batchDeleteEmergencyDrillExecute(String ids) {
- if (StringUtils.isBlank(ids)) {
+ public ResultVO batchDeleteEmergencyDrillExecute(Long[] ids) {
+ if (ids == null || ids.length==0){
throw new EmergencyException(EmergencyResultCodes.DRILL_EXECUTE_NULL);
- } else {
- String[] idArr = ids.split(",");
- for (String id : idArr) {
- deleteEmergencyDrillExecute(Long.valueOf(id));
+ }else{
+ for (Long id : ids){
+ deleteEmergencyDrillExecute(id);
}
return new ResultVO(ResultCodes.OK);
}
--
Gitblit v1.9.2