diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java index 12beafec58..35c0f65d2c 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java @@ -126,10 +126,15 @@ public class IcPartyActAddOrUpdateFormDTO implements Serializable { /** * 发布活动党组织PUBLISH_PARTY_ORG_ID的全路径,包含自身。方便前端回显 */ - // @NotBlank(message = "publishOrgPath不能为空", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) // 后端接口内部去赋值,无需前端传入了 private String publishOrgPath; + /** + *发布活动党组织路径,前端用此列 + */ + @NotBlank(message = "publishOrgPathShow不能为空", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) + private String publishOrgPathShow; + /** * 参加人员类型,0:全体党员;1:支部委员 */ diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java index 02e746aca3..486e98be14 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java @@ -40,10 +40,15 @@ public class JoinOrgDTO implements Serializable { /** * PARTY_ORG_ID的全路径,包含自身。方便前端回显 */ - // @NotBlank(message = "参加活动党组织不能为空", groups = {IcPartyActAddOrUpdateFormDTO.AddUserInternalGroup.class, IcPartyActAddOrUpdateFormDTO.UpdateUserInternalGroup.class}) // 后端接口内部去赋值,无需前端传入了 private String joinOrgPath; + /** + * PARTY_ORG_ID的全路径,前端用 + */ + @NotBlank(message = "joinOrgPathShow不能为空", groups = {IcPartyActAddOrUpdateFormDTO.AddUserInternalGroup.class, IcPartyActAddOrUpdateFormDTO.UpdateUserInternalGroup.class}) + private String joinOrgPathShow; + //接口内部赋值 /** * 活动id @@ -60,5 +65,6 @@ public class JoinOrgDTO implements Serializable { * 详情接口返回 */ private String icPartyActOrgRecId; + } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java index 37f16e3274..564f101fb9 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java @@ -99,6 +99,11 @@ public class IcPartyActDetailResDTO implements Serializable { */ private String publishOrgPath; + /** + *发布活动党组织路径,前端用此列 + */ + private String publishOrgPathShow; + /** * 参加人员类型,0:全体党员;1:支部委员 */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java index 23065472fb..3764f8d223 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java @@ -65,7 +65,10 @@ public class IcPartyActEntity extends BaseEpmetEntity { * 发布活动党组织PUBLISH_PARTY_ORG_ID的全路径,包含自身。方便前端回显 */ private String publishOrgPath; - + /** + *发布活动党组织路径,前端用此列 + */ + private String publishOrgPathShow; /** * 活动类型,来源于ic_party_act_type_dict */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java index d628ccc457..23c131028a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java @@ -50,4 +50,8 @@ public class IcPartyActOrgEntity extends BaseEpmetEntity { */ private String joinOrgPath; + /** + * PARTY_ORG_ID的全路径,前端用 + */ + private String joinOrgPathShow; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.8__party_act_path.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.8__party_act_path.sql new file mode 100644 index 0000000000..072be997c1 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.8__party_act_path.sql @@ -0,0 +1,6 @@ +ALTER TABLE ic_party_act ADD COLUMN PUBLISH_ORG_PATH_SHOW VARCHAR ( 255 ) COMMENT '发布活动党组织路径,前端用此列' AFTER PUBLISH_ORG_PATH; +ALTER TABLE ic_party_act_org ADD COLUMN JOIN_ORG_PATH_SHOW VARCHAR ( 255 ) COMMENT 'PARTY_ORG_ID的全路径,前端用' AFTER JOIN_ORG_PATH; + +alter table ic_party_act MODIFY COLUMN PUBLISH_ORG_PATH VARCHAR(255) not null COMMENT'发布活动党组织PUBLISH_PARTY_ORG_ID的全路径,包含自身'; + +alter table ic_party_act_org MODIFY COLUMN JOIN_ORG_PATH VARCHAR(255) not null COMMENT 'PARTY_ORG_ID的全路径,包含自身'; \ No newline at end of file