Index: web-module/src/main/java/egovframework/api/arms/module_armsmaker/controller/UserArmsMakerController.java =================================================================== diff -u -rd7698afe04b9bc7fdcca30f52ccc39a8f9b1b2c1 -r04d476e7b11750225742b279481472eccbe37795 --- web-module/src/main/java/egovframework/api/arms/module_armsmaker/controller/UserArmsMakerController.java (.../UserArmsMakerController.java) (revision d7698afe04b9bc7fdcca30f52ccc39a8f9b1b2c1) +++ web-module/src/main/java/egovframework/api/arms/module_armsmaker/controller/UserArmsMakerController.java (.../UserArmsMakerController.java) (revision 04d476e7b11750225742b279481472eccbe37795) @@ -213,19 +213,19 @@ } @ResponseBody - @RequestMapping(value = {"/module_reqstatus.do"},method = {RequestMethod.GET}) - public ModelAndView module_reqstatus( + @RequestMapping(value = {"/module_reqadd_status.do"},method = {RequestMethod.GET}) + public ModelAndView module_reqadd_status( ComprehensiveTree comprehensiveTree, ModelMap model, HttpServletRequest request) throws Exception { - logger.info("UserArmsMakerController :: module_reqstatus :: tableName = T_ARMS_REQSTATUS"); + logger.info("UserArmsMakerController :: module_reqadd_status :: tableName = T_ARMS_REQADD_STATUS"); ArmsInstallDB_SqlMaaperDTO armsInstallDB_sqlMaaperDTO = new ArmsInstallDB_SqlMaaperDTO(); - armsInstallDB_sqlMaaperDTO.setC_title("T_ARMS_REQSTATUS"); - armsInstallDB_sqlMaaperDTO.setSqlMapSelector("arms-reqstatus"); + armsInstallDB_sqlMaaperDTO.setC_title("T_ARMS_REQADD_STATUS"); + armsInstallDB_sqlMaaperDTO.setSqlMapSelector("arms-reqadd-status-template"); reqStatusTemplateInstallDB.sqlMapExecute(armsInstallDB_sqlMaaperDTO); ModelAndView modelAndView = new ModelAndView("jsonView"); - modelAndView.addObject("result", "module_reqstatus"); + modelAndView.addObject("result", "module_reqadd_status"); return modelAndView; } Index: web-module/src/main/java/egovframework/api/arms/module_armsmaker/service/ReqStatusTemplateInstallDBImpl.java =================================================================== diff -u -rd7698afe04b9bc7fdcca30f52ccc39a8f9b1b2c1 -r04d476e7b11750225742b279481472eccbe37795 --- web-module/src/main/java/egovframework/api/arms/module_armsmaker/service/ReqStatusTemplateInstallDBImpl.java (.../ReqStatusTemplateInstallDBImpl.java) (revision d7698afe04b9bc7fdcca30f52ccc39a8f9b1b2c1) +++ web-module/src/main/java/egovframework/api/arms/module_armsmaker/service/ReqStatusTemplateInstallDBImpl.java (.../ReqStatusTemplateInstallDBImpl.java) (revision 04d476e7b11750225742b279481472eccbe37795) @@ -49,9 +49,9 @@ private void makeTrigger(ComprehensiveTree comprehensiveTree) throws SQLException { - String addColums =",c_pdservice_link,c_version_link,c_jira_link,c_req_link,c_jira_version_link,c_jira_req_link,c_jira_req_linkingissue,c_jira_req_subtaskissue"; - String addOldColums =",:old.c_pdservice_link,:old.c_version_link,:old.c_jira_link,:old.c_req_link,:old.c_jira_version_link,:old.c_jira_req_link,:old.c_jira_req_linkingissue,:old.c_jira_req_subtaskissue"; - String addNewColums =",:new.c_pdservice_link,:new.c_version_link,:new.c_jira_link,:new.c_req_link,:new.c_jira_version_link,:new.c_jira_req_link,:new.c_jira_req_linkingissue,:new.c_jira_req_subtaskissue"; + String addColums =",c_pdservice_link,c_pdservice_name,c_version_link,c_version_name,c_jira_project_link,c_jira_project_name,c_jira_project_url,c_jira_version_link,c_jira_version_name,c_jira_version_url,c_req_link,c_req_name,c_jira_req_issue_link,c_jira_req_issue_key,c_jira_req_issue_id,c_jira_req_priority_link,c_jira_req_priority_url,c_jira_req_priority_name,c_jira_req_status_link,c_jira_req_status_url,c_jira_req_status_name,c_jira_req_linkingissue,c_jira_req_subtaskissue"; + String addOldColums =",:old.c_pdservice_link,:old.c_pdservice_name,:old.c_version_link,:old.c_version_name,:old.c_jira_project_link,:old.c_jira_project_name,:old.c_jira_project_url,:old.c_jira_version_link,:old.c_jira_version_name,:old.c_jira_version_url,:old.c_req_link,:old.c_req_name,:old.c_jira_req_issue_link,:old.c_jira_req_issue_key,:old.c_jira_req_issue_id,:old.c_jira_req_priority_link,:old.c_jira_req_priority_url,:old.c_jira_req_priority_name,:old.c_jira_req_status_link,:old.c_jira_req_status_url,:old.c_jira_req_status_name,:old.c_jira_req_linkingissue,:old.c_jira_req_subtaskissue"; + String addNewColums =",:new.c_pdservice_link,:new.c_pdservice_name,:new.c_version_link,:new.c_version_name,:new.c_jira_project_link,:new.c_jira_project_name,:new.c_jira_project_url,:new.c_jira_version_link,:new.c_jira_version_name,:new.c_jira_version_url,:new.c_req_link,:new.c_req_name,:new.c_jira_req_issue_link,:new.c_jira_req_issue_key,:new.c_jira_req_issue_id,:new.c_jira_req_priority_link,:new.c_jira_req_priority_url,:new.c_jira_req_priority_name,:new.c_jira_req_status_link,:new.c_jira_req_status_url,:new.c_jira_req_status_name,:new.c_jira_req_linkingissue,:new.c_jira_req_subtaskissue"; Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement(); Index: web-module/src/main/java/egovframework/api/arms/module_reqadd_status/model/ReqAdd_StatusDTO.java =================================================================== diff -u -rfc09276ba0fe90fd86af3bffef3a4afc743ced9b -r04d476e7b11750225742b279481472eccbe37795 --- web-module/src/main/java/egovframework/api/arms/module_reqadd_status/model/ReqAdd_StatusDTO.java (.../ReqAdd_StatusDTO.java) (revision fc09276ba0fe90fd86af3bffef3a4afc743ced9b) +++ web-module/src/main/java/egovframework/api/arms/module_reqadd_status/model/ReqAdd_StatusDTO.java (.../ReqAdd_StatusDTO.java) (revision 04d476e7b11750225742b279481472eccbe37795) @@ -39,61 +39,269 @@ } //@Getter @Setter - @Column(name = "c_pdservice_link") private Long c_pdservice_link; @Column(name = "c_pdservice_name") private String c_pdservice_name; + @Column(name = "c_version_link") - private String c_version_link; + private Long c_version_link; @Column(name = "c_version_name") private String c_version_name; + @Column(name = "c_jira_project_link") - private String c_jira_project_link; + private Long c_jira_project_link; @Column(name = "c_jira_project_name") private String c_jira_project_name; + @Column(name = "c_jira_project_url") + private String c_jira_project_url; + + @Column(name = "c_jira_version_link") - private String c_jira_version_link; + private Long c_jira_version_link; @Column(name = "c_jira_version_name") private String c_jira_version_name; + @Column(name = "c_jira_version_url") + private String c_jira_version_url; + + @Column(name = "c_req_link") private String c_req_link; @Column(name = "c_req_name") private String c_req_name; + @Column(name = "c_jira_req_issue_link") private String c_jira_req_issue_link; @Column(name = "c_jira_req_issue_key") private String c_jira_req_issue_key; + @Column(name = "c_jira_req_issue_id") + private String c_jira_req_issue_id; + + @Column(name = "c_jira_req_priority_link") private Long c_jira_req_priority_link; + @Column(name = "c_jira_req_priority_url") + private String c_jira_req_priority_url; + @Column(name = "c_jira_req_priority_name") private String c_jira_req_priority_name; + @Column(name = "c_jira_req_status_link") private Long c_jira_req_status_link; + @Column(name = "c_jira_req_status_url") + private String c_jira_req_status_url; + @Column(name = "c_jira_req_status_name") private String c_jira_req_status_name; + + @Lob @Column(name = "c_jira_req_linkingissue") private String c_jira_req_linkingissue; + @Lob @Column(name = "c_jira_req_subtaskissue") private String c_jira_req_subtaskissue; + public Long getC_pdservice_link() { + return c_pdservice_link; + } + + public void setC_pdservice_link(Long c_pdservice_link) { + this.c_pdservice_link = c_pdservice_link; + } + + public String getC_pdservice_name() { + return c_pdservice_name; + } + + public void setC_pdservice_name(String c_pdservice_name) { + this.c_pdservice_name = c_pdservice_name; + } + + public Long getC_version_link() { + return c_version_link; + } + + public void setC_version_link(Long c_version_link) { + this.c_version_link = c_version_link; + } + + public String getC_version_name() { + return c_version_name; + } + + public void setC_version_name(String c_version_name) { + this.c_version_name = c_version_name; + } + + public Long getC_jira_project_link() { + return c_jira_project_link; + } + + public void setC_jira_project_link(Long c_jira_project_link) { + this.c_jira_project_link = c_jira_project_link; + } + + public String getC_jira_project_name() { + return c_jira_project_name; + } + + public void setC_jira_project_name(String c_jira_project_name) { + this.c_jira_project_name = c_jira_project_name; + } + + public String getC_jira_project_url() { + return c_jira_project_url; + } + + public void setC_jira_project_url(String c_jira_project_url) { + this.c_jira_project_url = c_jira_project_url; + } + + public Long getC_jira_version_link() { + return c_jira_version_link; + } + + public void setC_jira_version_link(Long c_jira_version_link) { + this.c_jira_version_link = c_jira_version_link; + } + + public String getC_jira_version_name() { + return c_jira_version_name; + } + + public void setC_jira_version_name(String c_jira_version_name) { + this.c_jira_version_name = c_jira_version_name; + } + + public String getC_jira_version_url() { + return c_jira_version_url; + } + + public void setC_jira_version_url(String c_jira_version_url) { + this.c_jira_version_url = c_jira_version_url; + } + + public String getC_req_link() { + return c_req_link; + } + + public void setC_req_link(String c_req_link) { + this.c_req_link = c_req_link; + } + + public String getC_req_name() { + return c_req_name; + } + + public void setC_req_name(String c_req_name) { + this.c_req_name = c_req_name; + } + + public String getC_jira_req_issue_link() { + return c_jira_req_issue_link; + } + + public void setC_jira_req_issue_link(String c_jira_req_issue_link) { + this.c_jira_req_issue_link = c_jira_req_issue_link; + } + + public String getC_jira_req_issue_key() { + return c_jira_req_issue_key; + } + + public void setC_jira_req_issue_key(String c_jira_req_issue_key) { + this.c_jira_req_issue_key = c_jira_req_issue_key; + } + + public String getC_jira_req_issue_id() { + return c_jira_req_issue_id; + } + + public void setC_jira_req_issue_id(String c_jira_req_issue_id) { + this.c_jira_req_issue_id = c_jira_req_issue_id; + } + + public Long getC_jira_req_priority_link() { + return c_jira_req_priority_link; + } + + public void setC_jira_req_priority_link(Long c_jira_req_priority_link) { + this.c_jira_req_priority_link = c_jira_req_priority_link; + } + + public String getC_jira_req_priority_url() { + return c_jira_req_priority_url; + } + + public void setC_jira_req_priority_url(String c_jira_req_priority_url) { + this.c_jira_req_priority_url = c_jira_req_priority_url; + } + + public String getC_jira_req_priority_name() { + return c_jira_req_priority_name; + } + + public void setC_jira_req_priority_name(String c_jira_req_priority_name) { + this.c_jira_req_priority_name = c_jira_req_priority_name; + } + + public Long getC_jira_req_status_link() { + return c_jira_req_status_link; + } + + public void setC_jira_req_status_link(Long c_jira_req_status_link) { + this.c_jira_req_status_link = c_jira_req_status_link; + } + + public String getC_jira_req_status_url() { + return c_jira_req_status_url; + } + + public void setC_jira_req_status_url(String c_jira_req_status_url) { + this.c_jira_req_status_url = c_jira_req_status_url; + } + + public String getC_jira_req_status_name() { + return c_jira_req_status_name; + } + + public void setC_jira_req_status_name(String c_jira_req_status_name) { + this.c_jira_req_status_name = c_jira_req_status_name; + } + + public String getC_jira_req_linkingissue() { + return c_jira_req_linkingissue; + } + + public void setC_jira_req_linkingissue(String c_jira_req_linkingissue) { + this.c_jira_req_linkingissue = c_jira_req_linkingissue; + } + + public String getC_jira_req_subtaskissue() { + return c_jira_req_subtaskissue; + } + + public void setC_jira_req_subtaskissue(String c_jira_req_subtaskissue) { + this.c_jira_req_subtaskissue = c_jira_req_subtaskissue; + } + /* * Extend Bean Field */ Index: web-module/src/main/resources/egovframework/sqlmap/com/ext/jstree/springiBatis/aRMS_ReqAdd_Status_Template_SQL_Oracle_iBatis.xml =================================================================== diff -u -rfc09276ba0fe90fd86af3bffef3a4afc743ced9b -r04d476e7b11750225742b279481472eccbe37795 --- web-module/src/main/resources/egovframework/sqlmap/com/ext/jstree/springiBatis/aRMS_ReqAdd_Status_Template_SQL_Oracle_iBatis.xml (.../aRMS_ReqAdd_Status_Template_SQL_Oracle_iBatis.xml) (revision fc09276ba0fe90fd86af3bffef3a4afc743ced9b) +++ web-module/src/main/resources/egovframework/sqlmap/com/ext/jstree/springiBatis/aRMS_ReqAdd_Status_Template_SQL_Oracle_iBatis.xml (.../aRMS_ReqAdd_Status_Template_SQL_Oracle_iBatis.xml) (revision 04d476e7b11750225742b279481472eccbe37795) @@ -17,8 +17,10 @@ c_pdservice_link NUMBER, c_pdservice_name VARCHAR2(4000 BYTE), + c_version_link NUMBER, c_version_name VARCHAR2(4000 BYTE), + c_jira_project_link NUMBER, c_jira_project_name VARCHAR2(4000 BYTE), c_jira_project_url VARCHAR2(4000 BYTE), @@ -32,14 +34,19 @@ c_jira_req_issue_link VARCHAR2(4000 BYTE), c_jira_req_issue_key VARCHAR2(4000 BYTE), + c_jira_req_issue_id VARCHAR2(4000 BYTE), + c_jira_req_priority_link NUMBER, c_jira_req_priority_name VARCHAR2(4000 BYTE), + c_jira_req_priority_url VARCHAR2(4000 BYTE), c_jira_req_status_link NUMBER, c_jira_req_status_name VARCHAR2(4000 BYTE), - c_jira_req_linkingissue VARCHAR2(4000 BYTE), - c_jira_req_subtaskissue VARCHAR2(4000 BYTE), + c_jira_req_status_url VARCHAR2(4000 BYTE), + c_jira_req_linkingissue CLOB, + c_jira_req_subtaskissue CLOB, + CONSTRAINT $c_title$_PK PRIMARY KEY (C_ID) /* * CONSTRAINT T_ARMS_REQADD_FK1 FOREIGN KEY (OTHER_ID) REFERENCES OTHER T_ARMS_REQADD(C_ID) ON DELETE CASCADE @@ -117,8 +124,10 @@ c_pdservice_link NUMBER, c_pdservice_name VARCHAR2(4000 BYTE), + c_version_link NUMBER, c_version_name VARCHAR2(4000 BYTE), + c_jira_project_link NUMBER, c_jira_project_name VARCHAR2(4000 BYTE), c_jira_project_url VARCHAR2(4000 BYTE), @@ -132,14 +141,19 @@ c_jira_req_issue_link VARCHAR2(4000 BYTE), c_jira_req_issue_key VARCHAR2(4000 BYTE), + c_jira_req_issue_id VARCHAR2(4000 BYTE), + c_jira_req_priority_link NUMBER, c_jira_req_priority_name VARCHAR2(4000 BYTE), + c_jira_req_priority_url VARCHAR2(4000 BYTE), c_jira_req_status_link NUMBER, c_jira_req_status_name VARCHAR2(4000 BYTE), - c_jira_req_linkingissue VARCHAR2(4000 BYTE), - c_jira_req_subtaskissue VARCHAR2(4000 BYTE) + c_jira_req_status_url VARCHAR2(4000 BYTE), + c_jira_req_linkingissue CLOB, + c_jira_req_subtaskissue CLOB + ) FishEye: Tag 04d476e7b11750225742b279481472eccbe37795 refers to a dead (removed) revision in file `web-module/src/main/resources/egovframework/sqlmap/com/ext/jstree/springiBatis/aRMS_ReqStatus_SQL_Oracle_iBatis.xml'. FishEye: No comparison available. Pass `N' to diff? Index: web-module/src/main/resources/egovframework/sqlmap/config/oracle/sql-map-config-oracle-ext-arms.xml =================================================================== diff -u -rfc09276ba0fe90fd86af3bffef3a4afc743ced9b -r04d476e7b11750225742b279481472eccbe37795 --- web-module/src/main/resources/egovframework/sqlmap/config/oracle/sql-map-config-oracle-ext-arms.xml (.../sql-map-config-oracle-ext-arms.xml) (revision fc09276ba0fe90fd86af3bffef3a4afc743ced9b) +++ web-module/src/main/resources/egovframework/sqlmap/config/oracle/sql-map-config-oracle-ext-arms.xml (.../sql-map-config-oracle-ext-arms.xml) (revision 04d476e7b11750225742b279481472eccbe37795) @@ -17,6 +17,5 @@ -