From c32f7e303b895dfff34b2fe9e5fa47c405f79339 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 5 Sep 2022 13:56:26 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=90=8C=E4=B8=80=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E4=B8=8B=E6=A5=BC=E6=A0=8B=E4=B8=8D=E9=87=8D=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/model/ImportBuildingInfoListener.java | 1 + .../src/main/java/com/epmet/model/ImportHouseInfoListener.java | 1 + 2 files changed, 2 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java index 79009b1039..38f8e3b494 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java @@ -215,6 +215,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener gridIds = new ArrayList<>(); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java index 194f39eb54..b8f1c41ce2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java @@ -494,6 +494,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener gridIds = new ArrayList<>(); From a1203949c40b8eb98f22a78d07c61c6ee8e54240 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 6 Sep 2022 11:02:11 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/group/dto/group/result/GroupDetailResultDTO.java | 4 ++++ .../modules/group/service/impl/ResiGroupServiceImpl.java | 5 +++++ .../main/resources/mapper/group/GroupEditSubmitRecordDao.xml | 1 + 3 files changed, 10 insertions(+) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupDetailResultDTO.java index 7d08176f31..f7444bdc17 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupDetailResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupDetailResultDTO.java @@ -26,4 +26,8 @@ public class GroupDetailResultDTO { private String leaderId; /** 当前用户是否是群主 */ private String groupLeaderFlag; + /** + * 所属党组织 + */ + private String partyOrgId; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index e21ce83878..54d83ed951 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -1473,10 +1473,15 @@ public class ResiGroupServiceImpl extends BaseServiceImpl Date: Tue, 6 Sep 2022 14:14:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/group/service/impl/ResiGroupServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 54d83ed951..bbfff94490 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -1481,7 +1481,6 @@ public class ResiGroupServiceImpl extends BaseServiceImpl Date: Tue, 6 Sep 2022 15:02:03 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BD=A0=E5=A5=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcMessageDTO.java | 2 +- .../src/main/java/com/epmet/entity/IcMessageEntity.java | 2 +- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java index 3451d342f3..1c7e9e9785 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java @@ -42,7 +42,7 @@ public class IcMessageDTO implements Serializable { private String app; /** - * 消息分类 党建小助手:party + * 消息分类 党建活动：party_act 党建日程：party_schedule */ private String messageType; diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java index dc937c6639..e13ee49b0a 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java @@ -42,7 +42,7 @@ public class IcMessageEntity extends BaseEpmetEntity { private String app; /** - * 消息分类 党建小助手:party + * 消息分类 党建活动：party_act 党建日程：party_schedule */ private String messageType; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 52d1c14c2a..c5d1d7244b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -572,7 +572,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Tue, 6 Sep 2022 15:39:16 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.3.20__alter_ic_message.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.20__alter_ic_message.sql diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.20__alter_ic_message.sql b/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.20__alter_ic_message.sql new file mode 100644 index 0000000000..d962d2763e --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.20__alter_ic_message.sql @@ -0,0 +1,2 @@ +ALTER TABLE epmet_message.`ic_message` +MODIFY COLUMN `message_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '消息分类 \r\n党建活动：party_act \r\n党建日程：party_schedule \r\n' AFTER `app`;