From 3632162b5cbffbe53f86094604f213d20fda2e35 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 27 六月 2025 14:50:36 +0800
Subject: [PATCH] 2.0后台模块接口
---
springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/ComplaintServiceImpl.java | 141 +++++++++++++++++++++++++++-------------------
1 files changed, 82 insertions(+), 59 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/ComplaintServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/ComplaintServiceImpl.java
index b301a7c..b8eb4a8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/ComplaintServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/ComplaintServiceImpl.java
@@ -302,29 +302,29 @@
page = baseMapper.selectComplaintPage2(page, query, accountLevel, targetId);
} else if (accountLevel == 2) {
// 西区单位 如果是西区单位，则只看自己上报的
- if (systemUser.getSystemRoleId() == 1) {
+ if (systemUser.getSystemRoleId() == 1 || systemUser.getSystemRoleId() == 2) {
// 是管理员 看所有的
- page = baseMapper.selectComplaintPage3(page, query, accountLevel, targetId);
+ page = baseMapper.selectComplaintPage3(page, query, accountLevel, targetId,systemUser.getSystemRoleId() );
} else {
// 不是管理员 看到指派给我的单位的诉求
page = baseMapper.selectComplaintPage4(page, query, systemUser.getOneDepartmentId());
}
} else if (accountLevel == 3) {
// 街道 1
- if (systemUser.getSystemRoleId() == 1) {
+ if (systemUser.getSystemRoleId() == 1 || systemUser.getSystemRoleId() == 2) {
// 获取这个街道所管的社区id
List<Long> communityIds = comActService.list(new LambdaQueryWrapper<ComAct>().eq(ComAct::getStreetId, systemUser.getStreetId())).stream().map(ComAct::getCommunityId).collect(Collectors.toList());
// 是管理员 可以看到下派来的 也可以看到上派待审核的
- page = baseMapper.selectComplaintPage5(page, query, systemUser.getStreetId(), communityIds);
+ page = baseMapper.selectComplaintPage5(page, query, systemUser.getStreetId(), communityIds, systemUser.getSystemRoleId());
} else {
// 不是管理员 看指派给我的
page = baseMapper.selectComplaintPage4(page, query, systemUser.getOneDepartmentId());
}
} else if (accountLevel == 4) {
// 社区
- if (systemUser.getSystemRoleId() == 1) {
+ if (systemUser.getSystemRoleId() == 1 || systemUser.getSystemRoleId() == 2) {
// 是管理员
- page = baseMapper.selectComplaintPage6(page, query, systemUser.getCommunityId(), null);
+ page = baseMapper.selectComplaintPage6(page, query, systemUser.getCommunityId(), null, systemUser.getSystemRoleId());
} else {
// 不是管理员 看到负责社区的所有诉求 和 上级下派来的诉求
page = baseMapper.selectComplaintPage4(page, query, systemUser.getOneDepartmentId());
@@ -779,6 +779,10 @@
}
return detail;
}
+
+
+
+
@Override
@@ -1561,36 +1565,44 @@
*/
@Override
public Page<ComplaintVO> pageList(MgtComplaintQuery query, SystemUserVo loginUserInfo) {
+ Page<ComplaintVO> complaintVOPage=new Page<>();
if (loginUserInfo.getAccountLevel() == 2) {
if(loginUserInfo.getSystemRoleId()==1 || loginUserInfo.getSystemRoleId()==2){
- Page<ComplaintVO> complaintVOPage = baseMapper.pageList(new Page<>(query.getPageNum(), query.getPageSize()), query, loginUserInfo);
- return complaintVOPage;
+ complaintVOPage = baseMapper.pageList(new Page<>(query.getPageNum(), query.getPageSize()), query, loginUserInfo);
}else {
- Page<ComplaintVO> complaintVOPage = baseMapper.pageList1(new Page<>(query.getPageNum(), query.getPageSize()), query, loginUserInfo);
- return complaintVOPage;
+ complaintVOPage = baseMapper.pageList1(new Page<>(query.getPageNum(), query.getPageSize()), query, loginUserInfo);
}
}
if (loginUserInfo.getAccountLevel() == 3) {
if(loginUserInfo.getSystemRoleId()==1 || loginUserInfo.getSystemRoleId()==2){
// 获取这个街道所管的社区id
List<Long> communityIds = comActService.list(new LambdaQueryWrapper<ComAct>().eq(ComAct::getStreetId, loginUserInfo.getStreetId())).stream().map(ComAct::getCommunityId).collect(Collectors.toList());
- Page<ComplaintVO> complaintVOPage = baseMapper.pageList2(new Page<>(query.getPageNum(), query.getPageSize()), query, loginUserInfo,communityIds);
- return complaintVOPage;
+ complaintVOPage = baseMapper.pageList2(new Page<>(query.getPageNum(), query.getPageSize()), query, loginUserInfo,communityIds);
}else {
- Page<ComplaintVO> complaintVOPage = baseMapper.pageList1(new Page<>(query.getPageNum(), query.getPageSize()), query, loginUserInfo);
- return complaintVOPage;
+ complaintVOPage = baseMapper.pageList1(new Page<>(query.getPageNum(), query.getPageSize()), query, loginUserInfo);
}
}
if (loginUserInfo.getAccountLevel() == 4) {
if(loginUserInfo.getSystemRoleId()==1 || loginUserInfo.getSystemRoleId()==2){
- Page<ComplaintVO> complaintVOPage = baseMapper.pageList3(new Page<>(query.getPageNum(), query.getPageSize()), query, loginUserInfo);
- return complaintVOPage;
+ complaintVOPage = baseMapper.pageList3(new Page<>(query.getPageNum(), query.getPageSize()), query, loginUserInfo);
}else {
- Page<ComplaintVO> complaintVOPage = baseMapper.pageList1(new Page<>(query.getPageNum(), query.getPageSize()), query, loginUserInfo);
- return complaintVOPage;
+ complaintVOPage = baseMapper.pageList1(new Page<>(query.getPageNum(), query.getPageSize()), query, loginUserInfo);
}
}
- return new Page<>();
+
+ for (ComplaintVO record : complaintVOPage.getRecords()) {
+ int count = complaintCommentService.count(new LambdaQueryWrapper<ComplaintComment>().eq(ComplaintComment::getComplaintId, record.getId()));
+ if (count > 0) {
+ record.setEvaluateButtonStatus(1);
+ } else {
+ if (record.getStatus() == 3 && loginUserInfo.getAccountLevel() == record.getNowLevel()) {
+ record.setEvaluateButtonStatus(0);
+ } else {
+ record.setEvaluateButtonStatus(1);
+ }
+ }
+ }
+ return complaintVOPage;
}
@Override
@@ -1630,7 +1642,32 @@
*/
@Override
public void export(MgtComplaintQuery query, SystemUserVo loginUserInfo) throws IOException {
- List<ComplaintVO> list = baseMapper.getList(query, loginUserInfo);
+ List<ComplaintVO> list =null;
+
+ if (loginUserInfo.getAccountLevel() == 2) {
+ if(loginUserInfo.getSystemRoleId()==1 || loginUserInfo.getSystemRoleId()==2){
+ list = baseMapper.pageListExport(query, loginUserInfo);
+ }else {
+ list = baseMapper.pageList1Export(query, loginUserInfo);
+ }
+ }
+ if (loginUserInfo.getAccountLevel() == 3) {
+ if(loginUserInfo.getSystemRoleId()==1 || loginUserInfo.getSystemRoleId()==2){
+ // 获取这个街道所管的社区id
+ List<Long> communityIds = comActService.list(new LambdaQueryWrapper<ComAct>().eq(ComAct::getStreetId, loginUserInfo.getStreetId())).stream().map(ComAct::getCommunityId).collect(Collectors.toList());
+ list = baseMapper.pageList2Export(query, loginUserInfo,communityIds);
+ }else {
+ list = baseMapper.pageList1Export( query, loginUserInfo);
+ }
+ }
+ if (loginUserInfo.getAccountLevel() == 4) {
+ if(loginUserInfo.getSystemRoleId()==1 || loginUserInfo.getSystemRoleId()==2){
+ list = baseMapper.pageList3Export(query, loginUserInfo);
+ }else {
+ list = baseMapper.pageList1Export( query, loginUserInfo);
+ }
+ }
+
List<ComplaintExcel> complaintExcels = BeanUtil.copyToList(list, ComplaintExcel.class);
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setCharacterEncoding("utf-8");
@@ -1641,7 +1678,10 @@
.registerWriteHandler(new AutoColumnWidthStrategy())
.doWrite(complaintExcels);
}
-
+// ComplaintVO(reporter=何健豪, reporterId=1676144498628919300, superiorId2=510403, auditCreateBy=1892421828085837826, reporterLevel=2, reporterPhone=null, departmentName=西区-金江镇, reportTime=Tue Jun 03 15:06:01 CST 2025, comment=1111, nickname=null, phone=null, auditorName=null, auditorPhone=null, rejectReason=null, auditTime=null, complaintFlows=null, complaintProgresses=null, auditButtonStatus=null, withdrawButtonStatus=null, rate=null, complaintComment=null, listControlsButtonStatus=null, evaluateButtonStatus=0, voiceFileList=null, progressCount=null, assignmentCount=null, reportCount=null, remindStatus=0, remindTime=null, reportStr=自办, deptName=aa)
+// ComplaintVO(reporter=null, reporterId=null, superiorId2=null, auditCreateBy=null, reporterLevel=null, reporterPhone=null, departmentName=null, reportTime=null, comment=null, nickname=null, phone=null, auditorName=null, auditorPhone=null, rejectReason=null, auditTime=null, complaintFlows=null, complaintProgresses=null, auditButtonStatus=null, withdrawButtonStatus=null, rate=null, complaintComment=null, listControlsButtonStatus=null, evaluateButtonStatus=0, voiceFileList=null, progressCount=null, assignmentCount=null, reportCount=null, remindStatus=0, remindTime=null, reportStr=自办, deptName=aa)
+// ComplaintVO(reporter=刘, reporterId=1552661132500668416, superiorId2=510403, auditCreateBy=1892403820151992322, reporterLevel=2, reporterPhone=null, departmentName=西区-格里坪镇, reportTime=Fri Jun 27 10:04:18 CST 2025, comment=null, nickname=null, phone=null, auditorName=null, auditorPhone=null, rejectReason=null, auditTime=null, complaintFlows=null, complaintProgresses=null, auditButtonStatus=null, withdrawButtonStatus=null, rate=null, complaintComment=null, listControlsButtonStatus=null, evaluateButtonStatus=0, voiceFileList=null, progressCount=null, assignmentCount=null, reportCount=null, remindStatus=0, remindTime=null, reportStr=自办, deptName=null)
+// ComplaintVO(reporter=null, reporterId=null, superiorId2=null, auditCreateBy=null, reporterLevel=null, reporterPhone=null, departmentName=null, reportTime=null, comment=null, nickname=null, phone=null, auditorName=null, auditorPhone=null, rejectReason=null, auditTime=null, complaintFlows=null, complaintProgresses=null, auditButtonStatus=null, withdrawButtonStatus=null, rate=null, complaintComment=null, listControlsButtonStatus=null, evaluateButtonStatus=0, voiceFileList=null, progressCount=null, assignmentCount=null, reportCount=null, remindStatus=0, remindTime=null, reportStr=自办, deptName=aa)
@Override
public String downloadFile(Long id, Integer type, SystemUserVo loginUserInfo) throws IOException {
Complaint complaint = baseMapper.getDetailBg(id);
@@ -1813,7 +1853,7 @@
}
@Override
- public AnalyticStatisticsOneVo analyticStatisticsOne(AnalyticStatisticsQuery query, List<Complaint> complaints, SimpleDateFormat simpleDateFormat) {
+ public AnalyticStatisticsOneVo analyticStatisticsOne(AnalyticStatisticsQuery query, List<Complaint> complaints, SimpleDateFormat simpleDateFormat,Integer level) {
String nowYearMonth;
String lastYearMonth;
int value = LocalDate.now().getMonth().getValue();
@@ -1835,7 +1875,7 @@
if (CollUtil.isEmpty(ids)) {
ids.add(0, -1L);
}
- complaints = this.baseMapper.getStatusForList(ids);
+ complaints = this.baseMapper.getStatusForList(ids,level);
AnalyticStatisticsOneVo vo = new AnalyticStatisticsOneVo();
@@ -2050,42 +2090,11 @@
@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();
- }
+ SystemUser systemUserLevel = identityInformation.getSystemUser();
+ if(systemUserLevel.getSystemRoleId()==1 || systemUserLevel.getSystemRoleId()==2){
+ return baseMapper.queryCompliantList(systemUserLevel.getAccountLevel(),systemUserLevel.getSystemRoleId(),query);
}
- return baseMapper.queryCompliantList(targetId, accountLevel, loginUserInfo, query);
+ return null;
}
@@ -2118,11 +2127,14 @@
@Override
- public void assignComplain(LoginUserInfoVO loginUserInfo, Long complainId, Integer userId, String remark) {
+ public void assignComplain(LoginUserInfoVO loginUserInfo, Long complainId, Integer userId, String remark, String problemType) {
IdentityInformation currentIdentityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfo);
if (currentIdentityInformation.getIdentity().equals(2)) {
SystemUser systemUser = currentIdentityInformation.getSystemUser();
Complaint complaint = baseMapper.selectById(complainId);
+ if(StringUtils.isEmpty(complaint.getProblemType())){
+ complaint.setProblemType(problemType);
+ }
if (systemUser.getSystemRoleId() != 1 || !complaint.getNowLevel().equals(systemUser.getAccountLevel())) {
throw new ServiceException("你没有分配权限");
}
@@ -2270,5 +2282,16 @@
save(complaint);
}
+ @Override
+ public void setProblemType(LoginUserInfoVO loginUserInfo, SetProblemTypeDto dto) {
+ IdentityInformation currentIdentityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfo);
+ if (currentIdentityInformation.getSystemUser().getSystemRoleId() != 1) {
+ throw new ServiceException("无权限");
+ }
+ Complaint complaint = getById(dto.getComplaintId());
+ complaint.setProblemType(dto.getProblemType());
+ updateById(complaint);
+ }
+
}
--
Gitblit v1.7.1