java/zhihuishenqu.git

			@@ -1573,6 +1573,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<>();

			@@ -718,7 +718,7 @@
			count(nfnpc.service_time) as serviceTimes,
			cpcu.belong_to as belongTo,
			cpcu.org_name as orgName,
			cpcu.community_id,
			nfnpi.community_id,
			sum(nfnpi.award) as partyCount,
			cpcu.name as unitName,
			cpcu.org_name as orgName,
			@@ -729,9 +729,9 @@
			FROM new_fight_need_problem_claim as nfnpc
			left join sys_user as su on nfnpc.user_id=su.user_id
			left join com_pb_check_unit as cpcu on nfnpc.unit_id=cpcu.id
			left join com_act as ca on cpcu.community_id=ca.community_id
			left join com_act as ca on nfnpi.community_id=ca.community_id
			LEFT JOIN new_fight_need_problem_inventory as nfnpi on nfnpc.task_id=nfnpi.id
			WHERE nfnpc.service_time iS NOT NULL AND nfnpc.unit_id IS NOT NULL
			WHERE nfnpc.service_time iS NOT NULL
			<if test="beginTime != null">
			and nfnpc.creation_time between #{beginTime} and #{endTime}
			</if>
			@@ -739,7 +739,7 @@
			and cpcu.belong_to=#{belongTo}
			</if>
			<if test="communityId != null">
			and cpcu.community_id=#{communityId}
			and nfnpi.community_id=#{communityId}
			</if>
			<if test="unitId != null">
			and cpcu.id=#{unitId}

	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史