From 23214112187e68965cb9dbea2029b8d4e7d5ea8e Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 15 七月 2024 17:55:14 +0800
Subject: [PATCH] 花城 【小程序】机关单位服务页面，排行范围选择本社区，该页面没有数据2
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 40 +++++++++++++++++++---------------------
1 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
index ffac249..6194a18 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -1298,10 +1298,10 @@
item.setCommunityName(comActDAO.selectById(item.getCommunityId()).getName());
}
- double time=(Double.valueOf(item.getServiceTime())/3600000);
+ Double time=(item.getServiceTime()/3600000);
DecimalFormat df = new DecimalFormat("#.##");
String formattedNumber = df.format(time);
- double result = Double.parseDouble(formattedNumber);
+ Double result = Double.parseDouble(formattedNumber);
item.setServiceTime(result);
}
}
@@ -1341,6 +1341,7 @@
if (newTaskList.size()>0){
for (UnitActivityAnalysisVO item : newTaskList){
if (ObjectUtils.isNotEmpty(item)){
+
if (ObjectUtils.isNotEmpty(item.getUnitId())){
//判断邻里圈统计中是否已有该单位数据
Map<String, Integer> param = alreadyAnalysis(item.getUnitId(), unitActivityAnalysisVOS);
@@ -1349,14 +1350,11 @@
Double serviceTime = unitActivityAnalysisVOS.get(param.get("index")).getServiceTime()+item.getServiceTime();
Integer serviceTimes = item.getServiceTimes();
+ DecimalFormat df2 = new DecimalFormat("#.##");
+ String formattedNumber2 = df2.format(serviceTimes);
+ Double result2 = Double.parseDouble(formattedNumber2);
- double time=(Double.valueOf(serviceTime)/3600000);
- DecimalFormat df = new DecimalFormat("#.##");
- String formattedNumber = df.format(time);
- double result = Double.parseDouble(formattedNumber);
- item.setServiceTime(result);
-
- unitActivityAnalysisVOS.get(param.get("index")).setServiceTime(result);
+ unitActivityAnalysisVOS.get(param.get("index")).setServiceTime(result2);
unitActivityAnalysisVOS.get(param.get("index")).setServiceTimes(unitActivityAnalysisVOS.get(param.get("index")).getServiceTimes()+serviceTimes);
}else {
//新数据，获取单位，社区名
@@ -1369,6 +1367,7 @@
item.setCommunityName(actDO.getName());
}
}
+
unitActivityAnalysisVOS.add(item);
}
}
@@ -1405,7 +1404,11 @@
if (newPartyMemberList.size()>0){
for (PartyMemberAnalysisVO item : newPartyMemberList)
{
-
+ Double time=(item.getServiceTime()/3600000);
+ DecimalFormat df = new DecimalFormat("#.##");
+ String formattedNumber = df.format(time);
+ Double result = Double.parseDouble(formattedNumber);
+ item.setServiceTime(result);
if (ObjectUtils.isNotEmpty(item)){
if (ObjectUtils.isNotEmpty(item.getMemberId())){
Map<String, Integer> param = memberAlreadyAnalysis(item.getMemberId(), partyMemberAnalysisVOS);
@@ -1413,20 +1416,15 @@
Double serviceTime = partyMemberAnalysisVOS.get(param.get("index")).getServiceTime()+item.getServiceTime();
Integer serviceTimes = item.getServiceTimes();
- double time=(serviceTime/3600000);
- DecimalFormat df = new DecimalFormat("#.##");
- String formattedNumber = df.format(time);
- double result = Double.parseDouble(formattedNumber);
- item.setServiceTime(result);
- partyMemberAnalysisVOS.get(param.get("index")).setServiceTime(result);
+ DecimalFormat df1 = new DecimalFormat("#.##");
+ String formattedNumber1 = df1.format(serviceTime);
+ Double result1 = Double.parseDouble(formattedNumber1);
+
+ partyMemberAnalysisVOS.get(param.get("index")).setServiceTime(result1);
partyMemberAnalysisVOS.get(param.get("index")).setServiceTimes(partyMemberAnalysisVOS.get(param.get("index")).getServiceTimes()+serviceTimes);
}else{
- double time=(item.getServiceTime()/3600000);
- DecimalFormat df = new DecimalFormat("#.##");
- String formattedNumber = df.format(time);
- double result = Double.parseDouble(formattedNumber);
- item.setServiceTime(result);
+
partyMemberAnalysisVOS.add(item);
}
}
--
Gitblit v1.7.1