From 7a85ab9deb97520738896059c51ce71c4112b56f Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期二, 18 三月 2025 21:18:41 +0800
Subject: [PATCH] 增加查看评价详情接口
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 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 94991de..a33bc87 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
@@ -523,10 +523,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 +563,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);
@@ -589,6 +610,7 @@
int reporterLevel;
Long reporterId = null;
String departmentName = "";
+ String reporter = "";
if (identityInformationVO.getIdentity() == 1) {
PartyMember partyMember = partyMemberService.getPartyMemberByPhone(phone);
superiorId = partyMember.getCommunityId();
@@ -596,6 +618,7 @@
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) {
@@ -603,6 +626,7 @@
}
reportType = accountLevel - 1;
reporterLevel = accountLevel;
+ reporter = adminUser.getName();
// 使用基本类型比较并补充默认分支
if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
@@ -670,7 +694,7 @@
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());
--
Gitblit v1.7.1