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/warpper/PartyMemberDTO.java | 6 ++----
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java | 14 ++++++++++++++
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/ComplaintMapper.xml | 5 ++---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 12 ++++++------
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IBcRegionService.java | 2 ++
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/BcRegionServiceImpl.java | 5 +++++
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/MgtComplaintQuery.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/ProblemTypeController.java | 7 +++++++
8 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/ProblemTypeController.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/ProblemTypeController.java
index eacfb62..6ddf475 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/ProblemTypeController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/ProblemTypeController.java
@@ -18,6 +18,7 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
+import java.util.List;
/**
* @author zhibing.pu
@@ -112,4 +113,10 @@
ProblemType problemType = problemTypeService.getById(id);
return R.ok(problemType);
}
+ @ApiOperation(value = "获取问题类型列表(不分页)")
+ @GetMapping("/list-no-page")
+ public R<List<ProblemType>> listNoPage(){
+ List<ProblemType> list = problemTypeService.list(new LambdaQueryWrapper<ProblemType>().eq(ProblemType::getDel, 0));
+ return R.ok(list);
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IBcRegionService.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IBcRegionService.java
index 4ae2e78..fc2ff0c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IBcRegionService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IBcRegionService.java
@@ -18,4 +18,6 @@
* @return
*/
BcRegion getDistrictByName(String districtName);
+
+ BcRegion getDistrictByCode(String districtCode);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/BcRegionServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/BcRegionServiceImpl.java
index 88d06b7..a8dfd89 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/BcRegionServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/BcRegionServiceImpl.java
@@ -28,4 +28,9 @@
.eq(BcRegion::getDeleteFlag, 0)
.eq(BcRegion::getHierarchyOrder, 2).last("LIMIT 1").one();
}
+
+ @Override
+ public BcRegion getDistrictByCode(String districtCode) {
+ return this.lambdaQuery().eq(BcRegion::getRegionCode, districtCode).last("LIMIT 1").one();
+ }
}
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)) {
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java
index 4a9bbc2..1e6fd63 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java
@@ -16,6 +16,7 @@
import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
import com.panzhihua.sangeshenbian.dao.PartyMemberMapper;
import com.panzhihua.sangeshenbian.enums.AuditStatusEnum;
+import com.panzhihua.sangeshenbian.enums.FreezeStatusEnum;
import com.panzhihua.sangeshenbian.enums.ReportTypeEnum;
import com.panzhihua.sangeshenbian.enums.AuditStatusEnum;
import com.panzhihua.sangeshenbian.model.entity.BcRegion;
@@ -88,10 +89,23 @@
PartyMember partyMember = BeanUtil.copyProperties(dto, PartyMember.class);
String idNumber = dto.getIdNumber();
partyMember.setGender(getGender(idNumber));
+ BcRegion districtByCode = bcRegionService.getDistrictByCode(dto.getDistrictsCode());
+ if (Objects.nonNull(districtByCode)){
+ partyMember.setDistricts(districtByCode.getRegionName());
+ }
+ ComStreet street = comStreetService.getById(dto.getStreetId());
+ if (Objects.nonNull(street)){
+ partyMember.setStreet(street.getName());
+ }
+ ComAct act = comActService.getById(dto.getCommunityId());
+ if (Objects.nonNull(act)){
+ partyMember.setCommunity(act.getName());
+ }
if (Objects.isNull(dto.getId())) {
//添加
partyMember.setCreateBy(Long.parseLong(loginUserInfo.getId().toString()));
partyMember.setAuditStatus(AuditStatusEnum.APPROVED.getCode());
+ partyMember.setFreezeStatus(FreezeStatusEnum.NORMAL.getCode());
partyMember.setSource(1);
save(partyMember);
} else {
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/MgtComplaintQuery.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/MgtComplaintQuery.java
index a6f761d..29b0e95 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/MgtComplaintQuery.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/MgtComplaintQuery.java
@@ -38,6 +38,6 @@
@ApiModelProperty(value = "问题类型")
private String problemType;
- @ApiModelProperty(value = "流转状态：0-正在办理 1-延期办理 2-超时办理 3-已办结 4-群众撤销 5-上报待审核 6-上级驳回 7-延期待审核")
+ @ApiModelProperty(value = "流转状态：0-正在办理 1-延期办理 2-超时办理 3-已办结 4-上报待审核")
private Integer status;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/PartyMemberDTO.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/PartyMemberDTO.java
index d96c50d..d39e0c1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/PartyMemberDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/PartyMemberDTO.java
@@ -9,6 +9,7 @@
import lombok.Data;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
/**
* @author mitao
@@ -34,7 +35,6 @@
private String phone;
@ApiModelProperty(value = "所属区县")
- @NotBlank(message = "区县不能空")
private String districts;
@ApiModelProperty(value = "区县编号")
@@ -42,7 +42,6 @@
private String districtsCode;
@ApiModelProperty(value = "街道")
- @NotBlank(message = "街道不能空")
private String street;
@ApiModelProperty(value = "街道ID")
@@ -50,11 +49,10 @@
private String streetId;
@ApiModelProperty(value = "社区")
- @NotBlank(message = "社区不能空")
private String community;
@ApiModelProperty(value = "社区ID")
- @NotBlank(message = "社区ID不能空")
+ @NotNull(message = "社区ID不能空")
private Long communityId;
@ApiModelProperty(value = "服务对象")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/ComplaintMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/ComplaintMapper.xml
index d910764..5e92dca 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/ComplaintMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/ComplaintMapper.xml
@@ -248,9 +248,8 @@
sc.images,
sc.videos,
CASE
- WHEN sc.status = 0 and scar.audit_type = 1 AND scar.audit_status = 0 THEN 7
- WHEN sc.status = 0 and scar.audit_type = 2 AND scar.audit_status = 0 THEN 5
- WHEN sc.status = 0 and scar.audit_status = 2 THEN 6
+ WHEN sc.status = 0 and scar.audit_type = 1 AND scar.audit_status = 0 THEN 4
+ WHEN sc.status = 0 and scar.audit_type = 2 AND scar.audit_status = 0 THEN 4
ELSE sc.status
END AS status,
sc.report_type,
--
Gitblit v1.7.1