From 0c9a434ca2d0521d726f9539ba0f6b2dfb52841c Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 23 五月 2025 22:40:06 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 454 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 294 insertions(+), 160 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
index 330ed07..5e16562 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
@@ -21,6 +21,7 @@
import com.panzhihua.sangeshenbian.model.entity.*;
import com.panzhihua.sangeshenbian.model.excel.ComplaintExcel;
import com.panzhihua.sangeshenbian.model.query.AnalyticStatisticsQuery;
+import com.panzhihua.sangeshenbian.model.query.AppStaticsQuery;
import com.panzhihua.sangeshenbian.model.query.BasePage;
import com.panzhihua.sangeshenbian.model.query.ComplaintQuery;
import com.panzhihua.sangeshenbian.model.vo.*;
@@ -109,7 +110,8 @@
SystemUser systemUser = identityInformationVO.getSystemUser();
Integer identity = identityInformationVO.getIdentity();
if (identity == 2) {
- accountLevel = systemUser.getAccountLevel();
+ SystemUserLevel systemUserLevel = identityInformationVO.getSystemUserLevel();
+ accountLevel = systemUserLevel.getLevel();
switch (accountLevel) {
case 1:
//市级
@@ -120,33 +122,33 @@
case 2:
//区县级
complaint.setCityCode(510400);
- complaint.setDistrictsCode(Integer.valueOf(systemUser.getDistrictsCode()));
+ complaint.setDistrictsCode(Integer.valueOf(systemUserLevel.getDistrictsCode()));
complaint.setReportUserName(systemUser.getName());
complaint.setReportUserPhone(systemUser.getPhone());
break;
case 3:
//街道
complaint.setCityCode(510400);
- complaint.setDistrictsCode(Integer.valueOf(systemUser.getDistrictsCode()));
- complaint.setStreetId(Long.valueOf(systemUser.getStreetId()));
+ complaint.setDistrictsCode(Integer.valueOf(systemUserLevel.getDistrictsCode()));
+ complaint.setStreetId(Long.valueOf(systemUserLevel.getStreetId()));
complaint.setReportUserName(systemUser.getName());
complaint.setReportUserPhone(systemUser.getPhone());
break;
case 4:
//社区
complaint.setCityCode(510400);
- complaint.setDistrictsCode(Integer.valueOf(systemUser.getDistrictsCode()));
- complaint.setStreetId(Long.valueOf(systemUser.getStreetId()));
- complaint.setCommunityId(systemUser.getCommunityId());
+ complaint.setDistrictsCode(Integer.valueOf(systemUserLevel.getDistrictsCode()));
+ complaint.setStreetId(Long.valueOf(systemUserLevel.getStreetId()));
+ complaint.setCommunityId(systemUserLevel.getCommunityId());
complaint.setReportUserName(systemUser.getName());
complaint.setReportUserPhone(systemUser.getPhone());
break;
case 5:
//党员
complaint.setCityCode(510400);
- complaint.setDistrictsCode(Integer.valueOf(systemUser.getDistrictsCode()));
- complaint.setStreetId(Long.valueOf(systemUser.getStreetId()));
- complaint.setCommunityId(systemUser.getCommunityId());
+ complaint.setDistrictsCode(Integer.valueOf(systemUserLevel.getDistrictsCode()));
+ complaint.setStreetId(Long.valueOf(systemUserLevel.getStreetId()));
+ complaint.setCommunityId(systemUserLevel.getCommunityId());
PartyMember partyMember = partyMemberService.getPartyMemberByPhone(loginUserInfoVO.getPhone());
complaint.setPartyMemberId(partyMember.getId());
complaint.setReportUserName(partyMember.getName());
@@ -222,7 +224,8 @@
//上级
if (systemUserByPhone.isPresent() && null != identity && identity == 2) {
SystemUser systemUser = systemUserByPhone.get();
- accountLevel = systemUser.getAccountLevel();
+ SystemUserLevel systemUserLevel = identityInformation.getSystemUserLevel();
+ accountLevel = systemUserLevel.getLevel();
switch (accountLevel) {
case 1:
//市级
@@ -230,15 +233,15 @@
break;
case 2:
//区县级
- targetId = Long.valueOf(systemUser.getDistrictsCode());
+ targetId = Long.valueOf(systemUserLevel.getDistrictsCode());
break;
case 3:
//街道
- targetId = Long.valueOf(systemUser.getStreetId());
+ targetId = Long.valueOf(systemUserLevel.getStreetId());
break;
case 4:
//社区
- targetId = systemUser.getCommunityId();
+ targetId = systemUserLevel.getCommunityId();
break;
case 5:
//党员
@@ -255,7 +258,7 @@
//page = baseMapper.selectComplaintPage(page, query, targetId, isSuperior);
page = baseMapper.selectComplaintPage1(page, query, accountLevel, targetId);
- for (ComplaintVO s : page.getRecords()) {
+ /* for (ComplaintVO s : page.getRecords()) {
buttonPermission(s, systemUserByPhone, loginUserInfoVO);
Integer auditButtonStatus = s.getAuditButtonStatus();
@@ -264,7 +267,7 @@
if (!targetId.equals(reporterId) && !targetId.equals(superiorId) && (s.getStatus() == 5)) {
s.setStatus(0);
}
- }
+ }*/
return page;
}
@@ -279,6 +282,8 @@
// 获取身份
IdentityInformation currentIdentityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfo);
Integer identity = currentIdentityInformation.getIdentity();
+ SystemUserLevel systemUserLevel = currentIdentityInformation.getSystemUserLevel();
+ SystemUser systemUser1 = currentIdentityInformation.getSystemUser();
ComplaintAuditRecord one = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>()
.eq(ComplaintAuditRecord::getComplaintId, vo.getId())
// .ne(ComplaintAuditRecord::getAuditType, 1)
@@ -286,12 +291,11 @@
.last(" limit 0, 1"));
//没有审核数据，且正在办理，则按钮权限是添加人员的
if (null == one && (vo.getStatus() == 0 || vo.getStatus() == 1 || vo.getStatus() == 2)) {
- if (systemUserByPhone.isPresent()) {
+ /* if (systemUserByPhone.isPresent()) {
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
- Integer isAdmin = systemUser.getIsAdmin();
//当前身份是管理员
- if (2 == identity && accountLevel.compareTo(vo.getReportType()) == 0 && (accountLevel != 5 && 1 == isAdmin)) {
+ if (2 == identity && accountLevel.compareTo(vo.getReportType()) == 0 && (accountLevel != 5)) {
vo.setListControlsButtonStatus(0);
}
//如果当前身份是党员
@@ -302,6 +306,14 @@
if (vo.getReportType() == 5) {
vo.setListControlsButtonStatus(0);
}
+ }*/
+ //当前身份是管理员
+ if (2 == identity && systemUserLevel.getLevel().compareTo(vo.getReportType()) == 0 && (systemUserLevel.getLevel() != 5)) {
+ vo.setListControlsButtonStatus(0);
+ }
+ //如果当前身份是党员
+ if (1 == identity && 5 == vo.getReportType()) {
+ vo.setListControlsButtonStatus(0);
}
}
//有审核数据，且正在办理
@@ -311,11 +323,17 @@
//判断当前审核状态
if (one.getAuditStatus() == 1) {
//审核状态为通过，则权限给到上报审核的这一层
- if (systemUserByPhone.isPresent() && identity == 2) {
+ /* if (systemUserByPhone.isPresent() && identity == 2) {
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
//非党员用户，必须是管理员有权限
if (accountLevel.compareTo(one.getReportType()) == 0) {
+ vo.setListControlsButtonStatus(0);
+ }
+ }*/
+ if (identity == 2) {
+ //非党员用户，必须是管理员有权限
+ if (systemUserLevel.getLevel().compareTo(one.getReportType()) == 0) {
vo.setListControlsButtonStatus(0);
}
}
@@ -328,7 +346,11 @@
.orderByDesc(ComplaintAuditRecord::getSort)
.last(" limit 0, 1"));
if (null != one1) {
- if (systemUserByPhone.isPresent()) {
+ //非党员用户，必须是管理员有权限
+ if (identity == 2 && systemUserLevel.getLevel().compareTo(one1.getReportType()) == 0 && systemUserLevel.getLevel() != 5) {
+ vo.setListControlsButtonStatus(0);
+ }
+ /*if (systemUserByPhone.isPresent()) {
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
Integer isAdmin = systemUser.getIsAdmin();
@@ -336,10 +358,10 @@
if (accountLevel.compareTo(one1.getReportType()) == 0 && accountLevel != 5 && 1 == isAdmin) {
vo.setListControlsButtonStatus(0);
}
- }
+ }*/
} else {
//没有上一层审核通过的数据，则权限给到添加人
- if (systemUserByPhone.isPresent()) {
+ /*if (systemUserByPhone.isPresent()) {
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
Integer isAdmin = systemUser.getIsAdmin();
@@ -355,6 +377,14 @@
if (vo.getReportType() == 5) {
vo.setListControlsButtonStatus(0);
}
+ }*/
+ //当前身份是管理员
+ if (2 == identity && systemUserLevel.getLevel().compareTo(vo.getReportType()) == 0 && (systemUserLevel.getLevel() != 5)) {
+ vo.setListControlsButtonStatus(0);
+ }
+ //如果当前身份是党员
+ if (1 == identity && 5 == vo.getReportType()) {
+ vo.setListControlsButtonStatus(0);
}
}
}
@@ -365,7 +395,7 @@
//判断当前审核状态
if (one.getAuditStatus() == 1) {
//审核状态为通过，则权限给到下报审核的这一层
- if (systemUserByPhone.isPresent()) {
+ /*if (systemUserByPhone.isPresent()) {
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
Integer isAdmin = systemUser.getIsAdmin();
@@ -373,6 +403,9 @@
if (accountLevel.compareTo(one.getReportType()) == 0 && 1 == isAdmin && 2 == identity) {
vo.setListControlsButtonStatus(0);
}
+ }*/
+ if (2 == identity && systemUserLevel.getLevel().compareTo(one.getReportType()) == 0) {
+ vo.setListControlsButtonStatus(0);
}
}
}
@@ -380,44 +413,41 @@
//有审核数据，且为审核中
//审核状态为待审核，需要授权审核按钮
- if (null != one && (vo.getStatus() == 5 || vo.getStatus() == 7) && systemUserByPhone.isPresent()) {
+ if (null != one && (vo.getStatus() == 5 || vo.getStatus() == 7) && identity == 2) {
SystemUser systemUser = systemUserByPhone.get();
String targetId = "";
Integer accountLevel = 5;
//获取当前身份，1=党员，2=管理员
- if (2 == currentIdentityInformation.getIdentity()) {
- accountLevel = systemUser.getAccountLevel();
- switch (accountLevel) {
- case 1:
- //市级
- targetId = "510400";
- break;
- case 2:
- //区县级
- targetId = systemUser.getDistrictsCode();
- break;
- case 3:
- //街道
- targetId = systemUser.getStreetId().toString();
- break;
- case 4:
- //社区
- targetId = systemUser.getCommunityId().toString();
- break;
- case 5:
- //党员
- PartyMember partyMember = partyMemberService.getPartyMemberByPhone(systemUser.getPhone());
- targetId = partyMember.getId().toString();
- break;
- }
+ accountLevel = systemUserLevel.getLevel();
+ switch (accountLevel) {
+ case 1:
+ //市级
+ targetId = "510400";
+ break;
+ case 2:
+ //区县级
+ targetId = systemUserLevel.getDistrictsCode();
+ break;
+ case 3:
+ //街道
+ targetId = systemUserLevel.getStreetId().toString();
+ break;
+ case 4:
+ //社区
+ targetId = systemUserLevel.getCommunityId().toString();
+ break;
+ case 5:
+ //党员
+ PartyMember partyMember = partyMemberService.getPartyMemberByPhone(systemUser.getPhone());
+ targetId = partyMember.getId().toString();
+ break;
+ }
- ComplaintAuditRecord one2 = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>()
- .eq(ComplaintAuditRecord::getComplaintId, vo.getId())
- .eq(ComplaintAuditRecord::getLatestFlag, 1));
- Integer isAdmin = systemUserByPhone.get().getIsAdmin();
- if (one2.getReportType().equals(accountLevel) && one2.getSuperiorId().toString().equals(targetId) && 1 == isAdmin) {
- vo.setAuditButtonStatus(0);
- }
+ ComplaintAuditRecord one2 = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>()
+ .eq(ComplaintAuditRecord::getComplaintId, vo.getId())
+ .eq(ComplaintAuditRecord::getLatestFlag, 1));
+ if (one2.getReportType().equals(accountLevel) && one2.getSuperiorId().toString().equals(targetId)) {
+ vo.setAuditButtonStatus(0);
}
}
@@ -425,7 +455,7 @@
//状态为已办结，判断评价按钮
int count = complaintCommentService.count(new LambdaQueryWrapper<ComplaintComment>().eq(ComplaintComment::getComplaintId, vo.getId()).eq(ComplaintComment::getDelFlag, 0));
if ((vo.getStatus() == 3 || vo.getStatus() == 8) && 0 == count) {
- if (systemUserByPhone.isPresent()) {
+ /* if (systemUserByPhone.isPresent()) {
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
Integer isAdmin = systemUser.getIsAdmin();
@@ -441,6 +471,14 @@
if (vo.getReportType() == 5) {
vo.setEvaluateButtonStatus(0);
}
+ }*/
+ //当前不是党员身份，需要是管理员才有权限
+ if (2 == identity && systemUserLevel.getLevel().compareTo(vo.getReportType()) == 0 && systemUserLevel.getLevel() != 5) {
+ vo.setEvaluateButtonStatus(0);
+ }
+ //当前是党员身份，只有是以党员身份提交的数据才有权限
+ if (1 == identity && vo.getReportType() == 5) {
+ vo.setEvaluateButtonStatus(0);
}
}
@@ -471,9 +509,9 @@
IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
Integer identity = identityInformation.getIdentity();
//上级
- if (systemUserByPhone.isPresent() && identity == 2) {
- SystemUser systemUser = systemUserByPhone.get();
- accountLevel = systemUser.getAccountLevel();
+ if (identity == 2) {
+ SystemUserLevel systemUserLevel = identityInformation.getSystemUserLevel();
+ accountLevel = systemUserLevel.getLevel();
switch (accountLevel) {
case 1:
//市级
@@ -481,15 +519,15 @@
break;
case 2:
//区县级
- targetId = systemUser.getDistrictsCode();
+ targetId = systemUserLevel.getDistrictsCode();
break;
case 3:
//街道
- targetId = systemUser.getStreetId().toString();
+ targetId = systemUserLevel.getStreetId().toString();
break;
case 4:
//社区
- targetId = systemUser.getCommunityId().toString();
+ targetId = systemUserLevel.getCommunityId().toString();
break;
case 5:
//党员
@@ -526,8 +564,6 @@
// }
-
-
// //已办结，显示评价按钮
// int count = complaintCommentService.count(new LambdaQueryWrapper<ComplaintComment>().eq(ComplaintComment::getComplaintId, detail.getId()).eq(ComplaintComment::getDelFlag, 0));
// if(detail.getStatus() == 3 && 0 == count){
@@ -555,7 +591,7 @@
@Override
public void saveProcess(ComplaintProcessDTO dto, LoginUserInfoVO loginUserInfoVO) {
//获取当前身份
- IdentityInformation identityInformationVO = identityInformationService.getIdentityInformation(loginUserInfoVO);
+ IdentityInformation identityInformationVO = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
List<PermissionsVO> permissions = identityInformationVO.getPermissions();
if (permissions.isEmpty()) {
@@ -587,7 +623,7 @@
@Override
public void saveResult(ComplaintCompletionDTO dto, LoginUserInfoVO loginUserInfoVO) {
//获取当前身份
- IdentityInformation identityInformationVO = identityInformationService.getIdentityInformation(loginUserInfoVO);
+ IdentityInformation identityInformationVO = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
List<PermissionsVO> permissions = identityInformationVO.getPermissions();
if (permissions.isEmpty()) {
@@ -599,14 +635,20 @@
if (identityInformationVO.getIdentity() == 2) {
//1=党员，2=管理员
SystemUser systemUser = identityInformationVO.getSystemUser();
- accountLevel = systemUser.getAccountLevel();
+ SystemUserLevel systemUserLevel = identityInformationVO.getSystemUserLevel();
+ accountLevel = systemUserLevel.getLevel();
name = systemUser.getName();
} else if (identityInformationVO.getIdentity() == 1) {
accountLevel = 5;
PartyMember partyMember = identityInformationVO.getPartyMember();
name = partyMember.getName();
}
- Complaint complaint = BeanUtil.copyProperties(dto, Complaint.class);
+
+ Long complaintId = dto.getId();
+ Complaint complaint = this.getById(complaintId);
+ Date createTime = complaint.getCreateTime();
+ complaint = BeanUtil.copyProperties(dto, Complaint.class);
+
complaint.setUpdateTime(new Date());
complaint.setCompletionUserId(loginUserInfoVO.getUserId());
complaint.setCompletionUsername(name);
@@ -614,7 +656,6 @@
complaint.setCompletionTime(new Date());
complaint.setCompletionUserLevel(accountLevel);
// 计算处理时间
- Date createTime = complaint.getCreateTime();
long l = Duration.between(createTime.toInstant(), complaint.getCompletionTime().toInstant()).getSeconds() / 3600;
double handlingDay = new BigDecimal(l).divide(new BigDecimal("24"), 2, RoundingMode.HALF_UP).doubleValue();
complaint.setHandlingDay(handlingDay);
@@ -641,6 +682,7 @@
String phone = loginUserInfoVO.getPhone();
IdentityInformation identityInformationVO = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
SystemUser adminUser = identityInformationVO.getSystemUser();
+ SystemUserLevel systemUserLevel = identityInformationVO.getSystemUserLevel();
Long superiorId;
int reportType;
@@ -657,7 +699,7 @@
departmentName = partyMember.getDistricts() + "-" + partyMember.getStreet() + "-" + partyMember.getCommunity();
reporter = partyMember.getName();
} else if (identityInformationVO.getIdentity() == 2) {
- int accountLevel = adminUser.getAccountLevel(); // 改为基本类型
+ int accountLevel = systemUserLevel.getLevel(); // 改为基本类型
if (accountLevel == 1) {
throw new ServiceException("市级账号,无法上报！");
}
@@ -667,16 +709,16 @@
// 使用基本类型比较并补充默认分支
if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
- superiorId = Long.parseLong(adminUser.getStreetId());
- reporterId = adminUser.getCommunityId();
+ superiorId = Long.parseLong(systemUserLevel.getStreetId());
+ reporterId = systemUserLevel.getCommunityId();
} else if (accountLevel == ReportTypeEnum.STREET.getCode()) {
- superiorId = Long.parseLong(adminUser.getDistrictsCode());
- reporterId = Long.parseLong(adminUser.getStreetId());
+ superiorId = Long.parseLong(systemUserLevel.getDistrictsCode());
+ reporterId = Long.parseLong(systemUserLevel.getStreetId());
} else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
superiorId = 510400L; // 攀枝花市
- reporterId = Long.parseLong(adminUser.getDistrictsCode());
+ reporterId = Long.parseLong(systemUserLevel.getDistrictsCode());
} else if (accountLevel == ReportTypeEnum.PARTY.getCode()) {
- superiorId = adminUser.getCommunityId();
+ superiorId = systemUserLevel.getCommunityId();
} else {
// 处理未预期的账号等级
throw new ServiceException("未知的账号等级");
@@ -684,24 +726,25 @@
//查询社区信息
switch (accountLevel) {
case 2:
- BcRegion region = bcRegionService.getDistrictByCode(adminUser.getDistrictsCode().toString());
+ BcRegion region = bcRegionService.getDistrictByCode(systemUserLevel.getDistrictsCode().toString());
if (Objects.nonNull(region)) {
departmentName = region.getRegionName();
}
break;
case 3:
- ComStreet street = comStreetService.getById(adminUser.getStreetId().toString());
+ ComStreet street = comStreetService.getById(systemUserLevel.getStreetId().toString());
if (Objects.nonNull(street)) {
BcRegion district = bcRegionService.getDistrictByCode(street.getAreaCode().toString());
departmentName = Objects.nonNull(district) ? district.getRegionName() + "-" + street.getName() : street.getName();
}
break;
case 4:
- ComAct act = comActService.getById(adminUser.getCommunityId());
+ ComAct act = comActService.getById(systemUserLevel.getCommunityId());
if (Objects.nonNull(act)) {
ComStreet street2 = comStreetService.getById(adminUser.getStreetId().toString());
BcRegion district = bcRegionService.getDistrictByCode(act.getAreaCode());
- departmentName = Objects.nonNull(district) && Objects.nonNull(street2) ? district.getRegionName() + "-" + street2.getName() + "-" + act.getName() : act.getName();
+ departmentName = Objects.nonNull(district) && Objects.nonNull(street2) ?
+ district.getRegionName() + "-" + street2.getName() + "-" + act.getName() : act.getName();
}
break;
}
@@ -740,6 +783,7 @@
complaintAuditRecord.setReporterLevel(reporterLevel);
complaintAuditRecord.setReporterId(reporterId);
complaintAuditRecord.setApplyName(reporter);
+ complaintAuditRecord.setApplyPhone(phone);
complaintAuditRecordService.save(complaintAuditRecord);
}
@@ -786,8 +830,8 @@
throw new ServiceException("无权下派");
}
- SystemUser adminUser = identityInformation.getSystemUser();
- int accountLevel = adminUser.getAccountLevel(); // 改为基本类型
+ SystemUserLevel systemUserLevel = identityInformation.getSystemUserLevel();
+ int accountLevel = systemUserLevel.getLevel(); // 改为基本类型
if (accountLevel == 4) {
throw new ServiceException("社区账号,无法下派！");
}
@@ -825,20 +869,20 @@
complaintAuditRecordService.save(record);
ComplaintAuditRecord complaintAuditRecord = new ComplaintAuditRecord();
complaintAuditRecord.setComplaintId(complaint.getId());
- complaintAuditRecord.setReportType(adminUser.getAccountLevel());
+ complaintAuditRecord.setReportType(systemUserLevel.getLevel());
Long superiorId = null;
- switch (adminUser.getAccountLevel()) {
+ switch (systemUserLevel.getLevel()) {
case 1:
superiorId = 510400L;//默认市级
break;
case 2:
- superiorId = Long.parseLong(adminUser.getDistrictsCode());
+ superiorId = Long.parseLong(systemUserLevel.getDistrictsCode());
break;
case 3:
- superiorId = Long.parseLong(adminUser.getStreetId());
+ superiorId = Long.parseLong(systemUserLevel.getStreetId());
break;
case 4:
- superiorId = adminUser.getCommunityId();
+ superiorId = systemUserLevel.getCommunityId();
break;
}
complaintAuditRecord.setSuperiorId(superiorId);
@@ -852,23 +896,24 @@
IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
SystemUser systemUser = identityInformation.getSystemUser();
- if (systemUser == null || identityInformation.getIdentity() != 2) {
+ SystemUserLevel systemUserLevel = identityInformation.getSystemUserLevel();
+ if (identityInformation.getIdentity() != 2) {
throw new ServiceException("无权审核");
}
Long superiorId = 0L;
- switch (systemUser.getAccountLevel()) {
+ switch (systemUserLevel.getLevel()) {
case 1:
superiorId = 510400L;//默认市级
break;
case 2:
- superiorId = Long.parseLong(systemUser.getDistrictsCode());
+ superiorId = Long.parseLong(systemUserLevel.getDistrictsCode());
break;
case 3:
- superiorId = Long.parseLong(systemUser.getStreetId());
+ superiorId = Long.parseLong(systemUserLevel.getStreetId());
break;
case 4:
- superiorId = systemUser.getCommunityId();
+ superiorId = systemUserLevel.getCommunityId();
break;
}
@@ -877,7 +922,7 @@
.eq(ComplaintAuditRecord::getComplaintId, complaintReporAuditDTO.getId())
.eq(ComplaintAuditRecord::getAuditType, 2)
.eq(ComplaintAuditRecord::getLatestFlag, true)
- .eq(ComplaintAuditRecord::getReportType, systemUser.getAccountLevel())
+ .eq(ComplaintAuditRecord::getReportType, systemUserLevel.getLevel())
.eq(ComplaintAuditRecord::getSuperiorId, superiorId)
.last("LIMIT 1").one();
if (Objects.isNull(complaintAuditRecord)) {
@@ -885,6 +930,7 @@
}
complaintAuditRecord.setAuditorName(systemUser.getName());
complaintAuditRecord.setAuditorPhone(systemUser.getPhone());
+ complaintAuditRecord.setAuditTime(new Date());
if (complaintReporAuditDTO.getAuditResult().equals(1)) {
complaintAuditRecord.setAuditStatus(1);
complaintAuditRecord.setAuditorId(loginUserInfoVO.getUserId());
@@ -909,7 +955,8 @@
public void saveDelay(ComplaintDelayDTO dto, LoginUserInfoVO loginUserInfoVO) {
IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
- SystemUser systemUser = systemUserService.getSystemUserAdminByPhone(loginUserInfoVO.getPhone()).orElse(null);
+ SystemUser systemUser = identityInformation.getSystemUser();
+ SystemUserLevel systemUserLevel = identityInformation.getSystemUserLevel();
Long superiorId;
int reportType;
String departmentName = "";
@@ -923,8 +970,8 @@
reportType = ReportTypeEnum.COMMUNITY.getCode();
departmentName = partyMember.getDistricts() + "-" + partyMember.getStreet() + "-" + partyMember.getCommunity();
reporter = partyMember.getName();
- } else if (identityInformation.getIdentity() == 2 && systemUser != null) {
- int accountLevel = systemUser.getAccountLevel(); // 改为基本类型
+ } else if (identityInformation.getIdentity() == 2) {
+ int accountLevel = systemUserLevel.getLevel(); // 改为基本类型
if (accountLevel == 1) {
throw new ServiceException("市级账号,无法延期申请！");
}
@@ -933,13 +980,13 @@
// 使用基本类型比较并补充默认分支
if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
- superiorId = Long.parseLong(systemUser.getStreetId());
+ superiorId = Long.parseLong(systemUserLevel.getStreetId());
} else if (accountLevel == ReportTypeEnum.STREET.getCode()) {
- superiorId = Long.parseLong(systemUser.getDistrictsCode());
+ superiorId = Long.parseLong(systemUserLevel.getDistrictsCode());
} else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
superiorId = 510400L; // 攀枝花市
} else if (accountLevel == ReportTypeEnum.PARTY.getCode()) {
- superiorId = systemUser.getCommunityId();
+ superiorId = systemUserLevel.getCommunityId();
} else {
// 处理未预期的账号等级
throw new ServiceException("未知的账号等级");
@@ -947,24 +994,25 @@
//查询社区信息
switch (accountLevel) {
case 2:
- BcRegion region = bcRegionService.getDistrictByCode(systemUser.getDistrictsCode().toString());
+ BcRegion region = bcRegionService.getDistrictByCode(systemUserLevel.getDistrictsCode().toString());
if (Objects.nonNull(region)) {
departmentName = region.getRegionName();
}
break;
case 3:
- ComStreet street = comStreetService.getById(systemUser.getStreetId().toString());
+ ComStreet street = comStreetService.getById(systemUserLevel.getStreetId().toString());
if (Objects.nonNull(street)) {
BcRegion district = bcRegionService.getDistrictByCode(street.getAreaCode().toString());
departmentName = Objects.nonNull(district) ? district.getRegionName() + "-" + street.getName() : street.getName();
}
break;
case 4:
- ComAct act = comActService.getById(systemUser.getCommunityId());
+ ComAct act = comActService.getById(systemUserLevel.getCommunityId());
if (Objects.nonNull(act)) {
- ComStreet street2 = comStreetService.getById(systemUser.getStreetId().toString());
+ ComStreet street2 = comStreetService.getById(systemUserLevel.getStreetId().toString());
BcRegion district = bcRegionService.getDistrictByCode(act.getAreaCode());
- departmentName = Objects.nonNull(district) && Objects.nonNull(street2) ? district.getRegionName() + "-" + street2.getName() + "-" + act.getName() : act.getName();
+ departmentName = Objects.nonNull(district) && Objects.nonNull(street2) ?
+ district.getRegionName() + "-" + street2.getName() + "-" + act.getName() : act.getName();
}
break;
}
@@ -994,6 +1042,7 @@
record1.setDepartmentName(departmentName);
// 冗余申请人名称
record1.setApplyName(reporter);
+ record1.setApplyPhone(loginUserInfoVO.getPhone());
complaintAuditRecordService.save(record1);
}
@@ -1002,19 +1051,20 @@
public void delayAudit(ComplaintDelayAuditDTO dto, LoginUserInfoVO loginUserInfoVO) {
IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
SystemUser systemUser = identityInformation.getSystemUser();
- if (identityInformation.getIdentity() != 2 || systemUser == null) {
+ SystemUserLevel systemUserLevel = identityInformation.getSystemUserLevel();
+ if (identityInformation.getIdentity() != 2) {
throw new ServiceException("无权审核");
}
- int accountLevel = systemUser.getAccountLevel(); // 改为基本类型
+ int accountLevel = systemUserLevel.getLevel(); // 改为基本类型
Long superiorId;
// 使用基本类型比较并补充默认分支
if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
- superiorId = systemUser.getCommunityId();
+ superiorId = systemUserLevel.getCommunityId();
} else if (accountLevel == ReportTypeEnum.STREET.getCode()) {
- superiorId = Long.parseLong(systemUser.getStreetId());
+ superiorId = Long.parseLong(systemUserLevel.getStreetId());
} else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
- superiorId = Long.parseLong(systemUser.getDistrictsCode());
+ superiorId = Long.parseLong(systemUserLevel.getDistrictsCode());
} else if (accountLevel == ReportTypeEnum.CITY.getCode()) {
superiorId = 510400L;
} else {
@@ -1038,6 +1088,7 @@
}
complaintAuditRecord.setAuditorName(systemUser.getName());
complaintAuditRecord.setAuditorPhone(systemUser.getPhone());
+ complaintAuditRecord.setAuditTime(new Date());
//审核通过后，设置诉求延期
if (complaintAuditRecord.getAuditType().equals(1) && complaintAuditRecord.getAuditStatus().equals(0) && dto.getAuditResult().equals(1)) {
Complaint complaint = getById(complaintAuditRecord.getComplaintId());
@@ -1050,6 +1101,11 @@
}
//审核不通过
if (complaintAuditRecord.getAuditType().equals(1) && complaintAuditRecord.getAuditStatus().equals(0) && dto.getAuditResult().equals(2)) {
+ Complaint complaint = getById(complaintAuditRecord.getComplaintId());
+ // 设置为正在办理
+ complaint.setStatus(0);
+ updateById(complaint);
+
complaintAuditRecord.setRejectReason(dto.getRejectReason());
complaintAuditRecord.setAuditStatus(2);
complaintAuditRecord.setAuditorId(loginUserInfoVO.getUserId());
@@ -1063,11 +1119,12 @@
IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
SystemUser adminUser = identityInformation.getSystemUser();
+ SystemUserLevel systemUserLevel = identityInformation.getSystemUserLevel();
- if (adminUser == null || identityInformation.getIdentity() != 2) {
+ if (identityInformation.getIdentity() != 2) {
throw new ServiceException("无权下派");
}
- int accountLevel = adminUser.getAccountLevel(); // 改为基本类型
+ int accountLevel = systemUserLevel.getLevel(); // 改为基本类型
/* if (accountLevel == 1) {
throw new ServiceException("市级账号,无法上报！");
}*/
@@ -1075,7 +1132,7 @@
// 使用基本类型比较并补充默认分支
List<DispatchVO> dispatchVOList = new ArrayList<>();
if (accountLevel == ReportTypeEnum.STREET.getCode()) {
- String streetId = adminUser.getStreetId();
+ String streetId = systemUserLevel.getStreetId();
List<ComAct> list = comActService.list(new LambdaQueryWrapper<ComAct>().eq(ComAct::getStreetId, streetId));
for (ComAct comAct : list) {
DispatchVO dispatchVO = new DispatchVO();
@@ -1084,7 +1141,7 @@
dispatchVOList.add(dispatchVO);
}
} else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
- String districtsCode = adminUser.getDistrictsCode();
+ String districtsCode = systemUserLevel.getDistrictsCode();
List<ComStreet> list = comStreetService.list(new LambdaQueryWrapper<ComStreet>().eq(ComStreet::getAreaCode, districtsCode));
for (ComStreet street : list) {
DispatchVO dispatchVO = new DispatchVO();
@@ -1118,12 +1175,12 @@
@Override
public Page<ComplaintTodoVO> getTodoList(BasePage basePage, LoginUserInfoVO loginUserInfo) {
IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfo);
- SystemUser systemUser = identityInformation.getSystemUser();
+ SystemUserLevel systemUserLevel = identityInformation.getSystemUserLevel();
String targetId = "";
int isSuperior = 0;
//上级
if (identityInformation.getIdentity() == 2) {
- Integer accountLevel = systemUser.getAccountLevel();
+ Integer accountLevel = systemUserLevel.getLevel();
switch (accountLevel) {
case 1:
//市级
@@ -1131,15 +1188,15 @@
break;
case 2:
//区县级
- targetId = systemUser.getDistrictsCode();
+ targetId = systemUserLevel.getDistrictsCode();
break;
case 3:
//街道
- targetId = systemUser.getStreetId();
+ targetId = systemUserLevel.getStreetId();
break;
case 4:
//社区
- targetId = systemUser.getCommunityId().toString();
+ targetId = systemUserLevel.getCommunityId().toString();
break;
}
isSuperior = 1;
@@ -1195,8 +1252,8 @@
complaintVO.setComplaintComment(comment);
ArrayList<String> voiceFileList = new ArrayList<>();
String voiceFile = complaint.getVoiceFile();
- if(StringUtils.isNotEmpty(voiceFile)){
- for (String file :voiceFile.split(",")) {
+ if (StringUtils.isNotEmpty(voiceFile)) {
+ for (String file : voiceFile.split(",")) {
voiceFileList.add(file);
}
}
@@ -1383,7 +1440,7 @@
public void updateProgress(ComplaintProcessUpdateDto dto) {
complaintProgressService.update(new LambdaUpdateWrapper<ComplaintProgress>().eq(ComplaintProgress::getId, dto.getId())
.set(ComplaintProgress::getDescribe, dto.getDescribe()).set(ComplaintProgress::getImgUrl, dto.getImgUrl())
- .set(ComplaintProgress::getVideo, dto.getVideo()) ) ;
+ .set(ComplaintProgress::getVideo, dto.getVideo()));
}
/**
@@ -1392,39 +1449,39 @@
*/
@Override
public void delProgress(Long id) {
- complaintProgressService.removeById(id);
+ complaintProgressService.removeById(id);
}
@Override
- public AnalyticStatisticsOneVo analyticStatisticsOne(AnalyticStatisticsQuery query,List<Complaint> complaints, SimpleDateFormat simpleDateFormat) {
+ public AnalyticStatisticsOneVo analyticStatisticsOne(AnalyticStatisticsQuery query, List<Complaint> complaints, SimpleDateFormat simpleDateFormat) {
String nowYearMonth;
String lastYearMonth;
int value = LocalDate.now().getMonth().getValue();
- if(value<10){
+ if (value < 10) {
nowYearMonth = LocalDate.now().getYear() + "-0" + LocalDate.now().getMonth().getValue();
- }else {
+ } else {
nowYearMonth = LocalDate.now().getYear() + "-" + LocalDate.now().getMonth().getValue();
}
int value1 = LocalDate.now().minusMonths(1).getMonth().getValue();
- if(value1<10){
+ if (value1 < 10) {
lastYearMonth = LocalDate.now().minusMonths(1).getYear() + "-0" + LocalDate.now().minusMonths(1).getMonth().getValue();
- }else {
+ } else {
lastYearMonth = LocalDate.now().minusMonths(1).getYear() + "-" + LocalDate.now().minusMonths(1).getMonth().getValue();
}
-
-
+ // 要根据驳回表来改状态
+ List<Long> ids = complaints.stream().map(Complaint::getId).collect(Collectors.toList());
+ complaints = this.baseMapper.getStatusForList(ids);
AnalyticStatisticsOneVo vo = new AnalyticStatisticsOneVo();
// 诉求单量总计
vo.setAllTotal(complaints.size());
-
// 诉求单量本月
- int thisMonthTotal = (int)complaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(nowYearMonth)).count();
- vo.setThisMonthTotal( thisMonthTotal);
+ int thisMonthTotal = (int) complaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(nowYearMonth)).count();
+ vo.setThisMonthTotal(thisMonthTotal);
// 诉求单量同比上月
- int lastMonthTotal = (int)complaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(lastYearMonth)).count();
- vo.setLastMonthCompareTotal(thisMonthTotal- lastMonthTotal);
+ int lastMonthTotal = (int) complaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(lastYearMonth)).count();
+ vo.setLastMonthCompareTotal(thisMonthTotal - lastMonthTotal);
// 正在办理
int nowTransactTotal = (int) complaints.stream().filter(e -> e.getStatus() == 0).count();
@@ -1439,7 +1496,7 @@
vo.setPostponeTransactTotal(postponeTransactTotal);
// 已办结
- int completeTransactTotal = (int) complaints.stream().filter(e -> e.getStatus() == 3).count();
+ int completeTransactTotal = (int) complaints.stream().filter(e -> e.getStatus() == 3 || e.getStatus() == 8).count();
vo.setCompleteTransactTotal(completeTransactTotal);
// 超时办理总量
@@ -1452,25 +1509,29 @@
// 超时办理同比上月
int lastMonthOvertimeTransactTotal = (int) overtimeComplaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(lastYearMonth)).count();
- vo.setLastMonthOvertimeTransactCompareTotal(thisMonthOvertimeTransactTotal-lastMonthOvertimeTransactTotal);
+ vo.setLastMonthOvertimeTransactCompareTotal(thisMonthOvertimeTransactTotal - lastMonthOvertimeTransactTotal);
// 平均处理时长
- if(complaints.size()>0) {
+ if (complaints.size() > 0) {
double averageDay = complaints.stream().mapToDouble(v -> v.getHandlingDay() == null ? 0 : v.getHandlingDay()).average().getAsDouble();
averageDay = BigDecimal.valueOf(averageDay).setScale(2, RoundingMode.HALF_UP).doubleValue();
vo.setAverageTime(averageDay);
List<Complaint> thisMonthAverageTimeComplaints = complaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(nowYearMonth)).collect(Collectors.toList());
- if(thisMonthAverageTimeComplaints.size()>0){
+ if (thisMonthAverageTimeComplaints.size() > 0) {
double thisMonthAverageTime = thisMonthAverageTimeComplaints.stream().mapToDouble(v -> v.getHandlingDay() == null ? 0 : v.getHandlingDay()).average().getAsDouble();
thisMonthAverageTime = BigDecimal.valueOf(thisMonthAverageTime).setScale(2, RoundingMode.HALF_UP).doubleValue();
vo.setThisMonthAverageTime(thisMonthAverageTime);
}
List<Complaint> lastMonthAverageTimeComplaints = complaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(lastYearMonth)).collect(Collectors.toList());
- if(lastMonthAverageTimeComplaints.size()>0){
+ if (lastMonthAverageTimeComplaints.size() > 0) {
double lastMonthAverageTime = lastMonthAverageTimeComplaints.stream().mapToDouble(v -> v.getHandlingDay() == null ? 0 : v.getHandlingDay()).average().getAsDouble();
- lastMonthAverageTime = BigDecimal.valueOf(lastMonthAverageTime).setScale(2, RoundingMode.HALF_UP).doubleValue();
- vo.setAverageTime(vo.getThisMonthAverageTime() - lastMonthAverageTime);
+ BigDecimal lastMonthAverageTime1 = BigDecimal.valueOf(lastMonthAverageTime).setScale(2, RoundingMode.HALF_UP);
+
+ vo.setLastMonthCompareAverageTime( new BigDecimal(vo.getThisMonthAverageTime()).subtract(lastMonthAverageTime1).setScale(2,RoundingMode.HALF_UP).doubleValue());
+ }else {
+ vo.setLastMonthCompareAverageTime( new BigDecimal(vo.getThisMonthAverageTime()).setScale(2,RoundingMode.HALF_UP).doubleValue());
+
}
}
@@ -1478,7 +1539,7 @@
List<Complaint> commentRateComplaints = complaints.stream().filter(e -> e.getCommentRate() != null).collect(Collectors.toList());
long count = commentRateComplaints.stream().filter(e -> e.getCommentRate() > 1).count();
int size = commentRateComplaints.size();
- if(size>0){
+ if (size > 0) {
BigDecimal multiply = BigDecimal.valueOf(count).divide(new BigDecimal(size), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
vo.setSatisfactionRate(multiply.doubleValue());
@@ -1487,45 +1548,56 @@
long count1 = nowMonth.stream().filter(e -> e.getCommentRate() > 1).count();
// 当月的评价数
int nowMonthSize = nowMonth.size();
- if(nowMonthSize>0){
+ if (nowMonthSize > 0) {
BigDecimal multiply1 = BigDecimal.valueOf(count1).divide(new BigDecimal(nowMonthSize), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
vo.setThisMonthSatisfactionRate(multiply1.doubleValue());
}
- List<Complaint> lastMonth = commentRateComplaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(nowYearMonth)).collect(Collectors.toList());
+ List<Complaint> lastMonth = commentRateComplaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(lastYearMonth)).collect(Collectors.toList());
// 当月满意
long count2 = lastMonth.stream().filter(e -> e.getCommentRate() > 1).count();
// 当月的评价数
int lastMonthSize = lastMonth.size();
- if(lastMonthSize>0){
+ if (lastMonthSize > 0) {
BigDecimal multiply2 = BigDecimal.valueOf(count2).divide(new BigDecimal(lastMonthSize), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
- vo.setLastMonthCompareSatisfactionRate(vo.getThisMonthSatisfactionRate()-multiply2.doubleValue());
+ vo.setLastMonthCompareSatisfactionRate(vo.getThisMonthSatisfactionRate() - multiply2.doubleValue());
}
}
return vo;
}
+
+ public static void main(String[] args) {
+ String time = "2022-02-02 - 2023-02-02";
+ String[] split = time.split(" - ");
+ System.out.println(split[0]);
+ }
+
@Override
- public List<AnalyticStatisticsTwoVo> analyticStatisticsTwo(AnalyticStatisticsQuery query, List<Complaint> complaints, SimpleDateFormat simpleDateFormat) {
+ public List<AnalyticStatisticsTwoVo> analyticStatisticsTwo(String time, List<Complaint> complaints, SimpleDateFormat simpleDateFormat) {
ArrayList<AnalyticStatisticsTwoVo> list = new ArrayList<>();
try {
- if (StringUtils.isNotEmpty(query.getTime())) {
- String[] split = query.getTime().split(" - ");
+ if (StringUtils.isNotEmpty(time)) {
+ String[] split = time.split(" - ");
Date parse = simpleDateFormat.parse(split[0] + " 00:00:00");
Date parse1 = simpleDateFormat.parse(split[1] + " 23:59:59");
complaints = complaints.stream().filter(e -> e.getCreateTime().getTime() <= parse1.getTime() && e.getCreateTime().getTime() >= parse.getTime()).collect(Collectors.toList());
int day = DateUtils.getDay(parse, parse1);
+ if (day > 30) {
+ throw new ServiceException("时间范围不能超过30天");
+ }
+
for (int i = 0; i <= day; i++) {
AnalyticStatisticsTwoVo analyticStatisticsTwoVo = new AnalyticStatisticsTwoVo();
- if(i==0){
+ if (i == 0) {
List<Complaint> collect = complaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(split[0])).collect(Collectors.toList());
analyticStatisticsTwoVo.setTime(split[0]);
analyticStatisticsTwoVo.setAllTotal(collect.size());
int count = (int) collect.stream().filter(e -> e.getStatus() == 3).count();
analyticStatisticsTwoVo.setCompleteTotal(count);
list.add(analyticStatisticsTwoVo);
- }else {
+ } else {
String nextDay = DateUtils.getNextDay(parse, i);
List<Complaint> collect = complaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(nextDay)).collect(Collectors.toList());
analyticStatisticsTwoVo.setTime(nextDay);
@@ -1537,12 +1609,12 @@
}
} else {
- String time = DateUtils.getBeforeDay(6) + " 00:00:00";
+ time = DateUtils.getBeforeDay(6) + " 00:00:00";
Date parse = simpleDateFormat.parse(time);
// 近7天数据
complaints = complaints.stream().filter(e -> e.getCreateTime().getTime() <= new Date().getTime() && e.getCreateTime().getTime() >= parse.getTime()).collect(Collectors.toList());
- for (int i = 6; i > 0; i--) {
+ for (int i = 6; i >= 0; i--) {
// 获取前7天的时间
String day = DateUtils.getBeforeDay(i);
List<Complaint> complaintList = complaints.stream().filter(e -> simpleDateFormat.format(e.getCreateTime()).contains(day)).collect(Collectors.toList());
@@ -1562,7 +1634,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()
@@ -1574,16 +1646,78 @@
})
.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){
- return analyticStatisticsThreeVos.stream().limit(5).collect(Collectors.toList());
- }else if(query.getRank()==10){
+ } else if (rank == 5) {
+ return analyticStatisticsThreeVos.stream().limit(5).collect(Collectors.toList());
+ } else if (rank == 10) {
return analyticStatisticsThreeVos.stream().limit(10).collect(Collectors.toList());
}
return Collections.emptyList();
}
+ @Override
+ public AnalyticStatisticsFourVo analyticStatisticsFour(List<Complaint> complaints) {
+ // 只计算评分了的
+ complaints = complaints.stream().filter(e -> e.getCommentRate() != null).collect(Collectors.toList());
+ AnalyticStatisticsFourVo vo = new AnalyticStatisticsFourVo();
+ // 0：不满意 1：一般 2：满意 3：非常满意
+ long count = complaints.stream().filter(e -> e.getCommentRate() != null && e.getCommentRate() == 0).count();
+ vo.setDissatisfactionNum((int) count);
+ long count1 = complaints.stream().filter(e -> e.getCommentRate() != null && e.getCommentRate() == 1).count();
+ vo.setGeneralSatisfactionNum((int) count1);
+ long count2 = complaints.stream().filter(e -> e.getCommentRate() != null && e.getCommentRate() == 2).count();
+ vo.setSatisfactionRateNum((int) count2);
+ long count3 = complaints.stream().filter(e -> e.getCommentRate() != null && e.getCommentRate() == 3).count();
+ vo.setGreatSatisfactionNum((int) count3);
+ if (complaints.size() > 0) {
+ vo.setDissatisfactionRate(BigDecimal.valueOf(count).divide(BigDecimal.valueOf(complaints.size()),4,RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2,RoundingMode.HALF_UP).doubleValue());
+ vo.setGeneralSatisfactionRate(BigDecimal.valueOf(count1).divide(BigDecimal.valueOf(complaints.size()),4,RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2,RoundingMode.HALF_UP).doubleValue());
+ vo.setSatisfactionRate(BigDecimal.valueOf(count2).divide(BigDecimal.valueOf(complaints.size()),4,RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2,RoundingMode.HALF_UP).doubleValue());
+ vo.setGreatSatisfactionRate(BigDecimal.valueOf(count3).divide(BigDecimal.valueOf(complaints.size()),4,RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2,RoundingMode.HALF_UP).doubleValue());
+ }
+ return vo;
+ }
+ @Override
+ public List<Complaint> queryCompliantList(AppStaticsQuery query, LoginUserInfoVO loginUserInfo) {
+ IdentityInformation identityInformation = identityInformationService.getIdentityInformation(loginUserInfo);
+ Integer identity = identityInformation.getIdentity();
+ PartyMember partyMember = identityInformation.getPartyMember();
+ SystemUserLevel systemUserLevel = identityInformation.getSystemUserLevel();
+ Long targetId = null;
+ Integer accountLevel = 5;
+ //党员，查询该党员
+ if (identity.equals(1)) {
+ targetId = partyMember.getId();
+ } else if (identity.equals(2)) {
+ //上级
+ if (Objects.nonNull(query.getTier()) && query.getTier().equals(-1)) {
+ accountLevel = systemUserLevel.getLevel();
+ switch (systemUserLevel.getLevel()) {
+ case 1:
+ //市级
+ targetId = 510400L;
+ break;
+ case 2:
+ //区县级
+ targetId = Long.valueOf(systemUserLevel.getDistrictsCode());
+ break;
+ case 3:
+ //街道
+ targetId = Long.valueOf(systemUserLevel.getStreetId());
+ break;
+ case 4:
+ //社区
+ targetId = systemUserLevel.getCommunityId();
+ break;
+ }
+ } else {
+ targetId = Long.valueOf(query.getAreaId());
+ accountLevel = query.getTier();
+ }
+ }
+ return baseMapper.queryCompliantList(targetId, accountLevel, loginUserInfo, query);
+ }
}
--
Gitblit v1.7.1