From c4c904031919bd0456cd14fca583d9fa9eea40d8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 18 十月 2021 16:19:38 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java
index 7bcbc5e..8352b86 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java
@@ -1,10 +1,13 @@
package com.panzhihua.service_community.service.impl;
+import java.text.SimpleDateFormat;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
+import com.panzhihua.common.model.dtos.community.ComSwDangerReportEditDTO;
+import com.panzhihua.service_community.model.dos.ComSwSafetyWorkRecordDO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -121,6 +124,54 @@
}
@Override
+ public R editDangerReport(ComSwDangerReportEditDTO comSwDangerReportEditDTO) {
+ ComSwDangerReportDO comSwDangerReportDO = comSwDangerReportDAO.selectById(comSwDangerReportEditDTO.getId());
+ if (null == comSwDangerReportDO) {
+ return R.fail("该隐患报告不存在");
+ }
+ BeanUtils.copyProperties(comSwDangerReportEditDTO, comSwDangerReportDO);
+ comSwDangerReportDO.setDangerType(comSwDangerReportEditDTO.getPatrolType());
+ ComSwPatrolRecordReportDO comSwPatrolRecordReportDO = comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>()
+ .lambda().eq(ComSwPatrolRecordReportDO::getReportId, comSwDangerReportEditDTO.getId()));
+ ComSwPatrolRecordDO comSwPatrolRecordDO = new ComSwPatrolRecordDO();
+ if (null != comSwPatrolRecordReportDO) {
+ comSwPatrolRecordDO = comSwPatrolRecordDAO.selectOne(new QueryWrapper<ComSwPatrolRecordDO>()
+ .lambda().eq(ComSwPatrolRecordDO::getId, comSwPatrolRecordReportDO.getPatrolRecordId()));
+ Long id = comSwPatrolRecordDO.getId();
+ BeanUtils.copyProperties(comSwDangerReportEditDTO, comSwPatrolRecordDO);
+ comSwPatrolRecordDO.setId(id);
+ try {
+ comSwPatrolRecordDO.setPatrolTime(new SimpleDateFormat("yyyy-MM-dd").parse(comSwDangerReportEditDTO.getPatrolTime()));
+ comSwPatrolRecordDO.setSuccessionTime(new SimpleDateFormat("yyyy-MM-dd").parse(comSwDangerReportEditDTO.getSuccessionTime()));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ // 根据传递的巡查人员id查询巡查人员的名字和电话
+ StringBuilder nameString = new StringBuilder();
+ StringBuilder phoneString = new StringBuilder();
+ if (StringUtils.isNotEmpty(comSwDangerReportEditDTO.getPatrolPerson())) {
+ String[] personIds = comSwDangerReportEditDTO.getPatrolPerson().split(",");
+ for (int i = 0; i < personIds.length; i++) {
+ Map<String, String> person = comSwPatrolRecordDAO.getPbServiceTeamById(personIds[i]);
+ if (person != null) {
+ if (i != 0) {
+ nameString.append(",");
+ phoneString.append(",");
+ }
+ nameString.append(person.get("name"));
+ phoneString.append(person.get("phone"));
+ }
+ }
+ comSwPatrolRecordDO.setPersonName(nameString.toString());
+ comSwPatrolRecordDO.setPersonPhone(phoneString.toString());
+ }
+ }
+ comSwPatrolRecordDAO.updateById(comSwPatrolRecordDO);
+ comSwDangerReportDAO.updateById(comSwDangerReportDO);
+ return R.ok();
+ }
+
+ @Override
public R detailDangerReport(Long dangerReportId) {
ComSwDangerReportDO comSwDangerReportDO = comSwDangerReportDAO.selectById(dangerReportId);
if (null == comSwDangerReportDO) {
@@ -134,6 +185,7 @@
ComSwPatrolRecordDO comSwPatrolRecordDO =
comSwPatrolRecordDAO.selectById(comSwPatrolRecordReportDO.getPatrolRecordId());
BeanUtils.copyProperties(comSwPatrolRecordDO, comSwDangerReportVO);
+ comSwDangerReportVO.setPatrolTime(new SimpleDateFormat("yyyy-MM-dd").format(comSwPatrolRecordDO.getPatrolTime()));
}
BeanUtils.copyProperties(comSwDangerReportDO, comSwDangerReportVO);
--
Gitblit v1.7.1