From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 2d2770f..6986fd9 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
@@ -1135,7 +1135,7 @@
@Override
public R serviceStatic(ServiceStaticDTO serviceStaticDTO) {
ServiceStaticsVO serviceStaticsVO = new ServiceStaticsVO();
- if (serviceStaticDTO.getCheckUnitId() != null)
+ if (serviceStaticDTO.getCheckUnitId() != null && serviceStaticDTO.getCheckUnitId()> 0)
{
//单位服务统计
serviceStaticsVO =
@@ -1190,7 +1190,8 @@
else
{
//个人服务统计
- serviceStaticsVO = this.baseMapper.selectStatsUser(serviceStaticDTO.getPhone(), serviceStaticDTO.getYear());
+
+
ComPbMemberDO comPbMemberDO = comPbMemberDAO.selectOne(new QueryWrapper<ComPbMemberDO>().lambda()
.eq(ComPbMemberDO::getPhone, serviceStaticDTO.getPhone()).last("limit 1"));
Long checkUnitId = null;
@@ -1198,6 +1199,7 @@
checkUnitId = comPbMemberDO.getCheckUnitId();
}
+ serviceStaticsVO = this.baseMapper.selectStatsUser(serviceStaticDTO.getPhone(),checkUnitId+"", serviceStaticDTO.getYear());
List<ServiceDetailStaticsVO> serviceDetailStaticsVOList=this.baseMapper.selectServiceDetailListForPersonal(checkUnitId, serviceStaticDTO.getPhone(),
serviceStaticDTO.getYear(), serviceStaticDTO.getServiceType());
@@ -1265,9 +1267,9 @@
activityVO.setPartyMemberCount(comActDAO.selectUnitCount());
activityVO.setUnitCount(comActDAO.selectMemberCount());
//获取单位活动统计数据（邻里圈）
- List<UnitActivityAnalysisVO> unitActivityAnalysisVOS = comActNeighborCircleDAO.institutionalUnitServiceAnalysis(beginTime, endTime, belongTo,communityId);
+ List<UnitActivityAnalysisVO> unitActivityAnalysisVOS = comActNeighborCircleDAO.institutionalUnitServiceAnalysis(beginTime, endTime, belongTo,communityId,unitId);
//获取单位活动统计数据（活动）
- List<UnitActivityAnalysisVO> unitActivityAnalysisVOS1 = comActNeighborCircleDAO.institutionalUnitActivityAnalysis(beginTime, endTime, belongTo,communityId);
+ List<UnitActivityAnalysisVO> unitActivityAnalysisVOS1 = comActNeighborCircleDAO.institutionalUnitActivityAnalysis(beginTime, endTime, belongTo,communityId,unitId);
//获取新双挣双评清单任务
List<UnitActivityAnalysisVO> newTaskList=comActNeighborCircleDAO.getNewTaskList(beginTime, endTime, belongTo,communityId);
@@ -1351,7 +1353,7 @@
Integer serviceTimes = item.getServiceTimes();
DecimalFormat df2 = new DecimalFormat("#.##");
- String formattedNumber2 = df2.format(serviceTimes);
+ String formattedNumber2 = df2.format(serviceTime);
Double result2 = Double.parseDouble(formattedNumber2);
unitActivityAnalysisVOS.get(param.get("index")).setServiceTime(result2);
@@ -1445,7 +1447,7 @@
Map<String, Long> collectMap = inventories.stream()
.collect(Collectors.groupingBy(NewFightNeedProblemClaim::getTaskId, Collectors.counting()));
long sum = 0l;
- if(unitVO.getAwardSum()!=null || unitVO.getAwardSum()!=0l )
+ if(unitVO.getAwardSum()!=null)
{
sum=unitVO.getAwardSum();
}
@@ -1573,6 +1575,15 @@
// ListUtil.sortByProperty(unitActivityAnalysisVOS,"");
}
}
+ else
+ {
+ //按时长排序
+ ListUtil.sortByProperty(unitActivityAnalysisVOS, "serviceTime");
+ ListUtil.sortByProperty(partyMemberAnalysisVOS, "serviceTime");
+
+ ListUtil.reverse(unitActivityAnalysisVOS);
+ ListUtil.reverse(partyMemberAnalysisVOS);
+ }
//处理分页
PageVO<List<UnitActivityAnalysisVO>> unitPage=new PageVO<>();
PageVO<List<PartyMemberAnalysisVO>> memberPage=new PageVO<>();
@@ -1630,9 +1641,9 @@
endTime=year.toString().concat("-12-31");
}
//获取单位活动统计数据（邻里圈）
- List<UnitActivityAnalysisVO> unitActivityAnalysisVOS = comActNeighborCircleDAO.institutionalUnitServiceAnalysis(beginTime, endTime, belongTo,communityId);
+ List<UnitActivityAnalysisVO> unitActivityAnalysisVOS = comActNeighborCircleDAO.institutionalUnitServiceAnalysis(beginTime, endTime, belongTo,communityId,null);
//获取单位活动统计数据（活动）
- List<UnitActivityAnalysisVO> unitActivityAnalysisVOS1 = comActNeighborCircleDAO.institutionalUnitActivityAnalysis(beginTime, endTime, belongTo,communityId);
+ List<UnitActivityAnalysisVO> unitActivityAnalysisVOS1 = comActNeighborCircleDAO.institutionalUnitActivityAnalysis(beginTime, endTime, belongTo,communityId,null);
if (!unitActivityAnalysisVOS.isEmpty()){
for (UnitActivityAnalysisVO unitActivityAnalysisVO : unitActivityAnalysisVOS){
if (ObjectUtils.isNotEmpty(unitActivityAnalysisVO)){
--
Gitblit v1.7.1