diff --git a/src/main/java/com/cm/partybuilding/pojo/dtos/partymemberorganize/PartyMemberOrganizeDTO.java b/src/main/java/com/cm/partybuilding/pojo/dtos/partymemberorganize/PartyMemberOrganizeDTO.java index df67b12..6853ae2 100644 --- a/src/main/java/com/cm/partybuilding/pojo/dtos/partymemberorganize/PartyMemberOrganizeDTO.java +++ b/src/main/java/com/cm/partybuilding/pojo/dtos/partymemberorganize/PartyMemberOrganizeDTO.java @@ -74,6 +74,8 @@ public class PartyMemberOrganizeDTO { private String remake; @ApiModelProperty(name = "userName", value = "用户名") private String userName; + @ApiModelProperty(name = "userId", value = "系统用户ID") + private String userId; @ApiModelProperty(name = "maritalStatus", value = "婚姻状况ID") private String maritalStatus; @ApiModelProperty(name = "maritalStatusName", value = "婚姻状况") @@ -85,6 +87,14 @@ public class PartyMemberOrganizeDTO { @ApiModelProperty(name = "partyMembershipStatusName", value = "党籍状态") private String partyMembershipStatusName; + public String getUserId() { + return userId == null ? "" : userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + public String getPartyMemberOrganizeId() { return partyMemberOrganizeId == null ? "" : partyMemberOrganizeId; } diff --git a/src/main/java/com/cm/partybuilding/pojo/vos/partymemberorganize/PartyMemberOrganizeVO.java b/src/main/java/com/cm/partybuilding/pojo/vos/partymemberorganize/PartyMemberOrganizeVO.java index e6aa926..f2ea1ee 100644 --- a/src/main/java/com/cm/partybuilding/pojo/vos/partymemberorganize/PartyMemberOrganizeVO.java +++ b/src/main/java/com/cm/partybuilding/pojo/vos/partymemberorganize/PartyMemberOrganizeVO.java @@ -77,8 +77,9 @@ public class PartyMemberOrganizeVO { @ApiModelProperty(name = "remake", value = "备注") private String remake; @ApiModelProperty(name = "userName", value = "用户名") - @CheckEmptyAnnotation(name = "用户名") private String userName; + @ApiModelProperty(name = "userId", value = "系统用户ID") + private String userId; @ApiModelProperty(name = "maritalStatus", value = "婚姻状况ID") private String maritalStatus; @ApiModelProperty(name = "maritalStatusName", value = "婚姻状况") @@ -90,6 +91,14 @@ public class PartyMemberOrganizeVO { @ApiModelProperty(name = "partyMembershipStatusName", value = "党籍状态") private String partyMembershipStatusName; + public String getUserId() { + return userId == null ? "" : userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + public String getLandline() { return landline == null ? "" : landline; } diff --git a/src/main/resources/mybatis/mapper/partymemberorganize/partymemberorganize-mapper.xml b/src/main/resources/mybatis/mapper/partymemberorganize/partymemberorganize-mapper.xml index 77c20bf..6e80552 100644 --- a/src/main/resources/mybatis/mapper/partymemberorganize/partymemberorganize-mapper.xml +++ b/src/main/resources/mybatis/mapper/partymemberorganize/partymemberorganize-mapper.xml @@ -33,6 +33,7 @@ + @@ -73,6 +74,7 @@ occupation_name, remake, user_name, + user_id, marital_status, marital_status_name, is_outofcontact, @@ -114,6 +116,7 @@ #{occupationName}, #{remake}, #{userName}, + #{userId}, #{maritalStatus}, #{maritalStatusName}, #{isOutofcontact}, @@ -245,6 +248,9 @@ user_name = #{userName}, + + user_id = #{userId}, + marital_status = #{maritalStatus}, @@ -298,6 +304,7 @@ t1.occupation_name, t1.remake, t1.user_name, + t1.user_id, t1.marital_status, t1.marital_status_name, t1.is_outofcontact, @@ -346,6 +353,7 @@ t1.occupation_name, t1.remake, t1.user_name, + t1.user_id, t1.marital_status, t1.marital_status_name, t1.is_outofcontact, diff --git a/src/main/resources/static/default.html b/src/main/resources/static/default.html index c2a5ee9..f8ea3e8 100644 --- a/src/main/resources/static/default.html +++ b/src/main/resources/static/default.html @@ -255,7 +255,7 @@ top.dialog.open({ url: top.restAjax.path('route/defaultindex/include.html?partyOrganizeId={partyOrganizeId}', [partyOrganizeId]), title: '详情', - width: '1040px', + width: '1080px', height: '98%', onClose: function(data) { diff --git a/src/main/resources/static/route/defaultindex/include.html b/src/main/resources/static/route/defaultindex/include.html index 7d3e9e9..3dc647f 100644 --- a/src/main/resources/static/route/defaultindex/include.html +++ b/src/main/resources/static/route/defaultindex/include.html @@ -201,7 +201,7 @@ top.dialog.open({ url: top.restAjax.path(url, []), title: openTitle, - width: '1040px', + width: '1080px', height: '98%', onClose: function(data) { diff --git a/src/main/resources/static/route/partymemberorganize/save-partymemberorganize.html b/src/main/resources/static/route/partymemberorganize/save-partymemberorganize.html index 67e327f..aa58bb6 100644 --- a/src/main/resources/static/route/partymemberorganize/save-partymemberorganize.html +++ b/src/main/resources/static/route/partymemberorganize/save-partymemberorganize.html @@ -81,7 +81,8 @@
- + +
@@ -331,6 +332,25 @@ var wangEditorObj = {}; var viewerObj = {}; + // 点击单位类型选择输入框,弹出层方法 + $(document).on('click', '#userName', function() { + top.dialog.dialogData.oldSelectedUserList = [{userId:''}]; + top.dialog.open({ + url: 'route/common/listselectuser?selectType=radio', + title: '选择用户', + width: '1000px', + height: '500px', + onClose: function() { + var newSelectedUserList = top.dialog.dialogData.newSelectedUserList; + if(newSelectedUserList.length != 0) { + $('#userName').val(newSelectedUserList[0].userName); + $('#userId').val(newSelectedUserList[0].userId); + } + top.dialog.dialogData.oldSelectedUserList = []; + } + }); + }); + function valueFun(formData) { $("#dataForm").find('select').each(function(){ var value; diff --git a/src/main/resources/static/route/partymemberorganize/update-partymemberorganize.html b/src/main/resources/static/route/partymemberorganize/update-partymemberorganize.html index 3efde9b..98a5662 100644 --- a/src/main/resources/static/route/partymemberorganize/update-partymemberorganize.html +++ b/src/main/resources/static/route/partymemberorganize/update-partymemberorganize.html @@ -82,6 +82,7 @@
+
@@ -334,6 +335,25 @@ var wangEditorObj = {}; var viewerObj = {}; + // 点击单位类型选择输入框,弹出层方法 + $(document).on('click', '#userName', function() { + top.dialog.dialogData.oldSelectedUserList = [{userId:''}]; + top.dialog.open({ + url: 'route/common/listselectuser?selectType=radio', + title: '选择用户', + width: '1000px', + height: '500px', + onClose: function() { + var newSelectedUserList = top.dialog.dialogData.newSelectedUserList; + if(newSelectedUserList.length != 0) { + $('#userName').val(newSelectedUserList[0].userName); + $('#userId').val(newSelectedUserList[0].userId); + } + top.dialog.dialogData.oldSelectedUserList = []; + } + }); + }); + if(isView) { $('#submitBtn').hide(); }