From 7f302004e78ca5220a4f88a7fab843964a18739a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 17 三月 2025 18:35:17 +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 | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 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 f4d146b..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,24 +112,30 @@
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) {
case 1:
//市级
complaint.setCityCode(510400);
+ complaint.setReportUserName(systemUser.getName());
+ complaint.setReportUserPhone(systemUser.getPhone());
break;
case 2:
//区县级
complaint.setCityCode(510400);
complaint.setDistrictsCode(Integer.valueOf(systemUser.getDistrictsCode()));
+ complaint.setReportUserName(systemUser.getName());
+ complaint.setReportUserPhone(systemUser.getPhone());
break;
case 3:
//街道
complaint.setCityCode(510400);
complaint.setDistrictsCode(Integer.valueOf(systemUser.getDistrictsCode()));
complaint.setStreetId(Long.valueOf(systemUser.getStreetId()));
+ complaint.setReportUserName(systemUser.getName());
+ complaint.setReportUserPhone(systemUser.getPhone());
break;
case 4:
//社区
@@ -137,6 +143,8 @@
complaint.setDistrictsCode(Integer.valueOf(systemUser.getDistrictsCode()));
complaint.setStreetId(Long.valueOf(systemUser.getStreetId()));
complaint.setCommunityId(systemUser.getCommunityId());
+ complaint.setReportUserName(systemUser.getName());
+ complaint.setReportUserPhone(systemUser.getPhone());
break;
case 5:
//党员
@@ -146,6 +154,8 @@
complaint.setCommunityId(systemUser.getCommunityId());
PartyMember partyMember = partyMemberService.getPartyMemberByPhone(loginUserInfoVO.getPhone());
complaint.setPartyMemberId(partyMember.getId());
+ complaint.setReportUserName(partyMember.getName());
+ complaint.setReportUserPhone(partyMember.getPhone());
break;
}
} else{
@@ -156,6 +166,8 @@
complaint.setStreetId(Long.valueOf(partyMember.getStreetId()));
complaint.setCommunityId(partyMember.getCommunityId());
complaint.setPartyMemberId(partyMember.getId());
+ complaint.setReportUserName(partyMember.getName());
+ complaint.setReportUserPhone(partyMember.getPhone());
}
complaint.setReportType(accountLevel);
// 设置其他字段
@@ -189,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) {
@@ -942,22 +954,22 @@
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("该诉求不存在");
}
//查询社区信息
- BcRegion region = bcRegionService.lambdaQuery().eq(BcRegion::getRegionCode, complaint.getDistrictsCode()).last("LIMIT 1").one();
- ComStreet street = comStreetService.lambdaQuery().eq(ComStreet::getStreetId, complaint.getStreetId()).one();
- ComAct act = comActService.lambdaQuery().eq(ComAct::getCommunityId, complaint.getCommunityId()).one();
- String community = region.getRegionName() +"-"+ street.getName() + act.getName();
+ 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();
PartyMember partyMember = null;
if (Objects.nonNull(complaint.getPartyMemberId())){
partyMember = partyMemberService.getById(complaint.getPartyMemberId());
@@ -981,12 +993,12 @@
map.put("community", community);
map.put("problemType", complaint.getProblemType());
map.put("descriptionContent", complaint.getDescriptionContent());
- map.put("reportType", Objects.nonNull(complaint.getPartyMemberId())?"党员": "上级"); //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());
- map.put("nickname", Objects.nonNull(partyMember)? partyMember.getName() : "");
- map.put("phone", Objects.nonNull(partyMember)? partyMember.getPhone() : "");
+ map.put("nickname", complaint.getReportUserName());
+ map.put("phone", complaint.getReportUserPhone());
List<ComplaintProgress> list = complaintProgressService.lambdaQuery().eq(ComplaintProgress::getComplaintId, id).orderByAsc(ComplaintProgress::getCreateTime).list();
StringBuilder sb = new StringBuilder();
if (CollUtil.isNotEmpty(list)) {
--
Gitblit v1.7.1