From 3cfc28b2da1d11653654dff577e7477a807150bd Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 00:57:30 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 153 +++++++++++++++++++++++++++++---------------------
1 files changed, 89 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 cb99004..e897645 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
@@ -12,8 +12,10 @@
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.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;
@@ -33,11 +35,14 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.data.redis.connection.RedisServer;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.io.InputStream;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -69,6 +74,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) {
@@ -230,7 +236,8 @@
vo.setListControlsButtonStatus(1);
vo.setEvaluateButtonStatus(1);
vo.setAuditButtonStatus(1);
-
+ // 获取身份
+ Integer identity = (Integer) redisUtils.get("identity:" + loginUserInfo.getPhone());
ComplaintAuditRecord one = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>()
.eq(ComplaintAuditRecord::getComplaintId, vo.getId())
// .ne(ComplaintAuditRecord::getAuditType, 1)
@@ -242,8 +249,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 {
@@ -254,8 +265,6 @@
}
//有审核数据，且正在办理
if (null != one && (vo.getStatus() == 0 || vo.getStatus() == 1 || vo.getStatus() == 2 || vo.getStatus() == 6)) {
-
-
//区分是上报数据还是下派数据
if (one.getAuditType() == 2 || one.getAuditType() == 1) {
//判断当前审核状态
@@ -294,8 +303,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 {
@@ -317,46 +330,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);
- }
}
}
}
@@ -410,12 +385,17 @@
//状态为已办结，判断评价按钮
int count = complaintCommentService.count(new LambdaQueryWrapper<ComplaintComment>().eq(ComplaintComment::getComplaintId, vo.getId()).eq(ComplaintComment::getDelFlag, 0));
- if (vo.getStatus() == 3 && 0 == count) {
+ if ((vo.getStatus() == 3 || vo.getStatus() == 8) && 0 == count) {
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)) {
+ //当前不是党员身份，需要是管理员才有权限
+ 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 {
@@ -475,7 +455,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);
}
//查询办理进度
@@ -523,10 +503,27 @@
*/
@Override
public void saveProcess(ComplaintProcessDTO dto, LoginUserInfoVO loginUserInfoVO) {
+ //获取当前身份
+ IdentityInformation identityInformationVO = identityInformationService.getIdentityInformation(loginUserInfoVO);
+
+ List<PermissionsVO> permissions = identityInformationVO.getPermissions();
+ if (permissions.isEmpty()) {
+ throw new ServiceException("请先完善个人信息");
+ }
+ //上级
+ String name = "";
+ if (identityInformationVO.getIdentity() == 2) {
+ //1=党员，2=管理员
+ SystemUser systemUser = identityInformationVO.getSystemUser();
+ name = systemUser.getName();
+ }else if (identityInformationVO.getIdentity() == 1){
+ PartyMember partyMember = identityInformationVO.getPartyMember();
+ name = partyMember.getName();
+ }
ComplaintProgress complaintProgress = BeanUtil.copyProperties(dto, ComplaintProgress.class);
complaintProgress.setCreateTime(new Date());
complaintProgress.setCreateBy(loginUserInfoVO.getUserId());
- complaintProgress.setCreateByName(loginUserInfoVO.getNickName());
+ complaintProgress.setCreateByName(name);
complaintProgressService.save(complaintProgress);
}
@@ -546,18 +543,22 @@
throw new ServiceException("请先完善个人信息");
}
Integer accountLevel = null;
+ String name = "";
//上级
if (identityInformationVO.getIdentity() == 2) {
//1=党员，2=管理员
SystemUser systemUser = identityInformationVO.getSystemUser();
accountLevel = systemUser.getAccountLevel();
+ name = systemUser.getName();
}else if (identityInformationVO.getIdentity() == 1){
accountLevel = 5;
+ PartyMember partyMember = identityInformationVO.getPartyMember();
+ name = partyMember.getName();
}
Complaint complaint = BeanUtil.copyProperties(dto, Complaint.class);
complaint.setUpdateTime(new Date());
complaint.setCompletionUserId(loginUserInfoVO.getUserId());
- complaint.setCompletionUsername(loginUserInfoVO.getNickName());
+ complaint.setCompletionUsername(name);
complaint.setCompletionUserPhone(loginUserInfoVO.getPhone());
complaint.setCompletionTime(new Date());
complaint.setCompletionUserLevel(accountLevel);
@@ -586,26 +587,37 @@
Long superiorId;
int reportType;
+ int reporterLevel;
+ Long reporterId = null;
String departmentName = "";
+ String reporter = "";
if (identityInformationVO.getIdentity() == 1) {
PartyMember partyMember = partyMemberService.getPartyMemberByPhone(phone);
superiorId = partyMember.getCommunityId();
+ reporterId = partyMember.getId();
reportType = 4;
+ reporterLevel = 5;
departmentName = partyMember.getDistricts() + "-" + partyMember.getStreet() + "-" + partyMember.getCommunity();
+ reporter = partyMember.getName();
} else if (identityInformationVO.getIdentity() == 2) {
int accountLevel = adminUser.getAccountLevel(); // 改为基本类型
if (accountLevel == 1) {
throw new ServiceException("市级账号,无法上报！");
}
reportType = accountLevel - 1;
+ reporterLevel = accountLevel;
+ reporter = adminUser.getName();
// 使用基本类型比较并补充默认分支
if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
superiorId = Long.parseLong(adminUser.getStreetId());
+ reporterId = adminUser.getCommunityId();
} else if (accountLevel == ReportTypeEnum.STREET.getCode()) {
superiorId = Long.parseLong(adminUser.getDistrictsCode());
+ reporterId = Long.parseLong(adminUser.getStreetId());
} else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
superiorId = 510400L; // 攀枝花市
+ reporterId = Long.parseLong(adminUser.getDistrictsCode());
} else if (accountLevel == ReportTypeEnum.PARTY.getCode()) {
superiorId = adminUser.getCommunityId();
} else {
@@ -662,12 +674,14 @@
complaintAuditRecord.setCreateTime(new Date());
complaintAuditRecord.setUpdateBy(loginUserInfoVO.getUserId());
complaintAuditRecord.setUpdateTime(new Date());
- complaintAuditRecord.setReporter(loginUserInfoVO.getNickName());
+ complaintAuditRecord.setReporter(reporter);
complaintAuditRecord.setReportType(reportType);
complaintAuditRecord.setSuperiorId(superiorId);
complaintAuditRecord.setComment(dto.getComment());
complaintAuditRecord.setSort(count + 1);
complaintAuditRecord.setDepartmentName(departmentName);
+ complaintAuditRecord.setReporterLevel(reporterLevel);
+ complaintAuditRecord.setReporterId(reporterId);
complaintAuditRecordService.save(complaintAuditRecord);
}
@@ -776,12 +790,18 @@
if (Objects.isNull(complaintAuditRecord)) {
throw new ServiceException("上报申请记录不存在");
}
+ complaintAuditRecord.setAuditorName(systemUser.getName());
+ complaintAuditRecord.setAuditorPhone(systemUser.getPhone());
if (complaintReporAuditDTO.getAuditResult().equals(1)) {
complaintAuditRecord.setAuditStatus(1);
complaintAuditRecord.setAuditorId(loginUserInfoVO.getUserId());
complaintAuditRecordService.updateById(complaintAuditRecord);
//创建流程
- complaintFlowService.createFlow(complaintAuditRecord, 0, loginUserInfoVO.getUserId());
+ ComplaintAuditRecord complaintAuditRecord2 = new ComplaintAuditRecord();
+ complaintAuditRecord2.setComplaintId(complaintReporAuditDTO.getId());
+ complaintAuditRecord2.setSuperiorId(complaintAuditRecord.getReporterId());
+ complaintAuditRecord2.setReportType(complaintAuditRecord.getReporterLevel());
+ complaintFlowService.createFlow(complaintAuditRecord2, 0, loginUserInfoVO.getUserId());
} else {
complaintAuditRecord.setRejectReason(complaintReporAuditDTO.getRejectReason());
complaintAuditRecord.setAuditStatus(2);
@@ -800,6 +820,7 @@
Long superiorId;
int reportType;
String departmentName = "";
+ String reporter = "";
if (identityInformation.getIdentity() == 1) {
PartyMember partyMember = partyMemberService.getPartyMemberByPhone(loginUserInfoVO.getPhone());
superiorId = partyMember.getCommunityId();
@@ -808,12 +829,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()) {
@@ -870,7 +893,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);
@@ -918,6 +941,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());
@@ -1067,7 +1092,7 @@
//查询诉求流转记录
List<ComplaintFlow> complaintFlows = complaintFlowService.lambdaQuery()
.eq(ComplaintFlow::getComplaintId, id)
- .orderByAsc(ComplaintFlow::getCreateTime)
+ .orderByAsc(ComplaintFlow::getSort)
.list();
complaintVO.setComplaintFlows(complaintFlows);
//查询评价
@@ -1146,10 +1171,10 @@
String fileName = "";
switch (type) {
case 1:
- fileName = "社区问题单";
+ fileName = "community_question.docx";
break;
case 2:
- fileName = "问题处理单";
+ fileName = "question_handle.docx";
if (Objects.nonNull(partyMember)) {
community = community + "-" + partyMember.getServiceTarget();
}
@@ -1165,14 +1190,14 @@
if (Objects.nonNull(record)) {
reportType = record.getReportType();
}
- fileName = "协调通知单";
+ fileName = "notice.docx";
break;
}
Map<String, Object> map = new HashMap<>();
map.put("community", community);
map.put("problemType", complaint.getProblemType());
map.put("descriptionContent", complaint.getDescriptionContent());
- map.put("reportType", ReportTypeEnum.getDescriptionByCode(reportType));
+ map.put("reportType", reportType == null ? "" : ReportTypeEnum.getDescriptionByCode(reportType));
map.put("partyOrganization", Objects.nonNull(partyMember) ? partyMember.getPartyOrganization() : "");
map.put("name", complaint.getName());
map.put("contactNumber", complaint.getContactNumber());
@@ -1189,19 +1214,19 @@
}
// 在文本中直接使用换行符
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());
}
}
response.setContentType("application/octet-stream");
String fileNameEncode = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20");
response.setHeader("Content-disposition", "attachment;filename=\"" + fileNameEncode + ".docx" + "\"");
- String fileTemplateName = FileUtil.getPath() + "template/" + fileName + ".docx";
- XWPFTemplate.compile(fileTemplateName).render(map).writeAndClose(response.getOutputStream());
+ InputStream resourceAsStream = this.getClass().getResourceAsStream("/template/" + fileName);
+ XWPFTemplate.compile(resourceAsStream).render(map).writeAndClose(response.getOutputStream());
}
@@ -1222,7 +1247,7 @@
String content = "第一行内容\n第二行内容\n第三行内容";
map.put("complaintProgress", content);
map.put("status", "处理中");
- XWPFTemplate.compile("F:\\DeskTop\\zhihuishequ\\springcloud_k8s_panzhihuazhihuishequ\\service_sangeshenbian\\src\\main\\resources\\template\\社区问题单.docx").render(map).writeToFile("F:\\DeskTop\\社区.docx");
+ XWPFTemplate.compile("F:\\DeskTop\\zhihuishequ\\springcloud_k8s_panzhihuazhihuishequ\\service_sangeshenbian\\src\\main\\resources\\template\\community_question.docx").render(map).writeToFile("F:\\DeskTop\\社区.docx");
} catch (IOException e) {
e.printStackTrace();
}
--
Gitblit v1.7.1