From fd8b23735d350a1a85bbce654df145c60c5f4033 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 15 十一月 2021 17:21:44 +0800
Subject: [PATCH] 1115修改提交
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HomeQuarantineUtil.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HomeQuarantineUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HomeQuarantineUtil.java
index 2123a4d..47a4947 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HomeQuarantineUtil.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HomeQuarantineUtil.java
@@ -48,7 +48,7 @@
continue;
}
if(count%16==2){
- conditions.append(DateUtils.format(userAnswers.getTime(),new SimpleDateFormat("yyyy-MM-dd"))+" "+"当日隔离情况："+userAnswers.getAnswerContent()+"℃"+"\n");
+ conditions.append(DateUtils.format(userAnswers.getTime(),new SimpleDateFormat("yyyy-MM-dd"))+" "+"当日隔离情况："+userAnswers.getAnswerContent()+"\n");
conditions.append("————————"+"\n");
count++;
continue;
@@ -203,7 +203,17 @@
String answer = sb.toString();
userData.add(answer.substring(0, answer.length() - 1));
}
- resultList.add(userData);
+ for(List<Object> result:resultList){
+ if(result.get(4).equals(userData.get(4))){
+ String condition=result.get(result.size()-1)+userData.get(userData.size()-1).toString();
+ result.set(result.size()-1,condition);
+ userData.set(userData.size()-1,null);
+ break;
+ }
+ }
+ if(userData.get(userData.size()-1)!=null){
+ resultList.add(userData);
+ }
}
return resultList;
}
--
Gitblit v1.7.1