Index: standard/project/web/src/main/java/egovframework/api/rivalWar/mappingItem/vo/MappingItemDTO.java =================================================================== diff -u -r32c1e3241b5bd53c89b02e908e386af5f44cf84f -r0e29f861752048b32bef81854eab15aeb1a2f17f --- standard/project/web/src/main/java/egovframework/api/rivalWar/mappingItem/vo/MappingItemDTO.java (.../MappingItemDTO.java) (revision 32c1e3241b5bd53c89b02e908e386af5f44cf84f) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/mappingItem/vo/MappingItemDTO.java (.../MappingItemDTO.java) (revision 0e29f861752048b32bef81854eab15aeb1a2f17f) @@ -2,11 +2,11 @@ import egovframework.com.ext.jstree.springHibernate.core.vo.JsTreeHibernateSearchDTO; import org.hibernate.annotations.*; +import org.hibernate.annotations.Cache; +import javax.persistence.*; import javax.persistence.Entity; -import javax.persistence.SequenceGenerator; import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; /** @@ -23,11 +23,6 @@ private static final long serialVersionUID = -2826589626313340365L; - /* - * Extend Bean Field - */ - private Boolean copyBooleanValue; - public MappingItemDTO() { super(); } @@ -37,6 +32,11 @@ this.copyBooleanValue = copyBooleanValue; } + /* + * Extend Bean Field + */ + private Boolean copyBooleanValue; + @Transient public Boolean getCopyBooleanValue() { copyBooleanValue = false; @@ -52,6 +52,27 @@ this.copyBooleanValue = copyBooleanValue; } + private Number mappingMenuId; + private String mappingItemName; + + @Column(name = "mapping_menu_id") + public Number getMappingMenuId() { + return mappingMenuId; + } + + public void setMappingMenuId(Number mappingMenuId) { + this.mappingMenuId = mappingMenuId; + } + + @Column(name = "mapping_item_name") + public String getMappingItemName() { + return mappingItemName; + } + + public void setMappingItemName(String mappingItemName) { + this.mappingItemName = mappingItemName; + } + @Override public void setFieldFromNewInstance(T paramInstance) { if (paramInstance instanceof MappingItemDTO) { Index: standard/project/web/src/main/java/egovframework/api/rivalWar/menu/vo/MenuDTO.java =================================================================== diff -u -rdeb1024b5def97aec34980f31afac7a748f43735 -r0e29f861752048b32bef81854eab15aeb1a2f17f --- standard/project/web/src/main/java/egovframework/api/rivalWar/menu/vo/MenuDTO.java (.../MenuDTO.java) (revision deb1024b5def97aec34980f31afac7a748f43735) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/menu/vo/MenuDTO.java (.../MenuDTO.java) (revision 0e29f861752048b32bef81854eab15aeb1a2f17f) @@ -124,9 +124,16 @@ this.compareSpecDTO = compareSpecDTO; } + private Collection mappingItemDTO; + @JsonIgnore @OneToMany(fetch=FetchType.EAGER, cascade = CascadeType.ALL) - @JoinColumn(name="MENU_ID") - private Collection phone; + @JoinColumn(name="MAPPING_ITEM_ID") + public Collection getMappingItemDTO() { + return mappingItemDTO; + } + public void setMappingItemDTO(Collection mappingItemDTO) { + this.mappingItemDTO = mappingItemDTO; + } }