From cd02923a7ce1ffa004b3abbb7af67ab6173dd99d Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期一, 25 三月 2024 10:59:40 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 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 5e12146..00a745e 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
@@ -4,7 +4,6 @@
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
-import com.gkhy.safePlatform.commons.utils.StringUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.entity.*;
@@ -12,15 +11,16 @@
import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyDrillExecuteReqDTO;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyDrillExecuteUserReqDTO;
-import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecuteDetailRespDTO;
-import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecutePageRespDTO;
-import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecuteUserRespDTO;
+import com.gkhy.safePlatform.emergency.model.dto.resp.*;
import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteQuery;
+import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteCountQuery;
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;
+import com.gkhy.safePlatform.emergency.utils.TimeUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -43,6 +43,9 @@
@Autowired
private EmergencyDrillPlanInfoService emergencyDrillPlanInfoService;
+ @Autowired
+ private EmergencyDrillEvaluationInfoService emergencyDrillEvaluationInfoService;
+
@Override
public SearchResultVO<List<EmergencyDrillExecutePageRespDTO>> selectEmergencyDrillExecuteList(PageQuery<EmergencyDrillExecuteQuery> query) {
@@ -60,7 +63,7 @@
return new SearchResultVO<>(
true,
pageIndex,
- pageSize,
+ pageSize,page.getPages(),
page.getTotal(),
respList,
ResultCodes.OK
@@ -85,7 +88,7 @@
emergencyDrillExecuteInfo.setDelFlag(false);
emergencyDrillExecuteInfo.setCreateUid(uid);
emergencyDrillExecuteInfo.setGmtCreate(nowDate);
- emergencyDrillExecuteInfo.setStatus(true);
+ emergencyDrillExecuteInfo.setStatus(false);
emergencyDrillExecuteInfoService.addEmergencyDrillExecute(emergencyDrillExecuteInfo);
// 新增应急演练计划实施实际到场人员表
@@ -93,6 +96,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 +207,12 @@
}
@Override
- public ResultVO batchDeleteEmergencyDrillExecute(String ids) {
- if (StringUtils.isBlank(ids)) {
- throw new EmergencyException(EmergencyResultCodes.DRILL_EXECUTE_NOT_EXIST);
- } else {
- String[] idArr = ids.split(",");
- for (String id : idArr) {
- deleteEmergencyDrillExecute(Long.valueOf(id));
+ public ResultVO batchDeleteEmergencyDrillExecute(Long[] ids) {
+ if (ids == null || ids.length==0){
+ throw new EmergencyException(EmergencyResultCodes.DRILL_EXECUTE_NULL);
+ }else{
+ for (Long id : ids){
+ deleteEmergencyDrillExecute(id);
}
return new ResultVO(ResultCodes.OK);
}
@@ -220,4 +230,5 @@
emergencyDrillExecuteUserInfoService.deleteEmergencyDrillExecuteUserByDrillExecuteId(DrillExecuteId);
}
}
+
}
--
Gitblit v1.9.2