From 741690917d5d530c2341a80bbecfed08f3f88488 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期六, 06 八月 2022 13:41:08 +0800
Subject: [PATCH] fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java | 13 +++++++++++++
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml | 4 ++--
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillEvaluationInfoServiceImpl.java | 4 ++--
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillEvaluationInfoService.java | 2 +-
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillEvaluationInfoRepository.java | 2 +-
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java | 6 +++---
6 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillEvaluationInfoRepository.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillEvaluationInfoRepository.java
index 9a5330c..63c55eb 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillEvaluationInfoRepository.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillEvaluationInfoRepository.java
@@ -18,7 +18,7 @@
void addEmergencyDrillEvaluation(EmergencyDrillEvaluationInfo emergencyDrillEvaluationInfo);
- EmergencyDrillEvaluationInfoDetailDO selectEmergencyDrillEvaluationById(@Param("id") Long id);
+ EmergencyDrillEvaluationInfoDetailDO selectEmergencyDrillEvaluationByExecuteId(@Param("id") Long id);
void updateEmergencyDrillEvaluation(EmergencyDrillEvaluationInfo emergencyDrillEvaluationInfo);
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillEvaluationInfoService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillEvaluationInfoService.java
index b8ee6da..b5b22b9 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillEvaluationInfoService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillEvaluationInfoService.java
@@ -16,7 +16,7 @@
void addEmergencyDrillEvaluation(EmergencyDrillEvaluationInfo emergencyDrillEvaluationInfo);
- EmergencyDrillEvaluationInfoDetailDO selectEmergencyDrillEvaluationById(Long id);
+ EmergencyDrillEvaluationInfoDetailDO selectEmergencyDrillEvaluationByExecuteId(Long id);
void updateEmergencyDrillEvaluation(EmergencyDrillEvaluationInfo emergencyDrillEvaluationInfo);
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillEvaluationInfoServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillEvaluationInfoServiceImpl.java
index c8f733e..4b8488e 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillEvaluationInfoServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillEvaluationInfoServiceImpl.java
@@ -30,8 +30,8 @@
}
@Override
- public EmergencyDrillEvaluationInfoDetailDO selectEmergencyDrillEvaluationById(Long id) {
- return emergencyDrillEvaluationInfoRepository.selectEmergencyDrillEvaluationById(id);
+ public EmergencyDrillEvaluationInfoDetailDO selectEmergencyDrillEvaluationByExecuteId(Long id) {
+ return emergencyDrillEvaluationInfoRepository.selectEmergencyDrillEvaluationByExecuteId(id);
}
@Override
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java
index c203bc7..7274884 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java
@@ -140,7 +140,7 @@
public ResultVO<EmergencyDrillEvaluationDetailRespDTO> getEmergencyDrillEvaluationById(Long id) {
EmergencyDrillEvaluationDetailRespDTO emergencyDrillEvaluationDetailRespDTO = new EmergencyDrillEvaluationDetailRespDTO();
// 查询是否存在
- EmergencyDrillEvaluationInfoDetailDO emergencyDrillEvaluationInfoDetailDO = emergencyDrillEvaluationInfoService.selectEmergencyDrillEvaluationById(id);
+ EmergencyDrillEvaluationInfoDetailDO emergencyDrillEvaluationInfoDetailDO = emergencyDrillEvaluationInfoService.selectEmergencyDrillEvaluationByExecuteId(id);
if (emergencyDrillEvaluationInfoDetailDO == null) {
throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_NOT_EXIST);
} else {
@@ -189,7 +189,7 @@
public ResultVO updateEmergencyDrillEvaluation(Long uid, EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO) {
Date nowDate = new Date();
// 查询是否存在
- EmergencyDrillEvaluationInfoDetailDO emergencyDrillEvaluationInfoDetailDO = emergencyDrillEvaluationInfoService.selectEmergencyDrillEvaluationById(emergencyDrillEvaluationReqDTO.getId());
+ EmergencyDrillEvaluationInfoDetailDO emergencyDrillEvaluationInfoDetailDO = emergencyDrillEvaluationInfoService.selectEmergencyDrillEvaluationByExecuteId(emergencyDrillEvaluationReqDTO.getId());
if (emergencyDrillEvaluationInfoDetailDO == null) {
throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_NOT_EXIST);
} else {
@@ -309,7 +309,7 @@
private void deleteEmergencyDrillEvaluation(Long id) {
//查询是否存在
- EmergencyDrillEvaluationInfoDetailDO emergencyDrillEvaluationInfoDetailDO = emergencyDrillEvaluationInfoService.selectEmergencyDrillEvaluationById(id);
+ EmergencyDrillEvaluationInfoDetailDO emergencyDrillEvaluationInfoDetailDO = emergencyDrillEvaluationInfoService.selectEmergencyDrillEvaluationByExecuteId(id);
if (emergencyDrillEvaluationInfoDetailDO == null) {
throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_NOT_EXIST);
} else {
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 ca72d32..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
@@ -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);
}
}
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml
index 2b65a3f..1913759 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml
@@ -105,7 +105,7 @@
<result column="modify_content" property="modifyContent"/>
</resultMap>
- <select id="selectEmergencyDrillEvaluationById" resultMap="emergencyDrillEvaluationInfoDetailDOResult">
+ <select id="selectEmergencyDrillEvaluationByExecuteId" resultMap="emergencyDrillEvaluationInfoDetailDOResult">
SELECT
a.id,
a.`drill_execute_id`,
@@ -151,7 +151,7 @@
LEFT JOIN emergency_plan d ON c.plan_id = d.id
WHERE
a.del_flag = 0
- AND a.id = #{id}
+ AND a.drill_execute_id = #{id}
</select>
<update id="updateEmergencyDrillEvaluation" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationInfo">
--
Gitblit v1.9.2