Index: standard/project/web/script/ddl/oracle/egovframework/api/rivalWar/compareInfo/CompareInfo_DDL_Oracle.sql =================================================================== diff -u -r7e22b1924690824a27bb65043fd111a7861c35d3 -r5d19fb68373fc2f0ed0f300440a2244c3baa8999 --- standard/project/web/script/ddl/oracle/egovframework/api/rivalWar/compareInfo/CompareInfo_DDL_Oracle.sql (.../CompareInfo_DDL_Oracle.sql) (revision 7e22b1924690824a27bb65043fd111a7861c35d3) +++ standard/project/web/script/ddl/oracle/egovframework/api/rivalWar/compareInfo/CompareInfo_DDL_Oracle.sql (.../CompareInfo_DDL_Oracle.sql) (revision 5d19fb68373fc2f0ed0f300440a2244c3baa8999) @@ -44,6 +44,8 @@ C_TITLE VARCHAR2(4000 BYTE), C_TYPE VARCHAR2(4000 BYTE), + CAL_TIME VARCHAR2(4000 BYTE), + TOP_IMAGE_URL_1 VARCHAR2(4000 BYTE), TOP_IMAGE_URL_2 VARCHAR2(4000 BYTE), TOP_IMAGE_URL_3 VARCHAR2(4000 BYTE), @@ -123,6 +125,7 @@ COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.C_TITLE IS '노드 명'; COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.C_TYPE IS '노드 타입'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.CAL_TIME IS '누적 집계 시간'; COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.TOP_IMAGE_URL_1 IS '상위 대표 이미지'; COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.TOP_IMAGE_URL_2 IS '상위 서브 이미지'; COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.TOP_IMAGE_URL_3 IS '상위 테일 이미지'; Index: standard/project/web/script/dml/oracle/egovframework/api/rivalWar/compareInfo/CompareInfo_Data_Script_Oracle.sql =================================================================== diff -u -r7e22b1924690824a27bb65043fd111a7861c35d3 -r5d19fb68373fc2f0ed0f300440a2244c3baa8999 --- standard/project/web/script/dml/oracle/egovframework/api/rivalWar/compareInfo/CompareInfo_Data_Script_Oracle.sql (.../CompareInfo_Data_Script_Oracle.sql) (revision 7e22b1924690824a27bb65043fd111a7861c35d3) +++ standard/project/web/script/dml/oracle/egovframework/api/rivalWar/compareInfo/CompareInfo_Data_Script_Oracle.sql (.../CompareInfo_Data_Script_Oracle.sql) (revision 5d19fb68373fc2f0ed0f300440a2244c3baa8999) @@ -1,5 +1,5 @@ Insert into T_JSTREE_COMPARE_INFO - ( C_ID, C_PARENTID, C_POSITION, C_LEFT, C_RIGHT, C_LEVEL, C_TITLE, C_TYPE, + ( C_ID, C_PARENTID, C_POSITION, C_LEFT, C_RIGHT, C_LEVEL, C_TITLE, C_TYPE, CAL_TIME, TOP_IMAGE_URL_1, TOP_IMAGE_URL_2, TOP_IMAGE_URL_3, TOP_VENDER_URL , TOP_VENDER_TEXT, TOP_POST1_ICON , TOP_POST1_URL , TOP_POST1_TEXT , TOP_POST2_ICON , TOP_POST2_URL , TOP_POST2_TEXT , TOP_POST3_ICON , TOP_POST3_URL , TOP_POST3_TEXT , TOP_POST4_ICON , TOP_POST4_URL , TOP_POST4_TEXT , @@ -13,7 +13,7 @@ BOT_POST3_ICON , BOT_POST3_URL , BOT_POST3_TEXT , BOT_POST4_ICON , BOT_POST4_URL , BOT_POST4_TEXT , BOT_POST5_ICON , BOT_POST5_URL , BOT_POST5_TEXT ) Values - ( 1, 0, 0, 1, 8, 0, 'Root Node', 'root', + ( 1, 0, 0, 1, 8, 0, 'Root Node', 'root', '', 'http', 'http', 'http', 'http', 'text', 'icon', 'http', 'text', 'icon', 'http', 'text', 'icon', 'http', 'text', 'icon', 'http', 'text', @@ -28,7 +28,7 @@ 'icon', 'http', 'text'); Insert into T_JSTREE_COMPARE_INFO - ( C_ID, C_PARENTID, C_POSITION, C_LEFT, C_RIGHT, C_LEVEL, C_TITLE, C_TYPE, + ( C_ID, C_PARENTID, C_POSITION, C_LEFT, C_RIGHT, C_LEVEL, C_TITLE, C_TYPE, CAL_TIME, TOP_IMAGE_URL_1, TOP_IMAGE_URL_2, TOP_IMAGE_URL_3, TOP_VENDER_URL , TOP_VENDER_TEXT, TOP_POST1_ICON , TOP_POST1_URL , TOP_POST1_TEXT , TOP_POST2_ICON , TOP_POST2_URL , TOP_POST2_TEXT , TOP_POST3_ICON , TOP_POST3_URL , TOP_POST3_TEXT , TOP_POST4_ICON , TOP_POST4_URL , TOP_POST4_TEXT , @@ -42,7 +42,7 @@ BOT_POST3_ICON , BOT_POST3_URL , BOT_POST3_TEXT , BOT_POST4_ICON , BOT_POST4_URL , BOT_POST4_TEXT , BOT_POST5_ICON , BOT_POST5_URL , BOT_POST5_TEXT ) Values - ( 2, 1, 0, 2, 7, 1, 'First Child', 'drive', + ( 2, 1, 0, 2, 7, 1, 'First Child', 'drive', '', 'http', 'http', 'http', 'http', 'text', 'icon', 'http', 'text', 'icon', 'http', 'text', 'icon', 'http', 'text', 'icon', 'http', 'text', @@ -57,7 +57,7 @@ 'icon', 'http', 'text'); Insert into T_JSTREE_COMPARE_INFO - ( C_ID, C_PARENTID, C_POSITION, C_LEFT, C_RIGHT, C_LEVEL, C_TITLE, C_TYPE, + ( C_ID, C_PARENTID, C_POSITION, C_LEFT, C_RIGHT, C_LEVEL, C_TITLE, C_TYPE, CAL_TIME, TOP_IMAGE_URL_1, TOP_IMAGE_URL_2, TOP_IMAGE_URL_3, TOP_VENDER_URL , TOP_VENDER_TEXT, TOP_POST1_ICON , TOP_POST1_URL , TOP_POST1_TEXT , TOP_POST2_ICON , TOP_POST2_URL , TOP_POST2_TEXT , TOP_POST3_ICON , TOP_POST3_URL , TOP_POST3_TEXT , TOP_POST4_ICON , TOP_POST4_URL , TOP_POST4_TEXT , @@ -71,7 +71,7 @@ BOT_POST3_ICON , BOT_POST3_URL , BOT_POST3_TEXT , BOT_POST4_ICON , BOT_POST4_URL , BOT_POST4_TEXT , BOT_POST5_ICON , BOT_POST5_URL , BOT_POST5_TEXT ) Values - ( 3, 2, 0, 3, 4, 2, 'Leaf Node', 'default', + ( 3, 2, 0, 3, 4, 2, 'Leaf Node', 'default', '', 'http', 'http', 'http', 'http', 'text', 'icon', 'http', 'text', 'icon', 'http', 'text', 'icon', 'http', 'text', 'icon', 'http', 'text', @@ -86,7 +86,7 @@ 'icon', 'http', 'text'); Insert into T_JSTREE_COMPARE_INFO - ( C_ID, C_PARENTID, C_POSITION, C_LEFT, C_RIGHT, C_LEVEL, C_TITLE, C_TYPE, + ( C_ID, C_PARENTID, C_POSITION, C_LEFT, C_RIGHT, C_LEVEL, C_TITLE, C_TYPE, CAL_TIME, TOP_IMAGE_URL_1, TOP_IMAGE_URL_2, TOP_IMAGE_URL_3, TOP_VENDER_URL , TOP_VENDER_TEXT, TOP_POST1_ICON , TOP_POST1_URL , TOP_POST1_TEXT , TOP_POST2_ICON , TOP_POST2_URL , TOP_POST2_TEXT , TOP_POST3_ICON , TOP_POST3_URL , TOP_POST3_TEXT , TOP_POST4_ICON , TOP_POST4_URL , TOP_POST4_TEXT , @@ -100,7 +100,7 @@ BOT_POST3_ICON , BOT_POST3_URL , BOT_POST3_TEXT , BOT_POST4_ICON , BOT_POST4_URL , BOT_POST4_TEXT , BOT_POST5_ICON , BOT_POST5_URL , BOT_POST5_TEXT ) Values - ( 4, 2, 1, 5, 6, 2, 'Branch Node', 'folder', + ( 4, 2, 1, 5, 6, 2, 'Branch Node', 'folder', '', 'http', 'http', 'http', 'http', 'text', 'icon', 'http', 'text', 'icon', 'http', 'text', 'icon', 'http', 'text', 'icon', 'http', 'text', Index: standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/vo/CompareInfoDTO.java =================================================================== diff -u -r7e22b1924690824a27bb65043fd111a7861c35d3 -r5d19fb68373fc2f0ed0f300440a2244c3baa8999 --- standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/vo/CompareInfoDTO.java (.../CompareInfoDTO.java) (revision 7e22b1924690824a27bb65043fd111a7861c35d3) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/vo/CompareInfoDTO.java (.../CompareInfoDTO.java) (revision 5d19fb68373fc2f0ed0f300440a2244c3baa8999) @@ -57,6 +57,16 @@ this.copyBooleanValue = copyBooleanValue; } + private String calTime; + @Column(name = "cal_time") + public String getCalTime() { + return calTime; + } + + public void setCalTime(String calTime) { + this.calTime = calTime; + } + //image url, vender info ( etc ), //link url 1 ~ 5 private String topImageUrl1; @@ -683,6 +693,9 @@ @Override public void setFieldFromNewInstance(T paramInstance) { if (paramInstance instanceof CompareInfoDTO) { + + this.setCalTime(((CompareInfoDTO) paramInstance).getCalTime()); + //top this.setTopImageUrl1(((CompareInfoDTO) paramInstance).getTopImageUrl1()); this.setTopImageUrl2(((CompareInfoDTO) paramInstance).getTopImageUrl2()); Index: standard/project/web/src/main/webapp/WEB-INF/jsp/egovframework/api/rivalWar/compareInfo/JsTreeView.jsp =================================================================== diff -u -r7e22b1924690824a27bb65043fd111a7861c35d3 -r5d19fb68373fc2f0ed0f300440a2244c3baa8999 --- standard/project/web/src/main/webapp/WEB-INF/jsp/egovframework/api/rivalWar/compareInfo/JsTreeView.jsp (.../JsTreeView.jsp) (revision 7e22b1924690824a27bb65043fd111a7861c35d3) +++ standard/project/web/src/main/webapp/WEB-INF/jsp/egovframework/api/rivalWar/compareInfo/JsTreeView.jsp (.../JsTreeView.jsp) (revision 5d19fb68373fc2f0ed0f300440a2244c3baa8999) @@ -338,6 +338,7 @@ c_title c_type + calTime topImageUrl1 topImageUrl2 topImageUrl3 @@ -424,6 +425,7 @@ d.c_title = d.data.default.c_title; d.c_type = d.data.default.c_type; + d.calTime = d.data.default.calTime; d.topImageUrl1 = d.data.default.topImageUrl1; d.topImageUrl2 = d.data.default.topImageUrl2; d.topImageUrl3 = d.data.default.topImageUrl3; @@ -507,6 +509,8 @@ },{ label: "c_type:", name: "c_type" },{ + label: "calTime:", name: "calTime" + },{ label: "topImageUrl1:", name: "topImageUrl1" },{ label: "topImageUrl2:", name: "topImageUrl2" @@ -657,6 +661,7 @@ {"data": "c_title"}, {"data": "c_type"}, + {"data": "calTime"}, {"data": "topImageUrl1"}, {"data": "topImageUrl2"}, {"data": "topImageUrl3"},