From a4a3f30fa1868c7c8b823a947a5cda423acce57d Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期六, 31 七月 2021 10:08:58 +0800
Subject: [PATCH] 防火防汛接口开发
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java
index 47097d4..303b27f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java
@@ -23,6 +23,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
import java.util.Date;
/**
@@ -71,6 +72,8 @@
BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwPatrolRecordDO);
Long patrolRecordId = Snowflake.getId();
comSwPatrolRecordDO.setId(patrolRecordId);
+ comSwPatrolRecordDO.setPersonName(comSwPatrolRecordAddDTO.getPPersonName());
+ comSwPatrolRecordDO.setPersonPhone(comSwPatrolRecordAddDTO.getPPersonPhone());
comSwPatrolRecordDAO.insert(comSwPatrolRecordDO);
//巡查记录和关联报告信息
ComSwPatrolRecordReportDO comSwPatrolRecordReportDO = new ComSwPatrolRecordReportDO();
@@ -80,15 +83,19 @@
if (comSwPatrolRecordAddDTO.getIsHiddenDanger().intValue() == ComSwPatrolRecordAddDTO.isOk.yes) {
//如果存在安全隐患，自动生成安全隐患报告
ComSwDangerReportDO comSwDangerReportDO = new ComSwDangerReportDO();
- BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwDangerReportDO);
Long dangerReportId = Snowflake.getId();
comSwDangerReportDO.setId(dangerReportId);
comSwPatrolRecordReportDO.setReportId(dangerReportId);
comSwDangerReportDO.setDangerType(comSwPatrolRecordAddDTO.getPatrolType());
if (comSwPatrolRecordAddDTO.getIsRectifyImmediately().intValue() == ComSwPatrolRecordAddDTO.isOk.yes && StringUtils.isNotEmpty(comSwPatrolRecordAddDTO.getTakeSteps())) {
comSwDangerReportDO.setStatus(String.valueOf(SafeWordStatusEnum.YZG.getCode()));
+ comSwDangerReportDO.setRectifyTime(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+ }else {
+ comSwDangerReportDO.setStatus(String.valueOf(SafeWordStatusEnum.DCL.getCode()));
}
- comSwDangerReportDO.setRectifyTime(new Date());
+ BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwDangerReportDO);
+ comSwDangerReportDO.setPersonName(comSwPatrolRecordAddDTO.getDPersonName());
+ comSwDangerReportDO.setPersonPhone(comSwPatrolRecordAddDTO.getDPersonPhone());
comSwDangerReportDAO.insert(comSwDangerReportDO);
}else {
//不存在安全隐患，生成安全工作记录
@@ -127,4 +134,9 @@
}
return R.ok(comSwPatrolRecordVO);
}
+
+ @Override
+ public R patrolRecordStatistics(Long communityId) {
+ return R.ok(this.comSwSafetyWorkRecordDAO.patrolRecordStatistics(communityId));
+ }
}
--
Gitblit v1.7.1