From 38f1a806a4e1d8e1560f07a5a26b51cf6a4692be Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 17 三月 2025 10:57:57 +0800
Subject: [PATCH] 党员管理接口调试修改

---
 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 36131d9..c4a4fbf 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
@@ -966,9 +966,9 @@
             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();
+        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())){
@@ -993,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())); //TODO待修改
         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