diff --git a/src/main/java/com/cm/partybuilding/pojo/dtos/partyorganize/PartyOrganizeDTO.java b/src/main/java/com/cm/partybuilding/pojo/dtos/partyorganize/PartyOrganizeDTO.java index 4e2196e..9bf9471 100644 --- a/src/main/java/com/cm/partybuilding/pojo/dtos/partyorganize/PartyOrganizeDTO.java +++ b/src/main/java/com/cm/partybuilding/pojo/dtos/partyorganize/PartyOrganizeDTO.java @@ -82,6 +82,10 @@ public class PartyOrganizeDTO { private String creatTime; @ApiModelProperty(name = "remake", value = "备注") private String remake; + @ApiModelProperty(name = "belongStreet", value = "所属街镇村ID") + private String belongStreet; + @ApiModelProperty(name = "belongStreetName", value = "所属街镇村名称") + private String belongStreetName; public String getPartyOrganizeId() { return partyOrganizeId == null ? "" : partyOrganizeId.trim(); @@ -351,5 +355,19 @@ public class PartyOrganizeDTO { this.remake = remake; } + public String getBelongStreet() { + return belongStreet == null ? "" : belongStreet; + } + public void setBelongStreet(String belongStreet) { + this.belongStreet = belongStreet; + } + + public String getBelongStreetName() { + return belongStreetName == null ? "" : belongStreetName; + } + + public void setBelongStreetName(String belongStreetName) { + this.belongStreetName = belongStreetName; + } } diff --git a/src/main/java/com/cm/partybuilding/pojo/vos/partyorganize/PartyOrganizeVO.java b/src/main/java/com/cm/partybuilding/pojo/vos/partyorganize/PartyOrganizeVO.java index 7c3389f..3eeaa69 100644 --- a/src/main/java/com/cm/partybuilding/pojo/vos/partyorganize/PartyOrganizeVO.java +++ b/src/main/java/com/cm/partybuilding/pojo/vos/partyorganize/PartyOrganizeVO.java @@ -77,6 +77,10 @@ public class PartyOrganizeVO { private String creatTime; @ApiModelProperty(name = "remake", value = "备注") private String remake; + @ApiModelProperty(name = "belongStreet", value = "所属街镇村ID") + private String belongStreet; + @ApiModelProperty(name = "belongStreetName", value = "所属街镇村名称") + private String belongStreetName; public String getIntroduction() { return introduction == null ? "" : introduction.trim(); @@ -310,5 +314,19 @@ public class PartyOrganizeVO { this.remake = remake; } + public String getBelongStreet() { + return belongStreet == null ? "" : belongStreet; + } + public void setBelongStreet(String belongStreet) { + this.belongStreet = belongStreet; + } + + public String getBelongStreetName() { + return belongStreetName == null ? "" : belongStreetName; + } + + public void setBelongStreetName(String belongStreetName) { + this.belongStreetName = belongStreetName; + } } diff --git a/src/main/resources/mybatis/mapper/partyorganize/partyorganize-mapper.xml b/src/main/resources/mybatis/mapper/partyorganize/partyorganize-mapper.xml index aba34d6..bda6f03 100644 --- a/src/main/resources/mybatis/mapper/partyorganize/partyorganize-mapper.xml +++ b/src/main/resources/mybatis/mapper/partyorganize/partyorganize-mapper.xml @@ -37,6 +37,8 @@ + + @@ -72,6 +74,8 @@ position, creat_time, remake, + belong_street, + belong_street_name, creator, gmt_create, modifier, @@ -108,6 +112,8 @@ #{position}, #{creatTime}, #{remake}, + #{belongStreet}, + #{belongStreetName}, #{creator}, #{gmtCreate}, #{modifier}, @@ -233,6 +239,12 @@ remake = #{remake}, + + + belong_street = #{belongStreet}, + + + belong_street_name = #{belongStreetName}, modifier = #{modifier}, gmt_modified = #{gmtModified} @@ -272,6 +284,8 @@ t1.position, t1.creat_time, t1.remake, + t1.belong_street, + t1.belong_street_name, t1.party_organize_id FROM gen_party_organize t1 @@ -318,6 +332,8 @@ t1.position, t1.creat_time, t1.remake, + t1.belong_street, + t1.belong_street_name, t1.party_organize_id FROM gen_party_organize t1 @@ -428,6 +444,8 @@ t1.position, t1.creat_time, t1.remake, + t1.belong_street, + t1.belong_street_name, t1.party_organize_id FROM gen_party_organize t1 diff --git a/src/main/resources/static/route/partyorganize/save-partyorganize.html b/src/main/resources/static/route/partyorganize/save-partyorganize.html index 81ab064..738e33e 100644 --- a/src/main/resources/static/route/partyorganize/save-partyorganize.html +++ b/src/main/resources/static/route/partyorganize/save-partyorganize.html @@ -84,6 +84,17 @@ +
+ +
+ +
+
@@ -734,6 +745,7 @@ var loadLayerIndex; formData.field['introduction'] = wangEditorObj['introduction'].txt.html(); formData.field['remake'] = wangEditorObj['remake'].txt.html(); + formData.field.belongStreetName = $('#belongStreet').find('option:selected').text(); top.restAjax.post(top.restAjax.path('api/partyorganize/savepartyorganize', []), formData.field, null, function(code, data) { var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, { time: 0, diff --git a/src/main/resources/static/route/partyorganize/update-partyorganize.html b/src/main/resources/static/route/partyorganize/update-partyorganize.html index 96cdfa4..1049fcb 100644 --- a/src/main/resources/static/route/partyorganize/update-partyorganize.html +++ b/src/main/resources/static/route/partyorganize/update-partyorganize.html @@ -84,6 +84,17 @@
+
+ +
+ +
+
@@ -807,6 +818,7 @@ var loadLayerIndex; formData.field['introduction'] = wangEditorObj['introduction'].txt.html(); formData.field['remake'] = wangEditorObj['remake'].txt.html(); + formData.field.belongStreetName = $('#belongStreet').find('option:selected').text(); top.restAjax.put(top.restAjax.path('api/partyorganize/updatepartyorganize/{partyOrganizeId}', [partyOrganizeId]), formData.field, null, function(code, data) { var layerIndex = top.dialog.msg(top.dataMessage.updateSuccess, { time: 0,