From 86b74d98763bf4be04d6f27452b2cd33074d060b Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期一, 17 三月 2025 20:47:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 c4a4fbf..4338215 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
@@ -112,7 +112,7 @@
Integer accountLevel = 5;
//获取当前身份，1=党员，2=管理员
Integer identity = (Integer) redisUtils.get("identity:" + loginUserInfoVO.getPhone());
- if (systemUserOpt.isPresent() && identity == 2) {
+ if (systemUserOpt.isPresent() && null != identity && identity == 2) {
SystemUser systemUser = systemUserOpt.get();
accountLevel = systemUser.getAccountLevel();
switch (accountLevel) {
@@ -201,7 +201,7 @@
//获取当前身份，1=党员，2=管理员
Integer identity = (Integer) redisUtils.get("identity:" + loginUserInfoVO.getPhone());
//上级
- if (systemUserByPhone.isPresent() && identity == 2) {
+ if (systemUserByPhone.isPresent() && null != identity && identity == 2) {
SystemUser systemUser = systemUserByPhone.get();
accountLevel = systemUser.getAccountLevel();
switch (accountLevel) {
@@ -954,14 +954,14 @@
response.setCharacterEncoding("utf-8");
String fileName = URLEncoder.encode("诉求数据", "UTF-8").replaceAll("\\+", "%20");
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
- EasyExcel.write(response.getOutputStream(), PartyMemberExcel.class)
+ EasyExcel.write(response.getOutputStream(), ComplaintExcel.class)
.sheet("诉求数据")
.doWrite(complaintExcels);
}
@Override
public void downloadFile(Long id,Integer type) throws IOException {
- Complaint complaint = getById(id);
+ Complaint complaint = baseMapper.getDetailBg(id);
if (Objects.isNull(complaint)) {
throw new ServiceException("该诉求不存在");
}
@@ -969,7 +969,7 @@
BcRegion region = bcRegionService.getDistrictByCode(complaint.getDistrictsCode().toString());
ComStreet street = comStreetService.getById(complaint.getStreetId().toString());
ComAct act = comActService.getById(complaint.getCommunityId());
- String community = region.getRegionName() +"-"+ street.getName() + act.getName();
+ String community = region.getRegionName() +"-"+ street.getName() + "-"+ act.getName();
PartyMember partyMember = null;
if (Objects.nonNull(complaint.getPartyMemberId())){
partyMember = partyMemberService.getById(complaint.getPartyMemberId());
@@ -993,7 +993,7 @@
map.put("community", community);
map.put("problemType", complaint.getProblemType());
map.put("descriptionContent", complaint.getDescriptionContent());
- map.put("reportType", ReportTypeEnum.fromCode(complaint.getReportType())); //TODO待修改
+ map.put("reportType", ReportTypeEnum.fromCode(complaint.getReportType()).getDescription());
map.put("partyOrganization",Objects.nonNull(partyMember)? partyMember.getPartyOrganization() : "");
map.put("name", complaint.getName());
map.put("contactNumber", complaint.getContactNumber());
--
Gitblit v1.7.1