From 657698d582e3a8125f4c25233ad5fc6daa2448d8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 03 四月 2025 14:45:47 +0800
Subject: [PATCH] 管理后台诉求列表增加评价字段展示
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 114 +++++++++++++++++++++++++--------------------------------
1 files changed, 50 insertions(+), 64 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 2e4d59c..fbaa87c 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
@@ -2,7 +2,6 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
import cn.idev.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -12,8 +11,11 @@
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
+import com.panzhihua.common.redis.RedisUtils;
+import com.panzhihua.sangeshenbian.config.AutoColumnWidthStrategy;
import com.panzhihua.sangeshenbian.dao.ComplaintMapper;
import com.panzhihua.sangeshenbian.enums.AuditStatusEnum;
+import com.panzhihua.sangeshenbian.enums.ComplaintExportEnum;
import com.panzhihua.sangeshenbian.enums.ProcessStatusEnum;
import com.panzhihua.sangeshenbian.enums.RateEnum;
import com.panzhihua.sangeshenbian.enums.ReportTypeEnum;
@@ -26,14 +28,13 @@
import com.panzhihua.sangeshenbian.model.vo.ComplaintVO;
import com.panzhihua.sangeshenbian.model.vo.DispatchVO;
import com.panzhihua.sangeshenbian.service.*;
-import com.panzhihua.sangeshenbian.utils.FileUtil;
import com.panzhihua.sangeshenbian.warpper.IdentityInformation;
import com.panzhihua.sangeshenbian.warpper.MgtComplaintQuery;
import com.panzhihua.sangeshenbian.warpper.PermissionsVO;
+import jodd.util.StringUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
-import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -71,6 +72,7 @@
private final HttpServletResponse response;
private final IPartyMemberService partyMemberService;
private final IdentityInformationService identityInformationService;
+ private final RedisUtils redisUtils;
@Override
public void saveComplaint(Complaint complaint, LoginUserInfoVO loginUserInfoVO) {
@@ -232,7 +234,9 @@
vo.setListControlsButtonStatus(1);
vo.setEvaluateButtonStatus(1);
vo.setAuditButtonStatus(1);
-
+ // 获取身份
+ IdentityInformation currentIdentityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfo);
+ Integer identity = currentIdentityInformation.getIdentity();
ComplaintAuditRecord one = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>()
.eq(ComplaintAuditRecord::getComplaintId, vo.getId())
// .ne(ComplaintAuditRecord::getAuditType, 1)
@@ -244,8 +248,12 @@
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
Integer isAdmin = systemUser.getIsAdmin();
- //非党员用户，必须是管理员有权限
- if (accountLevel.compareTo(vo.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)) {
+ //当前身份是管理员
+ if(2 == identity && accountLevel.compareTo(vo.getReportType()) == 0 && (accountLevel != 5 && 1 == isAdmin)){
+ vo.setListControlsButtonStatus(0);
+ }
+ //如果当前身份是党员
+ if(1 == identity && 5 == vo.getReportType()){
vo.setListControlsButtonStatus(0);
}
} else {
@@ -256,19 +264,16 @@
}
//有审核数据，且正在办理
if (null != one && (vo.getStatus() == 0 || vo.getStatus() == 1 || vo.getStatus() == 2 || vo.getStatus() == 6)) {
-
-
//区分是上报数据还是下派数据
if (one.getAuditType() == 2 || one.getAuditType() == 1) {
//判断当前审核状态
if (one.getAuditStatus() == 1) {
//审核状态为通过，则权限给到上报审核的这一层
- if (systemUserByPhone.isPresent()) {
+ if (systemUserByPhone.isPresent() && identity == 2) {
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
- Integer isAdmin = systemUser.getIsAdmin();
//非党员用户，必须是管理员有权限
- if (accountLevel.compareTo(one.getReportType()) == 0 && accountLevel != 5 && 1 == isAdmin) {
+ if (accountLevel.compareTo(one.getReportType()) == 0) {
vo.setListControlsButtonStatus(0);
}
}
@@ -296,8 +301,12 @@
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
Integer isAdmin = systemUser.getIsAdmin();
- //非党员用户，必须是管理员有权限
- if (accountLevel.compareTo(vo.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)) {
+ //当前身份是管理员
+ if(2 == identity && accountLevel.compareTo(vo.getReportType()) == 0 && (accountLevel != 5 && 1 == isAdmin)){
+ vo.setListControlsButtonStatus(0);
+ }
+ //如果当前身份是党员
+ if(1 == identity && 5 == vo.getReportType()){
vo.setListControlsButtonStatus(0);
}
} else {
@@ -319,46 +328,8 @@
Integer accountLevel = systemUser.getAccountLevel();
Integer isAdmin = systemUser.getIsAdmin();
//非党员用户，必须是管理员有权限
- if (accountLevel.compareTo(one.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)) {
+ if (accountLevel.compareTo(one.getReportType()) == 0 && 1 == isAdmin && 2 == identity) {
vo.setListControlsButtonStatus(0);
- }
- } else {
- if (vo.getReportType() == 5 && one.getReportType() == 5) {
- vo.setListControlsButtonStatus(0);
- }
- }
- } else {
- //没有审核通过，则需要查询上一条审核通过的数据，如果没有则给到添加诉求的人
- ComplaintAuditRecord one1 = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, vo.getId())
- .eq(ComplaintAuditRecord::getAuditType, 3).eq(ComplaintAuditRecord::getAuditStatus, 1).orderByDesc(ComplaintAuditRecord::getSort).last(" limit 0, 1"));
- if (null != one1) {
- if (systemUserByPhone.isPresent()) {
- SystemUser systemUser = systemUserByPhone.get();
- Integer accountLevel = systemUser.getAccountLevel();
- Integer isAdmin = systemUser.getIsAdmin();
- //非党员用户，必须是管理员有权限
- if (accountLevel.compareTo(one1.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)) {
- vo.setListControlsButtonStatus(0);
- }
- } else {
- if (vo.getReportType() == 5 && one1.getReportType() == 5) {
- vo.setListControlsButtonStatus(0);
- }
- }
- } else {
- //没有上一层审核通过的数据，则权限给到添加人
- if (systemUserByPhone.isPresent()) {
- SystemUser systemUser = systemUserByPhone.get();
- Integer accountLevel = systemUser.getAccountLevel();
- Integer isAdmin = systemUser.getIsAdmin();
- //非党员用户，必须是管理员有权限
- if (accountLevel.compareTo(vo.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)) {
- vo.setListControlsButtonStatus(0);
- }
- } else {
- if (vo.getReportType() == 5) {
- vo.setListControlsButtonStatus(0);
- }
}
}
}
@@ -372,8 +343,7 @@
String targetId = "";
Integer accountLevel = 5;
//获取当前身份，1=党员，2=管理员
- IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfo);
- if (2 == identityInformation.getIdentity()) {
+ if (2 == currentIdentityInformation.getIdentity()) {
accountLevel = systemUser.getAccountLevel();
switch (accountLevel) {
case 1:
@@ -417,7 +387,12 @@
SystemUser systemUser = systemUserByPhone.get();
Integer accountLevel = systemUser.getAccountLevel();
Integer isAdmin = systemUser.getIsAdmin();
- if (accountLevel.compareTo(vo.getReportType()) == 0 && ((accountLevel != 5 && 1 == isAdmin) || accountLevel == 5)) {
+ //当前不是党员身份，需要是管理员才有权限
+ if (2 == identity && accountLevel.compareTo(vo.getReportType()) == 0 && accountLevel != 5 && 1 == isAdmin) {
+ vo.setEvaluateButtonStatus(0);
+ }
+ //当前是党员身份，只有是以党员身份提交的数据才有权限
+ if(1 == identity && vo.getReportType() == 5){
vo.setEvaluateButtonStatus(0);
}
} else {
@@ -477,7 +452,7 @@
}
ComplaintVO detail = baseMapper.getDetail(id);
if (detail.getStatus().equals(0)) {
- List<ComplaintFlow> list = complaintFlowService.lambdaQuery().eq(ComplaintFlow::getComplaintId, id).orderByAsc(ComplaintFlow::getCreateTime).list();
+ List<ComplaintFlow> list = complaintFlowService.lambdaQuery().eq(ComplaintFlow::getComplaintId, id).orderByAsc(ComplaintFlow::getSort).list();
detail.setComplaintFlows(list);
}
//查询办理进度
@@ -842,6 +817,7 @@
Long superiorId;
int reportType;
String departmentName = "";
+ String reporter = "";
if (identityInformation.getIdentity() == 1) {
PartyMember partyMember = partyMemberService.getPartyMemberByPhone(loginUserInfoVO.getPhone());
superiorId = partyMember.getCommunityId();
@@ -850,12 +826,14 @@
}
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(); // 改为基本类型
if (accountLevel == 1) {
throw new ServiceException("市级账号,无法延期申请！");
}
reportType = accountLevel - 1;
+ reporter = systemUser.getName();
// 使用基本类型比较并补充默认分支
if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
@@ -912,7 +890,7 @@
record1.setCreateTime(new Date(System.currentTimeMillis()));
record1.setUpdateBy(loginUserInfoVO.getUserId());
record1.setUpdateTime(new Date(System.currentTimeMillis()));
- record1.setReporter(loginUserInfoVO.getNickName());
+ record1.setReporter(reporter);
record1.setReportType(reportType);
record1.setSuperiorId(superiorId);
record1.setSort(count + 1);
@@ -960,6 +938,8 @@
if (Objects.isNull(complaintAuditRecord)) {
throw new ServiceException("诉求延期申请不存在");
}
+ complaintAuditRecord.setAuditorName(systemUser.getName());
+ complaintAuditRecord.setAuditorPhone(systemUser.getPhone());
//审核通过后，设置诉求延期
if (complaintAuditRecord.getAuditType().equals(1) && complaintAuditRecord.getAuditStatus().equals(0) && dto.getAuditResult().equals(1)) {
Complaint complaint = getById(complaintAuditRecord.getComplaintId());
@@ -998,7 +978,7 @@
List<DispatchVO> dispatchVOList = new ArrayList<>();
if (accountLevel == ReportTypeEnum.STREET.getCode()) {
String streetId = adminUser.getStreetId();
- List<ComAct> list = comActService.list(new LambdaQueryWrapper<ComAct>().eq(ComAct::getStreetId, streetId).eq(ComAct::getState, 0));
+ List<ComAct> list = comActService.list(new LambdaQueryWrapper<ComAct>().eq(ComAct::getStreetId, streetId));
for (ComAct comAct : list) {
DispatchVO dispatchVO = new DispatchVO();
dispatchVO.setId(comAct.getCommunityId().toString());
@@ -1109,7 +1089,7 @@
//查询诉求流转记录
List<ComplaintFlow> complaintFlows = complaintFlowService.lambdaQuery()
.eq(ComplaintFlow::getComplaintId, id)
- .orderByAsc(ComplaintFlow::getCreateTime)
+ .orderByAsc(ComplaintFlow::getSort)
.list();
complaintVO.setComplaintFlows(complaintFlows);
//查询评价
@@ -1134,11 +1114,12 @@
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
EasyExcel.write(response.getOutputStream(), ComplaintExcel.class)
.sheet("诉求数据")
+ .registerWriteHandler(new AutoColumnWidthStrategy())
.doWrite(complaintExcels);
}
@Override
- public void downloadFile(Long id, Integer type) throws IOException {
+ public void downloadFile(Long id, Integer type, SystemUserVo loginUserInfo) throws IOException {
Complaint complaint = baseMapper.getDetailBg(id);
if (Objects.isNull(complaint)) {
throw new ServiceException("该诉求不存在");
@@ -1193,7 +1174,9 @@
case 2:
fileName = "question_handle.docx";
if (Objects.nonNull(partyMember)) {
- community = community + "-" + partyMember.getServiceTarget();
+ if (StringUtil.isNotBlank(partyMember.getServiceTarget())) {
+ community = community + "-" + partyMember.getServiceTarget();
+ }
}
reportType = complaint.getCompletionUserLevel();
break;
@@ -1215,7 +1198,9 @@
map.put("problemType", complaint.getProblemType());
map.put("descriptionContent", complaint.getDescriptionContent());
map.put("reportType", reportType == null ? "" : ReportTypeEnum.getDescriptionByCode(reportType));
- map.put("partyOrganization", Objects.nonNull(partyMember) ? partyMember.getPartyOrganization() : "");
+ if (Objects.nonNull(partyMember)) {
+ map.put("partyOrganization", StringUtil.isNotBlank(partyMember.getPartyOrganization()) ? partyMember.getPartyOrganization() : "");
+ }
map.put("name", complaint.getName());
map.put("contactNumber", complaint.getContactNumber());
map.put("nickname", complaint.getReportUserName());
@@ -1231,13 +1216,14 @@
}
// 在文本中直接使用换行符
map.put("complaintProgress", sb.toString());
- map.put("status", ProcessStatusEnum.getDescriptionByCode(complaint.getStatus()));
+ map.put("status", ComplaintExportEnum.getEnumByCode(complaint.getStatus()).getDesc());
if (2 == type) {
//查询诉求评价
ComplaintComment complaintComment = complaintCommentService.lambdaQuery().eq(ComplaintComment::getComplaintId, id).last("LIMIT 1").one();
if (Objects.nonNull(complaintComment)) {
- map.put("rateStr", RateEnum.getEnumByCode(complaintComment.getRate()));
+ map.put("rateStr", RateEnum.getEnumByCode(complaintComment.getRate()).getDesc());
}
+ map.put("departmentLevel", ReportTypeEnum.getDescriptionByCode(loginUserInfo.getAccountLevel()) + "级");
}
response.setContentType("application/octet-stream");
String fileNameEncode = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20");
--
Gitblit v1.7.1