From 802bbc9b1a26334607b04ab562e62594e383d2c2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 31 七月 2021 17:58:31 +0800
Subject: [PATCH] 修改bug以及获取天气接口
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwSafetyWorkRecordServiceImpl.java | 61 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 0 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 323571f..ad405c5 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
@@ -22,6 +22,7 @@
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
+import java.util.Map;
/**
* @auther txb
@@ -56,6 +57,25 @@
page.setCurrent(pageNum);
IPage<ComSwSafetyWorkRecordVO> iPage = comSwSafetyWorkRecordDAO.pageSafetyWorkRecord(page, comSwPatrolRecordPageDTO);
+ if(!iPage.getRecords().isEmpty()){
+ iPage.getRecords().forEach(work -> {
+ //查询人员信息
+ if(StringUtils.isNotEmpty(work.getPatrolPerson())){
+ StringBuilder sb = new StringBuilder();
+ String personIds[] = work.getPatrolPerson().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"));
+ }
+ }
+ work.setPersonName(sb.toString());
+ }
+ });
+ }
return R.ok(iPage);
}
@@ -71,6 +91,47 @@
ComSwPatrolRecordDO comSwPatrolRecordDO = comSwPatrolRecordDAO.selectById(comSwPatrolRecordReportDO.getPatrolRecordId());
BeanUtils.copyProperties(comSwPatrolRecordDO, comSwSafetyWorkRecordVO);
}
+
+ //组装巡查类型
+ if(StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getPatrolType())){
+ StringBuilder sb = new StringBuilder();
+ String patrolTypes[] = comSwSafetyWorkRecordVO.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("防疫巡查");
+ }
+ }
+ comSwSafetyWorkRecordVO.setPatrolType(sb.toString());
+ }
+
+ //查询人员信息
+ if(StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getPatrolPerson())){
+ StringBuilder sb = new StringBuilder();
+ String personIds[] = comSwSafetyWorkRecordVO.getPatrolPerson().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"));
+ }
+ }
+ comSwSafetyWorkRecordVO.setPersonName(sb.toString());
+ }
+
+ //查询填报人名称
+ if(comSwSafetyWorkRecordVO.getCreateBy() != null){
+ comSwSafetyWorkRecordVO.setCreateName(comSwPatrolRecordDAO.getCreateName(comSwSafetyWorkRecordVO.getCreateBy()));
+ }
+
return R.ok(comSwSafetyWorkRecordVO);
}
--
Gitblit v1.7.1