java/zhihuishenqu.git

			@@ -779,6 +779,7 @@
			complaintAuditRecord.setReporterLevel(reporterLevel);
			complaintAuditRecord.setReporterId(reporterId);
			complaintAuditRecord.setApplyName(reporter);
			complaintAuditRecord.setApplyPhone(phone);
			complaintAuditRecordService.save(complaintAuditRecord);
			}

			@@ -1037,6 +1038,7 @@
			record1.setDepartmentName(departmentName);
			// 冗余申请人名称
			record1.setApplyName(reporter);
			record1.setApplyPhone(loginUserInfoVO.getPhone());
			complaintAuditRecordService.save(record1);
			}

			@@ -1617,7 +1619,7 @@
			}

			@Override
			public List<AnalyticStatisticsThreeVo> analyticStatisticsThree(AnalyticStatisticsQuery query, List<Complaint> complaints) {
			public List<AnalyticStatisticsThreeVo> analyticStatisticsThree(Integer rank, List<Complaint> complaints) {
			Map<String, List<Complaint>> groupedByProblemType = complaints.stream()
			.collect(Collectors.groupingBy(Complaint::getProblemType));
			List<AnalyticStatisticsThreeVo> analyticStatisticsThreeVos = groupedByProblemType.entrySet().stream()
			@@ -1629,11 +1631,11 @@
			})
			.collect(Collectors.toList());
			analyticStatisticsThreeVos = analyticStatisticsThreeVos.stream().sorted(Comparator.comparing(AnalyticStatisticsThreeVo::getAllTotal).reversed()).collect(Collectors.toList());
			if (query.getRank() == null) {
			if (rank == null) {
			return analyticStatisticsThreeVos;
			} else if (query.getRank() == 5) {
			} else if (rank == 5) {
			return analyticStatisticsThreeVos.stream().limit(5).collect(Collectors.toList());
			} else if (query.getRank() == 10) {
			} else if (rank == 10) {
			return analyticStatisticsThreeVos.stream().limit(10).collect(Collectors.toList());
			}
			return Collections.emptyList();
			@@ -1671,7 +1673,7 @@
			targetId = partyMember.getId();
			} else if (identity.equals(2)) {
			//上级
			if (StringUtils.isBlank(query.getAreaId())) {
			if (Objects.nonNull(query.getTier()) && !query.getTier().equals(-1)) {
			accountLevel = systemUserLevel.getLevel();
			switch (systemUserLevel.getLevel()) {
			case 1:
			@@ -1691,6 +1693,9 @@
			targetId = systemUserLevel.getCommunityId();
			break;
			}
			}else {
			targetId = Long.valueOf(query.getAreaId());
			accountLevel = query.getTier();
			}
			}
			return baseMapper.queryCompliantList(targetId, accountLevel, loginUserInfo);