From 9d43c54b19100f357ea1036bfff5f5ac4a6ec952 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期六, 06 八月 2022 13:27:00 +0800
Subject: [PATCH] 应急实施评价
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java | 2
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillExecuteInfoRepository.java | 2 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java | 2 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java | 3 +
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml | 5 ++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteQuery.java | 9 ++++
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml | 1
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml | 6 --
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java | 15 ++++++-
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyWorkApproveServiceImpl.java | 53 +++++++++++++++-----------
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java | 1
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillExecuteInfoServiceImpl.java | 5 ++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyDrillExecuteDBQuery.java | 9 ++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillExecuteInfoService.java | 2 +
14 files changed, 84 insertions(+), 31 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java
index 5b5289e..8eb952c 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java
@@ -68,6 +68,8 @@
APPROVE_STATUS_NULL("A1004","审批状态不可为空"),
+ APPROVE_NOT_EXIST("A1005" , "审批记录不存在"),
+
ERROR("A3000", "未知错误");
private String code;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java
index 26aafc1..bb251ba 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java
@@ -6,10 +6,21 @@
public class EmergencyPlanPageRespDTO {
- // 审批状态
+ // 最新的审批id
+ private Long approveId;
+
+ public Long getApproveId() {
+ return approveId;
+ }
+
+ public void setApproveId(Long approveId) {
+ this.approveId = approveId;
+ }
+
+ // 最新的审批状态
private Integer approveStatus;
- // 审批人
+ // 最新的审批人
private Long approvePersonId;
// 审批人是否为当前登录人
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteQuery.java
index 38090a6..4fd2132 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteQuery.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteQuery.java
@@ -2,4 +2,13 @@
public class EmergencyDrillExecuteQuery {
+ private Boolean status;
+
+ public Boolean getStatus() {
+ return status;
+ }
+
+ public void setStatus(Boolean status) {
+ this.status = status;
+ }
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyDrillExecuteDBQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyDrillExecuteDBQuery.java
index e3551c2..f08743a 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyDrillExecuteDBQuery.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyDrillExecuteDBQuery.java
@@ -2,4 +2,13 @@
public class EmergencyDrillExecuteDBQuery {
+ private Boolean status;
+
+ public Boolean getStatus() {
+ return status;
+ }
+
+ public void setStatus(Boolean status) {
+ this.status = status;
+ }
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillExecuteInfoRepository.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillExecuteInfoRepository.java
index 29c8e2c..59cc806 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillExecuteInfoRepository.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillExecuteInfoRepository.java
@@ -23,4 +23,6 @@
void updateEmergencyDrillExecute(EmergencyDrillExecuteInfo emergencyDrillExecuteInfo);
void deleteEmergencyDrillExecute(@Param("id") Long id);
+
+ void updateStatusById(@Param("drillExecuteId")Long drillExecuteId);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillExecuteInfoService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillExecuteInfoService.java
index 2d546f3..117fec5 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillExecuteInfoService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillExecuteInfoService.java
@@ -21,4 +21,6 @@
void updateEmergencyDrillExecute(EmergencyDrillExecuteInfo emergencyDrillExecuteInfo);
void deleteEmergencyDrillExecute(Long DrillExecuteId);
+
+ void updateStatusById(Long drillExecuteId);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillExecuteInfoServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillExecuteInfoServiceImpl.java
index f3f8f4a..ac2e2a9 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillExecuteInfoServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillExecuteInfoServiceImpl.java
@@ -44,5 +44,10 @@
emergencyDrillExecuteInfoRepository.deleteEmergencyDrillExecute(DrillExecuteId);
}
+ @Override
+ public void updateStatusById(Long drillExecuteId) {
+ emergencyDrillExecuteInfoRepository.updateStatusById(drillExecuteId);
+ }
+
}
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 69ead7e..c203bc7 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
@@ -102,6 +102,9 @@
if (!CollectionUtils.isEmpty(emergencyDrillEvaluationReqDTO.getUserList())) {
addEmergencyDrillEvaluationUser(uid, emergencyDrillEvaluationInfo.getId(), nowDate, emergencyDrillEvaluationReqDTO.getUserList());
}
+
+ // 修改实施表的评价状态
+ emergencyDrillExecuteInfoService.updateStatusById(emergencyDrillEvaluationReqDTO.getDrillExecuteId());
return new ResultVO<>(ResultCodes.OK);
}
}
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 b8a24ff..ca72d32 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
@@ -85,7 +85,7 @@
emergencyDrillExecuteInfo.setDelFlag(false);
emergencyDrillExecuteInfo.setCreateUid(uid);
emergencyDrillExecuteInfo.setGmtCreate(nowDate);
- emergencyDrillExecuteInfo.setStatus(true);
+ emergencyDrillExecuteInfo.setStatus(false);
emergencyDrillExecuteInfoService.addEmergencyDrillExecute(emergencyDrillExecuteInfo);
// 新增应急演练计划实施实际到场人员表
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 f0c7911..01766ef 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
@@ -73,6 +73,7 @@
List<EmergencyWorkApproveInfoDetailDO> emergencyWorkApproveInfoDetailDOList = emergencyWorkApproveInfoService.selectWorkApproveByRelateTypeAndRelateId(type,emergencyPlanPageRespDTO.getId());
if (!CollectionUtils.isEmpty(emergencyWorkApproveInfoDetailDOList)) {
+ emergencyPlanPageRespDTO.setApproveId(emergencyWorkApproveInfoDetailDOList.get(0).getId());
emergencyPlanPageRespDTO.setApproveStatus(emergencyWorkApproveInfoDetailDOList.get(0).getApproveStatus());
emergencyPlanPageRespDTO.setApprovePersonId(emergencyWorkApproveInfoDetailDOList.get(0).getApprovePersonId());
// 审批中 判断审批人是否人与当前登录人
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyWorkApproveServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyWorkApproveServiceImpl.java
index 76514b5..e597290 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyWorkApproveServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyWorkApproveServiceImpl.java
@@ -127,37 +127,44 @@
return new ResultVO(ResultCodes.OK);
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@Override
public ResultVO<EmergencyWorkApproveDetailRespDTO> getWorkApproveById(Long id) {
-
EmergencyWorkApproveInfoDetailDO EmergencyWorkApproveInfoDetailDO = workApproveInfoService.selectWorkApproveById(id);
+ if (EmergencyWorkApproveInfoDetailDO==null){
+ throw new EmergencyException(EmergencyResultCodes.APPROVE_NOT_EXIST);
+ }
EmergencyWorkApproveDetailRespDTO emergencyWorkApproveDetailRespDTO = new EmergencyWorkApproveDetailRespDTO();
BeanUtils.copyProperties(EmergencyWorkApproveInfoDetailDO, emergencyWorkApproveDetailRespDTO);
-
return new ResultVO<>(ResultCodes.OK, emergencyWorkApproveDetailRespDTO);
}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@Override
public ResultVO batchDeleteWorkApprove(String ids) {
if (!StringUtils.isBlank(ids)) {
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 bf104aa..2b65a3f 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
@@ -28,6 +28,7 @@
LEFT JOIN emergency_plan d ON c.plan_id = d.id
WHERE
a.del_flag = 0
+
</select>
<insert id="addEmergencyDrillEvaluation" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationInfo"
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
index 692a495..2a6a64e 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
@@ -31,6 +31,7 @@
LEFT JOIN emergency_plan c ON b.plan_id = c.id
WHERE
a.del_flag = 0
+ <if test="query.status != null and query.status != ''">and a.status = #{query.status}</if>
</select>
<insert id="addEmergencyDrillExecute" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfo"
@@ -115,4 +116,8 @@
<update id="deleteEmergencyDrillExecute">
update emergency_drill_execute set del_flag = 1 where id = #{id}
</update>
+
+ <update id="updateStatusById">
+ update emergency_drill_execute set status = 1 where id = #{drillExecuteId}
+ </update>
</mapper>
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml
index e0b23fb..9d34a0a 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml
@@ -22,13 +22,9 @@
a.`type`,
a.`level`,
a.release_date,
- a.author_name,
- b.approve_status AS approveStatus,
- b.approve_person_id AS approvePersonId
+ a.author_name
FROM
emergency_plan a
- LEFT JOIN emergency_work_approve b ON a.id = b.relate_id
- AND b.relate_type = 1
WHERE
a.del_flag = 0
AND a.abolish_status = #{query.abolishStatus}
--
Gitblit v1.9.2