From 5703d0e9865df3ba05bb02bc382ce59fbf5f7da0 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 12 八月 2022 16:59:06 +0800
Subject: [PATCH] Merge branch 'genchuang' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java
index 3a88c08..362db22 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java
@@ -102,7 +102,7 @@
checkRequired(accidentExpressReqDTO);
Date nowDate = new Date();
- //1.新增应急队伍
+ //1.新增事故快报
AccidentExpressInfo accidentExpressInfo = new AccidentExpressInfo();
BeanUtils.copyProperties(accidentExpressReqDTO, accidentExpressInfo);
accidentExpressInfo.setDelFlag(false);
@@ -110,7 +110,7 @@
accidentExpressInfo.setCreateName(uName);
accidentExpressInfo.setGmtCreate(nowDate);
accidentExpressInfoService.addAccidentExpress(accidentExpressInfo);
- //2.新增应急队伍附件
+ //2.新增事故快报附件
if (!CollectionUtils.isEmpty(accidentExpressReqDTO.getFileList())){
addAccidentExpressFile(accidentExpressInfo.getId(),uid,nowDate,accidentExpressReqDTO.getFileList());
}
@@ -162,7 +162,7 @@
accidentExpressInfo.setUpdateUid(uid);
accidentExpressInfo.setGmtModitify(nowDate);
accidentExpressInfoService.updateAccidentExpress(accidentExpressInfo);
- //修改应急队伍附件
+ //修改事故快报附件
updateAccidentExpressFile(uid,accidentExpressReqDTO.getId(),nowDate,accidentExpressReqDTO.getFileList());
return new ResultVO(ResultCodes.OK);
}
@@ -211,13 +211,12 @@
@Override
- public ResultVO batchDeleteAccidentExpress(String ids) {
- if (StringUtils.isBlank(ids)){
+ public ResultVO batchDeleteAccidentExpress(Long[] ids) {
+ if (ids == null || ids.length==0){
throw new AccidentException(AccidentResultCodes.ACCIDENT_EXPRESS_NULL);
}else{
- String[] idArr = ids.split(",");
- for (String id : idArr) {
- deleteAccidentExpress(Long.valueOf(id));
+ for (Long id : ids){
+ deleteAccidentExpress(id);
}
return new ResultVO(ResultCodes.OK);
}
@@ -232,6 +231,8 @@
accidentExpressInfoService.deleteAccidentExpressById(id);
//删除附件
accidentExpressFileInfoService.deleteAccidentExpressFileByAccidentExpressId(id);
+ //删除伤亡
+ accidentExpressCasualtyInfoService.deleteAccidentExpressCasualtyByAccidentExpressId(id);
}
}
--
Gitblit v1.9.2