From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 121 +++++++++++++++++++++++++++++++++-------
1 files changed, 99 insertions(+), 22 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 338ba4d..d406f46 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
@@ -34,6 +34,7 @@
import jodd.util.StringUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -178,6 +179,31 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
+ public void saveAndReport(ComplaintVO complaintVO, LoginUserInfoVO loginUserInfo) {
+ Complaint complaint = new Complaint();
+ BeanUtil.copyProperties(complaintVO, complaint);
+ saveComplaint(complaint, loginUserInfo);
+ ComplaintReportDTO dto = new ComplaintReportDTO();
+ dto.setComplaintId(complaint.getId());
+ dto.setComment(complaintVO.getComment());
+ saveReport(dto, loginUserInfo);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void saveAndComplete(ComplaintSaveAndCompleteDTO complaintVO, LoginUserInfoVO loginUserInfo) {
+ Complaint complaint = new Complaint();
+ BeanUtil.copyProperties(complaintVO, complaint);
+ saveComplaint(complaint, loginUserInfo);
+
+ ComplaintCompletionDTO complaintCompletionDTO = complaintVO.getComplaintCompletionDTO();
+ complaintCompletionDTO.setComplaintId(complaint.getId());
+ complaintCompletionDTO.setId(complaint.getId());
+ saveResult(complaintCompletionDTO, loginUserInfo);
+ }
+
+ @Override
public Page<ComplaintVO> complaintList(ComplaintQuery query, LoginUserInfoVO loginUserInfoVO) {
@@ -226,13 +252,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;
}
@@ -259,11 +288,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 {
@@ -312,11 +341,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 {
@@ -402,7 +431,7 @@
vo.setEvaluateButtonStatus(0);
}
//当前是党员身份，只有是以党员身份提交的数据才有权限
- if(1 == identity && vo.getReportType() == 5){
+ if (1 == identity && vo.getReportType() == 5) {
vo.setEvaluateButtonStatus(0);
}
} else {
@@ -411,6 +440,16 @@
}
}
}
+
+ Long auditCreateBy = vo.getAuditCreateBy();
+ Long userId = loginUserInfo.getUserId();
+ if (null != auditCreateBy && auditCreateBy.compareTo(userId) == 0 && vo.getStatus() == 5) {
+ vo.setWithdrawButtonStatus(0);
+ } else {
+ vo.setWithdrawButtonStatus(1);
+ }
+
+
}
@@ -469,19 +508,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);
+ 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);
+// }
+
+
// //已办结，显示评价按钮
@@ -522,8 +563,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();
}
@@ -556,8 +597,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();
@@ -584,6 +625,7 @@
return complaintProgressService.lambdaQuery().eq(ComplaintProgress::getComplaintId, complaintId)
.orderByAsc(ComplaintProgress::getCreateTime).list();
}
+
@Override
@Transactional(rollbackFor = Exception.class)
@@ -693,6 +735,41 @@
}
@Override
+ public void reportWithdraw(ComplaintReportWithdrawDTO dto, LoginUserInfoVO loginUserInfoVO) {
+ ComplaintAuditRecord complaintAuditRecord = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>()
+ .eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
+ .eq(ComplaintAuditRecord::getAuditType, 2)
+ .eq(ComplaintAuditRecord::getLatestFlag, true));
+ if (Objects.isNull(complaintAuditRecord)) {
+ throw new ServiceException("未找到相关记录");
+ }
+ complaintAuditRecord.setAuditStatus(3);
+ complaintAuditRecord.setUpdateBy(loginUserInfoVO.getUserId());
+ complaintAuditRecord.setUpdateTime(new Date());
+ complaintAuditRecord.setLatestFlag(false);
+ complaintAuditRecordService.updateById(complaintAuditRecord);
+
+ // 获取上一条记录
+ ComplaintAuditRecord lastRecord = complaintAuditRecordService.getOne(new LambdaQueryWrapper<ComplaintAuditRecord>()
+ .ne(ComplaintAuditRecord::getId, complaintAuditRecord.getId())
+ .eq(ComplaintAuditRecord::getComplaintId, dto.getComplaintId())
+ .eq(ComplaintAuditRecord::getAuditType, 2)
+ .eq(ComplaintAuditRecord::getLatestFlag, false)
+ .orderByDesc(ComplaintAuditRecord::getSort)
+ );
+ if (Objects.nonNull(lastRecord)) {
+ // 复制上一条记录
+ ComplaintAuditRecord newRecord = new ComplaintAuditRecord();
+ BeanUtils.copyProperties(lastRecord, newRecord);
+ newRecord.setId(null);
+ newRecord.setLatestFlag(true);
+ newRecord.setUpdateBy(loginUserInfoVO.getUserId());
+ newRecord.setUpdateTime(new Date());
+ complaintAuditRecordService.save(newRecord);
+ }
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
public void saveDispatch(ComplaintDispatch dto, LoginUserInfoVO loginUserInfoVO) {
IdentityInformation identityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfoVO);
--
Gitblit v1.7.1