From 22498e4ff995e9069ad0ed72b2a249172375a714 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 30 八月 2021 10:50:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 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 86604d8..a0e3a74 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
@@ -51,6 +51,13 @@
@Override
public R pagePatrolRecord(ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
+ //是否是查询自己的巡查记录
+ if(StringUtils.isNotEmpty(comSwPatrolRecordPageDTO.getPatrolPerson())){
+ Map<String,Object> map = comSwPatrolRecordDAO.getPbServiceTeamCardNo(comSwPatrolRecordPageDTO.getPatrolPerson());
+ if(map != null){
+ comSwPatrolRecordPageDTO.setPatrolPerson(map.get("id").toString());
+ }
+ }
IPage<ComSwPatrolRecordVO> iPage = comSwPatrolRecordDAO.pagePatrolRecord(new Page(comSwPatrolRecordPageDTO.getPageNum(),comSwPatrolRecordPageDTO.getPageSize()), comSwPatrolRecordPageDTO);
if(!iPage.getRecords().isEmpty()){
iPage.getRecords().forEach(patrol -> {
@@ -58,6 +65,11 @@
.lambda().eq(ComSwPatrolRecordReportDO::getPatrolRecordId,patrol.getId()));
if(recordReportDO != null){
patrol.setServiceId(recordReportDO.getReportId());
+ if (null != comSwDangerReportDAO.selectById(recordReportDO.getReportId())) {
+ patrol.setDangerOrRecord(1);
+ }else{
+ patrol.setDangerOrRecord(2);
+ }
}
});
}
@@ -98,6 +110,12 @@
Long patrolRecordReport = Snowflake.getId();
comSwPatrolRecordReportDO.setId(patrolRecordReport);
comSwPatrolRecordReportDO.setPatrolRecordId(patrolRecordId);
+ if(StringUtils.isNotEmpty(comSwPatrolRecordAddDTO.getDangerDescription())){
+ comSwPatrolRecordAddDTO.setDagerDescription(comSwPatrolRecordAddDTO.getDangerDescription());
+ }
+ if(StringUtils.isNotEmpty(comSwPatrolRecordAddDTO.getDagerName())){
+ comSwPatrolRecordAddDTO.setDangerName(comSwPatrolRecordAddDTO.getDagerName());
+ }
if (comSwPatrolRecordAddDTO.getIsHiddenDanger().intValue() == ComSwPatrolRecordAddDTO.isOk.yes) {
//如果存在安全隐患，自动生成安全隐患报告
ComSwDangerReportDO comSwDangerReportDO = new ComSwDangerReportDO();
@@ -189,6 +207,12 @@
if(comSwPatrolRecordVO.getCreateBy() != null){
comSwPatrolRecordVO.setCreateName(comSwPatrolRecordDAO.getCreateName(comSwPatrolRecordVO.getCreateBy()));
}
+
+ ComSwPatrolRecordReportDO recordReportDO = comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>()
+ .lambda().eq(ComSwPatrolRecordReportDO::getPatrolRecordId,comSwPatrolRecordVO.getId()));
+ if(recordReportDO != null){
+ comSwPatrolRecordVO.setServiceId(recordReportDO.getReportId());
+ }
return R.ok(comSwPatrolRecordVO);
}
--
Gitblit v1.7.1