From 6c040539f9a2bb14c23b99c1a7b6e71ab81746d4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 3 Aug 2021 17:28:09 +0800 Subject: [PATCH] =?UTF-8?q?resi=5Fevent=E4=BF=AE=E6=94=B9is=5Fparty?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BAtinyint(1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/entity/ResiEventEntity.java | 2 +- .../com/epmet/service/impl/ResiEventServiceImpl.java | 9 ++++++++- .../db/migration/V0.0.16__create_resievent_tables.sql | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java index a142881c1d..f00dab5a06 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ResiEventEntity.java @@ -66,7 +66,7 @@ public class ResiEventEntity extends BaseEpmetEntity { /** * 1：党员；0：不是党员；默认0 */ - private String isParty; + private Boolean isParty; /** * 事件内容 diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 4855a76fa8..ca685464b8 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -35,6 +35,7 @@ import com.epmet.dao.ResiEventDao; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.ResiEventEntity; +import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.ResiEventService; import lombok.extern.slf4j.Slf4j; @@ -66,6 +67,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl partyRes=epmetUserOpenFeignClient.selectIsPartyMemberByUserId(formDTO.getUserId()); + if(!partyRes.success()||null==partyRes.getData()){ + throw new RenException("查询用户是否是党员异常"); + } + resiEventEntity.setIsParty(partyRes.getData()); resiEventEntity.setStatus(EventConstant.EVENT_STATUS_PROCESSING); resiEventEntity.setShiftProject(false); resiEventEntity.setProjectId(StrConstant.EPMETY_STR); diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql index 67f600d311..90cc434e75 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql @@ -5,7 +5,7 @@ CREATE TABLE `resi_event` ( `AGENCY_ID` varchar(64) NOT NULL COMMENT '居民端用户所在网格的所属组织', `PIDS` varchar(64) NOT NULL COMMENT '居民端用户所在网格的所有上级组织，包含AGENCY_ID', `REPORT_USER_ID` varchar(64) NOT NULL COMMENT '报事的人', - `IS_PARTY` varchar(1) NOT NULL DEFAULT '0' COMMENT '1：党员；0：不是党员；默认0', + `IS_PARTY` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1：党员；0：不是党员；默认0', `EVENT_CONTENT` varchar(1024) NOT NULL COMMENT '事件内容', `LATITUDE` varchar(32) DEFAULT NULL COMMENT '纬度', `LONGITUDE` varchar(32) DEFAULT NULL COMMENT '经度',