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 | 107 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 94 insertions(+), 13 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 303b27f..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
@@ -10,6 +10,7 @@
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.DateUtils;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComSwDangerReportDAO;
@@ -25,6 +26,7 @@
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.Map;
/**
* @auther txb
@@ -49,19 +51,28 @@
@Override
public R pagePatrolRecord(ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
- Page page = new Page<>();
- Long pageNum = comSwPatrolRecordPageDTO.getPageNum();
- Long pageSize = comSwPatrolRecordPageDTO.getPageSize();
- if (null == pageNum || 0 == pageNum) {
- pageNum = 1L;
+ //是否是查询自己的巡查记录
+ if(StringUtils.isNotEmpty(comSwPatrolRecordPageDTO.getPatrolPerson())){
+ Map<String,Object> map = comSwPatrolRecordDAO.getPbServiceTeamCardNo(comSwPatrolRecordPageDTO.getPatrolPerson());
+ if(map != null){
+ comSwPatrolRecordPageDTO.setPatrolPerson(map.get("id").toString());
+ }
}
- if (null == pageSize || 0 == pageSize) {
- pageSize = 10L;
+ IPage<ComSwPatrolRecordVO> iPage = comSwPatrolRecordDAO.pagePatrolRecord(new Page(comSwPatrolRecordPageDTO.getPageNum(),comSwPatrolRecordPageDTO.getPageSize()), comSwPatrolRecordPageDTO);
+ if(!iPage.getRecords().isEmpty()){
+ iPage.getRecords().forEach(patrol -> {
+ ComSwPatrolRecordReportDO recordReportDO = comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>()
+ .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);
+ }
+ }
+ });
}
- page.setSize(pageSize);
- page.setCurrent(pageNum);
-
- IPage<ComSwPatrolRecordVO> iPage = comSwPatrolRecordDAO.pagePatrolRecord(page, comSwPatrolRecordPageDTO);
return R.ok(iPage);
}
@@ -72,14 +83,39 @@
BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwPatrolRecordDO);
Long patrolRecordId = Snowflake.getId();
comSwPatrolRecordDO.setId(patrolRecordId);
- comSwPatrolRecordDO.setPersonName(comSwPatrolRecordAddDTO.getPPersonName());
- comSwPatrolRecordDO.setPersonPhone(comSwPatrolRecordAddDTO.getPPersonPhone());
+ comSwPatrolRecordDO.setPatrolTime(new Date());
+ comSwPatrolRecordDO.setSuccessionTime(DateUtils.stringToDate(comSwPatrolRecordAddDTO.getSuccessionTime(),DateUtils.yyyyMMdd_format));
+ StringBuilder nameString = new StringBuilder();
+ StringBuilder phoneString = new StringBuilder();
+ //根据传递的巡查人员id查询巡查人员的名字和电话
+ if(StringUtils.isNotEmpty(comSwPatrolRecordAddDTO.getPatrolPerson())){
+ String[] personIds = comSwPatrolRecordAddDTO.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.insert(comSwPatrolRecordDO);
//巡查记录和关联报告信息
ComSwPatrolRecordReportDO comSwPatrolRecordReportDO = new ComSwPatrolRecordReportDO();
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();
@@ -132,6 +168,51 @@
}
}
}
+
+ //组装巡查类型
+ if(StringUtils.isNotEmpty(comSwPatrolRecordVO.getPatrolType())){
+ StringBuilder sb = new StringBuilder();
+ String patrolTypes[] = comSwPatrolRecordVO.getPatrolType().split(",");
+ for (int i = 0; i < patrolTypes.length; i++) {
+ if(i != 0){
+ sb.append(",");
+ }
+ if(patrolTypes[i].equals("1")){
+ sb.append("防火巡查");
+ }else if(patrolTypes[i].equals("2")){
+ sb.append("防汛巡查");
+ }else if(patrolTypes[i].equals("3")){
+ sb.append("防疫巡查");
+ }
+ }
+ comSwPatrolRecordVO.setPatrolType(sb.toString());
+ }
+ //查询接班人员信息
+ if(StringUtils.isNotEmpty(comSwPatrolRecordVO.getSuccessionPerson())){
+ StringBuilder sb = new StringBuilder();
+ String personIds[] = comSwPatrolRecordVO.getSuccessionPerson().split(",");
+ for (int i = 0; i < personIds.length; i++) {
+ if(i != 0){
+ sb.append(",");
+ }
+ Map<String,String> personMap = comSwPatrolRecordDAO.getPbServiceTeamById(personIds[i]);
+ if(personMap != null){
+ sb.append(personMap.get("name"));
+ }
+ }
+ comSwPatrolRecordVO.setSuccessionPerson(sb.toString());
+ }
+
+ //查询填报人名称
+ 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