From c7450a8e1724528046af3683d49eaf0a06785130 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 七月 2021 14:02:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 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 86e844c..47097d4 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
@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -7,16 +8,15 @@
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngRealAssetsVO;
import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
import com.panzhihua.common.utlis.Snowflake;
+import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComSwDangerReportDAO;
import com.panzhihua.service_community.dao.ComSwPatrolRecordDAO;
import com.panzhihua.service_community.dao.ComSwPatrolRecordReportDAO;
import com.panzhihua.service_community.dao.ComSwSafetyWorkRecordDAO;
-import com.panzhihua.service_community.model.dos.ComSwDangerReportDO;
-import com.panzhihua.service_community.model.dos.ComSwPatrolRecordDO;
-import com.panzhihua.service_community.model.dos.ComSwPatrolRecordReportDO;
-import com.panzhihua.service_community.model.dos.ComSwSafetyWorkRecordDO;
+import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComSwPatrolRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -85,7 +85,7 @@
comSwDangerReportDO.setId(dangerReportId);
comSwPatrolRecordReportDO.setReportId(dangerReportId);
comSwDangerReportDO.setDangerType(comSwPatrolRecordAddDTO.getPatrolType());
- if (comSwPatrolRecordAddDTO.getIsRectifyImmediately().intValue() == ComSwPatrolRecordAddDTO.isOk.yes) {
+ if (comSwPatrolRecordAddDTO.getIsRectifyImmediately().intValue() == ComSwPatrolRecordAddDTO.isOk.yes && StringUtils.isNotEmpty(comSwPatrolRecordAddDTO.getTakeSteps())) {
comSwDangerReportDO.setStatus(String.valueOf(SafeWordStatusEnum.YZG.getCode()));
}
comSwDangerReportDO.setRectifyTime(new Date());
@@ -102,4 +102,29 @@
comSwPatrolRecordReportDAO.insert(comSwPatrolRecordReportDO);
return R.ok();
}
+
+ @Override
+ public R detailPatrolRecord(Long patrolRecordId) {
+ ComSwPatrolRecordDO comSwPatrolRecordDO = comSwPatrolRecordDAO.selectById(patrolRecordId);
+ if (null == comSwPatrolRecordDO) {
+ return R.fail("该巡查记录不存在");
+ }
+ ComSwPatrolRecordVO comSwPatrolRecordVO = new ComSwPatrolRecordVO();
+ BeanUtils.copyProperties(comSwPatrolRecordDO, comSwPatrolRecordVO);
+ ComSwPatrolRecordReportDO comSwPatrolRecordReportDO = comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>().lambda().eq(ComSwPatrolRecordReportDO::getPatrolRecordId, patrolRecordId));
+ if (null != comSwPatrolRecordReportDO) {
+ if (comSwPatrolRecordVO.getIsHiddenDanger().equals(ComSwPatrolRecordVO.isOk.yes)) {
+ if (null != comSwDangerReportDAO.selectById(comSwPatrolRecordReportDO.getReportId())) {
+ comSwPatrolRecordVO.setDisplayButton(3);
+ }else {
+ comSwPatrolRecordVO.setDisplayButton(2);
+ }
+ }else{
+ if (null != comSwSafetyWorkRecordDAO.selectById(comSwPatrolRecordReportDO.getReportId())) {
+ comSwPatrolRecordVO.setDisplayButton(1);
+ }
+ }
+ }
+ return R.ok(comSwPatrolRecordVO);
+ }
}
--
Gitblit v1.7.1