From 0283bb25ebbbb506ec54f90d9a0534c7b25b5655 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 11 七月 2024 17:04:06 +0800
Subject: [PATCH] 花城 【小程序】统计排行完善逻辑
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 119 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 71 insertions(+), 48 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 334af9b..ca3aaf0 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
@@ -40,6 +40,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
+import java.text.DecimalFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -1144,37 +1145,45 @@
serviceStaticDTO.getYear(), serviceStaticDTO.getServiceType());
- List<NewFightNeedProblemClaim> list=baseMapper.getNewServiceNum("",serviceStaticDTO.getCheckUnitId()+"");
+ if(serviceStaticDTO.getServiceType()==1 || serviceStaticDTO.getServiceType()==null)
+ {
+ List<NewFightNeedProblemClaim> list=baseMapper.getNewServiceNum("",serviceStaticDTO.getCheckUnitId()+"");
+ if(list.size()>0)
+ {
+ //设置次数
+ int timeNum=serviceStaticsVO.getTimes()+list.size();
+ serviceStaticsVO.setTimes(timeNum);
+ //设置服务时间
+ double hours=serviceStaticsVO.getHours();
- if(list.size()>0)
- {
- //设置次数
- int timeNum=serviceStaticsVO.getTimes()+list.size();
- serviceStaticsVO.setTimes(timeNum);
- //设置服务时间
- int hours=serviceStaticsVO.getHours();
+ for (NewFightNeedProblemClaim item:list)
+ {
+ ServiceDetailStaticsVO newItem=new ServiceDetailStaticsVO();
- for (NewFightNeedProblemClaim item:list)
- {
- ServiceDetailStaticsVO newItem=new ServiceDetailStaticsVO();
+ String Ltime=item.getServiceTime();
+ if(!StringUtils.isEmpty(Ltime))
+ {
+ double time=(double)(Long.valueOf(Ltime)/3600000);
+ hours=hours+(time);
- String Ltime=item.getServiceTime();
- if(!StringUtils.isEmpty(Ltime))
- {
- int time=(int)(Long.valueOf(Ltime)/3600000);
- newItem.setServiceTime(time);
- hours=hours+(time);
- item.setServiceTime(time+"");
- }
- newItem.setServiceId(Long.valueOf(item.getTaskId()));
- newItem.setServiceType(1);
- newItem.setServiceAt(item.getCreationTime());
- serviceDetailStaticsVOList.add(newItem);
- }
- serviceStaticsVO.setHours(hours);
- }
+ DecimalFormat df = new DecimalFormat("#.00");
+ String formattedNumber = df.format(time);
+ double result = Double.parseDouble(formattedNumber);
+ newItem.setServiceTime(result);
+ item.setServiceTime(result+"");
+ }
+ newItem.setServiceId(Long.valueOf(item.getTaskId()));
+ newItem.setServiceType(1);
+ newItem.setServiceAt(item.getCreationTime());
+ serviceDetailStaticsVOList.add(newItem);
+ }
+ DecimalFormat df = new DecimalFormat("#.00");
+ String formattedNumber = df.format(hours);
+ double result = Double.parseDouble(formattedNumber);
+ serviceStaticsVO.setHours(result);
+ }
+ }
serviceStaticsVO.setServiceDetailStaticsList(serviceDetailStaticsVOList);
-
}
else
{
@@ -1191,34 +1200,48 @@
List<ServiceDetailStaticsVO> serviceDetailStaticsVOList=this.baseMapper.selectServiceDetailListForPersonal(checkUnitId, serviceStaticDTO.getPhone(),
serviceStaticDTO.getYear(), serviceStaticDTO.getServiceType());
- //获取新需求服务列表
- List<NewFightNeedProblemClaim> list=baseMapper.getNewServiceNum(serviceStaticDTO.getPhone(),"");
- if(list.size()>0)
+ if(serviceStaticDTO.getServiceType()==1 || serviceStaticDTO.getServiceType()==null)
{
- //设置次数
- int timeNum=serviceStaticsVO.getTimes()+list.size();
- //设置服务时间
- int hours=serviceStaticsVO.getHours();
- serviceStaticsVO.setTimes(timeNum);
- for (NewFightNeedProblemClaim item:list)
- {
- ServiceDetailStaticsVO newItem=new ServiceDetailStaticsVO();
+ //获取新需求服务列表
+ List<NewFightNeedProblemClaim> list=baseMapper.getNewServiceNum(serviceStaticDTO.getPhone(),"");
- String Ltime=item.getServiceTime();
- if(!StringUtils.isEmpty(Ltime))
+ if(list.size()>0)
+ {
+ //设置次数
+ int timeNum=serviceStaticsVO.getTimes()+list.size();
+ //设置服务时间
+ double hours=serviceStaticsVO.getHours();
+ serviceStaticsVO.setTimes(timeNum);
+ for (NewFightNeedProblemClaim item:list)
{
- int time=(int)(Long.valueOf(Ltime)/3600000);
- newItem.setServiceTime(time);
- hours=hours+(time);
- item.setServiceTime(time+"");
+ ServiceDetailStaticsVO newItem=new ServiceDetailStaticsVO();
+
+ String Ltime=item.getServiceTime();
+ if(!StringUtils.isEmpty(Ltime))
+ {
+ double time=(double)(Long.valueOf(Ltime)/3600000);
+
+ hours=hours+(time);
+ DecimalFormat df = new DecimalFormat("#.00");
+ String formattedNumber = df.format(time);
+ double result = Double.parseDouble(formattedNumber);
+ newItem.setServiceTime(result);
+ item.setServiceTime(result+"");
+ }
+ newItem.setServiceId(Long.valueOf(item.getTaskId()));
+ newItem.setServiceType(1);
+ newItem.setServiceAt(item.getCreationTime());
+ serviceDetailStaticsVOList.add(newItem);
}
- newItem.setServiceId(Long.valueOf(item.getTaskId()));
- newItem.setServiceType(1);
- newItem.setServiceAt(item.getCreationTime());
- serviceDetailStaticsVOList.add(newItem);
+
+ DecimalFormat df = new DecimalFormat("#.00");
+ String formattedNumber = df.format(hours);
+ double result = Double.parseDouble(formattedNumber);
+ serviceStaticsVO.setHours(result);
}
}
+
serviceStaticsVO.setServiceDetailStaticsList(serviceDetailStaticsVOList);
}
return R.ok(serviceStaticsVO);
--
Gitblit v1.7.1