From 3cb6ee6e1e4ea8b7cc65033f9420b3ae0029b63c Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 18 八月 2021 18:53:24 +0800
Subject: [PATCH] Merge branch 'txb'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwSafetyWorkRecordServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwSafetyWorkRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwSafetyWorkRecordServiceImpl.java
index 2595388..fe9a859 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwSafetyWorkRecordServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwSafetyWorkRecordServiceImpl.java
@@ -96,6 +96,8 @@
BeanUtils.copyProperties(comSwPatrolRecordDO, comSwSafetyWorkRecordVO);
}
+ BeanUtils.copyProperties(swSafetyWorkRecordDO, comSwSafetyWorkRecordVO);
+
//组装巡查类型
if(StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getPatrolType())){
StringBuilder sb = new StringBuilder();
@@ -143,6 +145,7 @@
@Override
public R detailSafetyWorkRecordByPrId(Long patrolRecordId, Long communityId) {
+ ComSwSafetyWorkRecordVO comSwSafetyWorkRecordVO = new ComSwSafetyWorkRecordVO();
ComSwPatrolRecordDO comSwPatrolRecordDO = comSwPatrolRecordDAO.selectById(patrolRecordId);
ComSwPatrolRecordReportDO comSwPatrolRecordReportDO = comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>().lambda().eq(ComSwPatrolRecordReportDO::getPatrolRecordId, patrolRecordId));
if (null != comSwPatrolRecordReportDO) {
@@ -150,9 +153,9 @@
if (null == comSwSafetyWorkRecordDO) {
return R.fail("该安全工作记录不存在");
}
+ BeanUtils.copyProperties(comSwPatrolRecordDO, comSwSafetyWorkRecordVO);
+ BeanUtils.copyProperties(comSwSafetyWorkRecordDO, comSwSafetyWorkRecordVO);
}
- ComSwSafetyWorkRecordVO comSwSafetyWorkRecordVO = new ComSwSafetyWorkRecordVO();
- BeanUtils.copyProperties(comSwPatrolRecordDO, comSwSafetyWorkRecordVO);
//所属社区名称
comSwSafetyWorkRecordVO.setCommunityName(comActDAO.selectById(communityId).getName());
return R.ok(comSwSafetyWorkRecordVO);
--
Gitblit v1.7.1