From 66c8643f5976dbd08d1b8d8661f1a218139e1e8b Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 04 八月 2021 20:46:55 +0800
Subject: [PATCH] 微信小程序订阅消息推送
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java | 19 +++++++++++++++++++
1 files changed, 19 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..fcb048a 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);
+ }
}
});
}
@@ -112,6 +124,7 @@
comSwDangerReportDO.setStatus(String.valueOf(SafeWordStatusEnum.DCL.getCode()));
}
BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwDangerReportDO);
+ comSwDangerReportDO.setDagerDescription(comSwPatrolRecordAddDTO.getDangerDescription());
comSwDangerReportDO.setPersonName(comSwPatrolRecordAddDTO.getDPersonName());
comSwDangerReportDO.setPersonPhone(comSwPatrolRecordAddDTO.getDPersonPhone());
comSwDangerReportDAO.insert(comSwDangerReportDO);
@@ -189,6 +202,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