From 40bfb646d1b962d33841c1ebbceb0dd7cb668bfb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 29 四月 2025 14:54:04 +0800
Subject: [PATCH] 后台日志管理
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 65 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 27 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 f118a4c..3fd561c 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,6 +12,7 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
import com.panzhihua.common.redis.RedisUtils;
+import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.sangeshenbian.config.AutoColumnWidthStrategy;
import com.panzhihua.sangeshenbian.dao.ComplaintMapper;
import com.panzhihua.sangeshenbian.enums.AuditStatusEnum;
@@ -252,13 +253,16 @@
//page = baseMapper.selectComplaintPage(page, query, targetId, isSuperior);
page = baseMapper.selectComplaintPage1(page, query, accountLevel, targetId);
- page.getRecords().forEach(s -> {
+ for (ComplaintVO s : page.getRecords()) {
buttonPermission(s, systemUserByPhone, loginUserInfoVO);
Integer auditButtonStatus = s.getAuditButtonStatus();
- if (auditButtonStatus == 1 && s.getStatus() == 5 && !Objects.equals(s.getAuditCreateBy(), loginUserInfoVO.getUserId())){
+
+ Long reporterId = s.getReporterId();
+ Long superiorId = s.getSuperiorId2();
+ if (!targetId.equals(reporterId) && !targetId.equals(superiorId) && (s.getStatus() == 5)) {
s.setStatus(0);
}
- });
+ }
return page;
}
@@ -285,11 +289,11 @@
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 && 1 == isAdmin)) {
vo.setListControlsButtonStatus(0);
}
//如果当前身份是党员
- if(1 == identity && 5 == vo.getReportType()){
+ if (1 == identity && 5 == vo.getReportType()) {
vo.setListControlsButtonStatus(0);
}
} else {
@@ -338,11 +342,11 @@
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 && 1 == isAdmin)) {
vo.setListControlsButtonStatus(0);
}
//如果当前身份是党员
- if(1 == identity && 5 == vo.getReportType()){
+ if (1 == identity && 5 == vo.getReportType()) {
vo.setListControlsButtonStatus(0);
}
} else {
@@ -428,7 +432,7 @@
vo.setEvaluateButtonStatus(0);
}
//当前是党员身份，只有是以党员身份提交的数据才有权限
- if(1 == identity && vo.getReportType() == 5){
+ if (1 == identity && vo.getReportType() == 5) {
vo.setEvaluateButtonStatus(0);
}
} else {
@@ -442,7 +446,7 @@
Long userId = loginUserInfo.getUserId();
if (null != auditCreateBy && auditCreateBy.compareTo(userId) == 0 && vo.getStatus() == 5) {
vo.setWithdrawButtonStatus(0);
- }else {
+ } else {
vo.setWithdrawButtonStatus(1);
}
@@ -505,23 +509,21 @@
List<ComplaintProgress> list = complaintProgressService.lambdaQuery().eq(ComplaintProgress::getComplaintId, id)
.orderByAsc(ComplaintProgress::getCreateTime).list();
detail.setComplaintProgresses(list);
-// detail.setAuditButtonStatus(1);
-// detail.setEvaluateButtonStatus(1);
-// if((detail.getStatus() == 5 || detail.getStatus() == 7) && systemUserByPhone.isPresent()){
-// ComplaintAuditRecord one = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>().eq(ComplaintAuditRecord::getComplaintId, detail.getId())
-// .eq(ComplaintAuditRecord::getLatestFlag, 1));
-// Integer isAdmin = systemUserByPhone.get().getIsAdmin();
-// if(one.getReportType().equals(accountLevel) && one.getSuperiorId().toString().equals(targetId) && 1 == isAdmin){
-// detail.setAuditButtonStatus(0);
-// }
-// }
buttonPermission(detail, systemUserByPhone, loginUserInfoVO);
- Integer auditButtonStatus = detail.getAuditButtonStatus();
- if (auditButtonStatus == 1 && detail.getStatus() == 5 && !Objects.equals(detail.getAuditCreateBy(), loginUserInfoVO.getUserId())){
+ Long reporterId = detail.getReporterId();
+ Long superiorId = detail.getSuperiorId2();
+ if (!String.valueOf(reporterId).equals(targetId) && !String.valueOf(superiorId).equals(targetId) && detail.getStatus() == 5) {
detail.setStatus(0);
}
+
+
+// if (auditButtonStatus == 1 && detail.getStatus() == 5 && !Objects.equals(detail.getAuditCreateBy(), loginUserInfoVO.getUserId())){
+// detail.setStatus(0);
+// }
+
+
// //已办结，显示评价按钮
@@ -562,8 +564,8 @@
if (identityInformationVO.getIdentity() == 2) {
//1=党员，2=管理员
SystemUser systemUser = identityInformationVO.getSystemUser();
- name = systemUser.getName();
- }else if (identityInformationVO.getIdentity() == 1){
+ name = systemUser.getName();
+ } else if (identityInformationVO.getIdentity() == 1) {
PartyMember partyMember = identityInformationVO.getPartyMember();
name = partyMember.getName();
}
@@ -596,8 +598,8 @@
//1=党员，2=管理员
SystemUser systemUser = identityInformationVO.getSystemUser();
accountLevel = systemUser.getAccountLevel();
- name = systemUser.getName();
- }else if (identityInformationVO.getIdentity() == 1){
+ name = systemUser.getName();
+ } else if (identityInformationVO.getIdentity() == 1) {
accountLevel = 5;
PartyMember partyMember = identityInformationVO.getPartyMember();
name = partyMember.getName();
@@ -624,7 +626,6 @@
return complaintProgressService.lambdaQuery().eq(ComplaintProgress::getComplaintId, complaintId)
.orderByAsc(ComplaintProgress::getCreateTime).list();
}
-
@Override
@@ -1182,6 +1183,15 @@
//查询评价
ComplaintComment comment = complaintCommentService.lambdaQuery().eq(ComplaintComment::getComplaintId, id).last("LIMIT 1").one();
complaintVO.setComplaintComment(comment);
+ ArrayList<String> voiceFileList = new ArrayList<>();
+ String voiceFile = complaint.getVoiceFile();
+ if(StringUtils.isNotEmpty(voiceFile)){
+ for (String file :voiceFile.split(",")) {
+ voiceFileList.add(file);
+ }
+ }
+
+ complaintVO.setVoiceFileList(voiceFileList);
return complaintVO;
}
@@ -1206,7 +1216,7 @@
}
@Override
- public void downloadFile(Long id, Integer type, SystemUserVo loginUserInfo) throws IOException {
+ public String downloadFile(Long id, Integer type, SystemUserVo loginUserInfo) throws IOException {
Complaint complaint = baseMapper.getDetailBg(id);
if (Objects.isNull(complaint)) {
throw new ServiceException("该诉求不存在");
@@ -1317,6 +1327,7 @@
response.setHeader("Content-disposition", "attachment;filename=\"" + fileNameEncode + ".docx" + "\"");
InputStream resourceAsStream = this.getClass().getResourceAsStream("/template/" + fileName);
XWPFTemplate.compile(resourceAsStream).render(map).writeAndClose(response.getOutputStream());
+ return complaint.getName();
}
--
Gitblit v1.7.1