From d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 三月 2025 22:11:24 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintFlowServiceImpl.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintFlowServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintFlowServiceImpl.java
index a11c5bb..150702c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintFlowServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintFlowServiceImpl.java
@@ -18,6 +18,7 @@
import javax.annotation.Resource;
import java.util.Date;
+import java.util.Objects;
/**
* <p>
@@ -35,16 +36,16 @@
private final IComStreetService comStreetService;
private final IComActService comActService;
private final UserService userService;
+ private final IPartyMemberService partyMemberService;
@Override
- public void createFlow(Long complaintId , Long superiorId, Integer reportType, Integer type, Long userId) {
-
-
- String name = getFlowName(reportType, superiorId);
+ public void createFlow(ComplaintAuditRecord record, Integer type,Long userId) {
+ //获取流程部门名称
+ String name = getFlowName(record.getReportType(), record.getSuperiorId());
ComplaintFlow complaintFlow = new ComplaintFlow();
- complaintFlow.setComplaintId(complaintId);
- complaintFlow.setLevel(reportType);
+ complaintFlow.setComplaintId(record.getComplaintId());
+ complaintFlow.setLevel(record.getReportType());
complaintFlow.setName(name);
complaintFlow.setCreateTime(new Date(System.currentTimeMillis()));
complaintFlow.setType(type);
@@ -52,7 +53,7 @@
}
private String getFlowName(Integer reportType, Long superiorId) {
- String name;
+ String name = "";
if (reportType == ReportTypeEnum.COMMUNITY.getCode()) {
ComAct byId = comActService.getById(superiorId);
name = byId.getName();
@@ -64,11 +65,15 @@
.eq(BcRegion::getRegionCode, superiorId));
name = bcRegion.getRegionName();
} else {
- R<LoginUserInfoVO> userR = userService.getUserInfoByUserId(String.valueOf(superiorId));
- if (R.isOk(userR)) {
- throw new ServiceException("获取用户信息失败");
+// R<LoginUserInfoVO> userR = userService.getUserInfoByUserId(String.valueOf(superiorId));
+// if (!R.isOk(userR)) {
+// throw new ServiceException("获取用户信息失败");
+// }
+// name = null == userR.getData() ? "" : userR.getData().getNickName();
+ PartyMember partyMember = partyMemberService.getById(superiorId);
+ if (Objects.nonNull(partyMember)) {
+ name = partyMember.getName();
}
- name = userR.getData().getNickName();
}
return name;
}
--
Gitblit v1.7.1