diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/User.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/User.java index 06818bb9d..54de28f63 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/User.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/User.java @@ -13,6 +13,11 @@ public class User extends BusinessObject { private static final long serialVersionUID = ConstSerializable.serialVersionUID; private String identifier; + private String name; + private String firstName; + private String lastName; + private String middleName; + private String email; public String getIdentifier() { return identifier; @@ -21,4 +26,44 @@ public class User extends BusinessObject { public void setIdentifier(String value) { this.identifier = value; } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getMiddleName() { + return middleName; + } + + public void setMiddleName(String middleName) { + this.middleName = middleName; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } } \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/UserMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/UserMapStore.java index 7a27be31c..c63197d6f 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/UserMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/UserMapStore.java @@ -30,7 +30,7 @@ public class UserMapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "CREATED_AT", "UPDATED_AT", "IDENTIFIER" + "ID", "CREATED_AT", "UPDATED_AT", "IDENTIFIER", "NAME", "FIRST_NAME", "LAST_NAME", "MIDDLE_NAME", "EMAIL", }; } @@ -41,6 +41,11 @@ public class UserMapStore extends TemplateMapStore { object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT")); object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT")); object.setIdentifier(resultSet.getObject("IDENTIFIER", String.class)); + object.setName(resultSet.getObject("NAME", String.class)); + object.setFirstName(resultSet.getObject("FIRST_NAME", String.class)); + object.setLastName(resultSet.getObject("LAST_NAME", String.class)); + object.setMiddleName(resultSet.getObject("MIDDLE_NAME", String.class)); + object.setEmail(resultSet.getObject("EMAIL", String.class)); return object; } @@ -50,7 +55,12 @@ public class UserMapStore extends TemplateMapStore { object.getId(), TimeUtil.toDateFromInstant(object.getCreated()), TimeUtil.toDateFromInstant(object.getUpdated()), - object.getIdentifier() + object.getIdentifier(), + object.getName(), + object.getFirstName(), + object.getLastName(), + object.getMiddleName(), + object.getEmail() }; return args; }