From 2a6c0b5cefd70e2828e87d6ade3d5f36f723ad7f Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 26 七月 2022 16:48:06 +0800
Subject: [PATCH] 应急队伍一览接口
---
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentReportServiceImpl.java | 72 ++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 28 deletions(-)
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentReportServiceImpl.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentReportServiceImpl.java
index 0df3f3c..31f0516 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentReportServiceImpl.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentReportServiceImpl.java
@@ -212,42 +212,58 @@
* @return
*/
private void checkRequired(AccidentReportReqDTO AccidentReportReqDTO) {
- /* //名称
- if (StringUtils.isBlank(AccidentReportReqDTO.getAccidentName())) {
- throw new AccidentException(AccidentResultCodes.Report_NAME_NULL);
+ //事故快报
+ if (AccidentReportReqDTO.getAccidentExpressId() == null ) {
+ throw new AccidentException(AccidentResultCodes.ACCIDENT_EXPRESS_NULL);
}
- //部门
- if (AccidentReportReqDTO.getAccidentDepartmentId()==null) {
- throw new AccidentException(AccidentResultCodes.Report_DEPARTMENT_NULL);
+ //事故类型
+ if (StringUtils.isBlank(AccidentReportReqDTO.getAccidentType())) {
+ throw new AccidentException(AccidentResultCodes.REPORT_TYPE_NULL);
}
- //发生时间
- if (AccidentReportReqDTO.getOccurrenceTime() == null ) {
- throw new AccidentException(AccidentResultCodes.Report_TIME_NULL);
+ //事故等级
+ if (StringUtils.isBlank(AccidentReportReqDTO.getAccidentGrade())) {
+ throw new AccidentException(AccidentResultCodes.REPORT_GRADE_NULL);
}
- //发生地点
- if (StringUtils.isBlank(AccidentReportReqDTO.getOccurrencePlace())) {
- throw new AccidentException(AccidentResultCodes.Report_PLACE_NULL);
+ //经济损失
+ if (AccidentReportReqDTO.getEconomicLoss() == null ) {
+ throw new AccidentException(AccidentResultCodes.REPORT_ECONOMIC_LOSS_NULL);
}
- //事故原因
- if (StringUtils.isBlank(AccidentReportReqDTO.getAccidentCause())) {
- throw new AccidentException(AccidentResultCodes.Report_CAUSE_NULL);
+ //要求报告完成期限
+ if (AccidentReportReqDTO.getReportDeadline() == null ) {
+ throw new AccidentException(AccidentResultCodes.REPORT_REPORT_DEADLINE_NULL);
}
- //是否有伤亡
- if (AccidentReportReqDTO.getCasualties()==null) {
- throw new AccidentException(AccidentResultCodes.Report_CASUALTIES_NULL);
+ //事故级别
+ if (StringUtils.isBlank(AccidentReportReqDTO.getAccidentLevel())) {
+ throw new AccidentException(AccidentResultCodes.REPORT_LEVEL_NULL);
}
- //简要经过
- if (StringUtils.isBlank(AccidentReportReqDTO.getAccidentBriefProcess())) {
- throw new AccidentException(AccidentResultCodes.Report_BRIEF_PROCESS_NULL);
+ //原因综合分析（直接）
+ if (StringUtils.isBlank(AccidentReportReqDTO.getComprehensiveAnalysisDirect())) {
+ throw new AccidentException(AccidentResultCodes.REPORT_COMPREHENSIVE_ANALYSIS_DIRECT_NULL);
}
- //初步分析
- if (StringUtils.isBlank(AccidentReportReqDTO.getAccidentCausesPreliminaryAnalysis())) {
- throw new AccidentException(AccidentResultCodes.Report_CASE_PRELIMINARY_ANALYSIS_NULL);
+ //原因综合分析（直接）
+ if (StringUtils.isBlank(AccidentReportReqDTO.getComprehensiveAnalysisDirect())) {
+ throw new AccidentException(AccidentResultCodes.REPORT_COMPREHENSIVE_ANALYSIS_DIRECT_NULL);
}
- //应急防范措施
- if (StringUtils.isBlank(AccidentReportReqDTO.getEmergencyPrecautions())) {
- throw new AccidentException(AccidentResultCodes.Report_EMERGENCY_PRECAUTIONS_NULL);
- }*/
+ //原因综合分析（间接）
+ if (StringUtils.isBlank(AccidentReportReqDTO.getComprehensiveAnalysisIndirect())) {
+ throw new AccidentException(AccidentResultCodes.REPORT_COMPREHENSIVE_ANALYSIS_INDIRECT_NULL);
+ }
+ //整改措施
+ if (StringUtils.isBlank(AccidentReportReqDTO.getRectificationMeasures())) {
+ throw new AccidentException(AccidentResultCodes.REPORT_RECTIFICATION_MEASURES_NULL);
+ }
+ //事故处理
+ if (StringUtils.isBlank(AccidentReportReqDTO.getAccidentHandling())) {
+ throw new AccidentException(AccidentResultCodes.REPORT_ACCIDENT_HANDLING_NULL);
+ }
+ //填写人
+ if (AccidentReportReqDTO.getFillInUserUid() == null ) {
+ throw new AccidentException(AccidentResultCodes.REPORT_FILL_IN_USER_UID_NULL);
+ }
+ //填写日期
+ if (AccidentReportReqDTO.getFillInTime() == null ) {
+ throw new AccidentException(AccidentResultCodes.REPORT_FILL_IN_TIME_NULL);
+ }
}
}
--
Gitblit v1.9.2