From f157f5c4852ee1587be522156d884f73c7cecaca Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 16 Mar 2022 11:25:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=83=E7=94=A8=E5=89=8D=E7=BD=AE=EF=BC=9A?= =?UTF-8?q?=E6=9C=AA=E5=A4=84=E7=90=86=E7=9A=84=E4=BA=8B=E4=BB=B6+?= =?UTF-8?q?=E6=9C=AA=E5=85=B3=E9=97=AD=E7=9A=84=E8=AE=AE=E9=A2=98=E3=80=82?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E4=B8=8D=E7=AE=A1=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/AbandonGridResDTO.java | 10 ----- .../com/epmet/controller/GridController.java | 5 ++- .../epmet/service/CustomerGridService.java | 2 +- .../service/impl/CustomerGridServiceImpl.java | 40 ++++--------------- 4 files changed, 11 insertions(+), 46 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AbandonGridResDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AbandonGridResDTO.java index 5ded7f55e2..c09bee8db5 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AbandonGridResDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AbandonGridResDTO.java @@ -4,7 +4,6 @@ import lombok.AllArgsConstructor; import lombok.Data; import java.io.Serializable; -import java.util.List; /** * 废弃网格，前置条件查询返参 @@ -13,13 +12,4 @@ import java.util.List; @Data public class AbandonGridResDTO implements Serializable { - /** - * true:可以弃用，false:不可以弃用 - */ - private Boolean abandonFlag; - - /** - * 待办事项 - */ - private List toDoList; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java index affc36fe0e..60ffda8b94 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java @@ -234,8 +234,9 @@ public class GridController { * @return */ @PostMapping("abandon") - public Result abandonGrid(@RequestBody AbandonGridFormDTO formDTO){ + public Result abandonGrid(@RequestBody AbandonGridFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, AddGroup.class); - return new Result().ok(customerGridService.abandonGrid(formDTO)); + customerGridService.abandonGrid(formDTO); + return new Result(); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java index dea04e9f16..c57c5052ed 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java @@ -380,5 +380,5 @@ public interface CustomerGridService extends BaseService { * @param formDTO * @return */ - AbandonGridResDTO abandonGrid(AbandonGridFormDTO formDTO); + void abandonGrid(AbandonGridFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index 512e050c80..2f5436c710 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -46,7 +46,6 @@ import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.CustomerGridEntity; import com.epmet.feign.*; -import com.epmet.resi.partymember.dto.partymember.result.WarnAndPartyAuditResultDTO; import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; import com.epmet.service.CustomerAgencyService; import com.epmet.service.CustomerGridService; @@ -966,45 +965,21 @@ public class CustomerGridServiceImpl extends BaseServiceImpl partyMem = resiPartyMemberOpenFeignClient.partyMemberAuditReset(formDTO.getGridId()); - if (!partyMem.success() || null == partyMem.getData()) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "partyMemberAuditReset failed", "数据校验异常"); - } + public void abandonGrid(AbandonGridFormDTO formDTO) { //未处理的事件 Result eventRes = govProjectOpenFeignClient.eventAuditReset(formDTO.getGridId()); - if (!eventRes.success() || null == eventRes.getData()) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "eventAuditReset failed", "数据校验异常"); - } //表决中的议题 Result issueAuditReset = govIssueOpenFeignClient.issueAuditReset(formDTO.getGridId()); - if (!issueAuditReset.success() || null == issueAuditReset.getData()) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "issueAuditReset failed", "数据校验异常"); - } - //徽章???? - AbandonGridResDTO result=new AbandonGridResDTO(true,new ArrayList<>()); - if(partyMem.getData().getPartyMemberStatus()){ - result.setAbandonFlag(false); - result.getToDoList().add("存在未审核的党员申请"); + if (eventRes.success() || issueAuditReset.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "校验数据异常", "服务器开小差了..."); } - if(partyMem.getData().getWarnStatus()){ - result.setAbandonFlag(false); - result.getToDoList().add("存在未审核的热心居民申请"); + if (eventRes.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "存在未处理的事件", "该网格存在未办结的群众直报事件，请先将事件办结后再操作"); } - if(eventRes.getData()){ - result.setAbandonFlag(false); - result.getToDoList().add("存在未处理的事件"); - } - if(issueAuditReset.getData()){ - result.setAbandonFlag(false); - result.getToDoList().add("存在未处理的议题"); + if (issueAuditReset.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "存在未关闭的议题", "该网格存在未关闭的议题，请处理完再操作"); } - if(!result.getAbandonFlag()){ - return result; - } //可以弃用、处理数据 todo // .... // .... @@ -1015,7 +990,6 @@ public class CustomerGridServiceImpl extends BaseServiceImpl