Index: web-module/src/main/java/egovframework/api/arms/module_armsmaker/service/ReqAddTemplateInstallDBImpl.java =================================================================== diff -u -ref0cae1a3da03bd8e051eabd4a5e986f2714405e -r40ee4cc668440606ad86dc3b02bcb5b68d5da366 --- web-module/src/main/java/egovframework/api/arms/module_armsmaker/service/ReqAddTemplateInstallDBImpl.java (.../ReqAddTemplateInstallDBImpl.java) (revision ef0cae1a3da03bd8e051eabd4a5e986f2714405e) +++ web-module/src/main/java/egovframework/api/arms/module_armsmaker/service/ReqAddTemplateInstallDBImpl.java (.../ReqAddTemplateInstallDBImpl.java) (revision 40ee4cc668440606ad86dc3b02bcb5b68d5da366) @@ -49,9 +49,9 @@ private void makeTrigger(ComprehensiveTree comprehensiveTree) throws SQLException { - String addColums =",c_pdservice_link,c_pdservice_name,c_version_link,c_version_name,c_jira_project_link,c_jira_project_name,c_jira_version_link,c_jira_version_name,c_jira_req_issue_link,c_jira_req_issue_key,c_jira_req_priority_link,c_jira_req_priority_name,c_jira_req_status_link,c_jira_req_status_name,c_jira_req_linkingissue,c_jira_req_subtaskissue,c_reviewer01,c_reviewer02,c_reviewer03,c_reviewer04,c_reviewer05,c_reviewer01_status,c_reviewer02_status,c_reviewer03_status,c_reviewer04_status,c_reviewer05_status,c_writer,c_writer_date,c_contents"; - 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_version_link,:old.c_jira_version_name,:old.c_jira_req_issue_link,:old.c_jira_req_issue_key,:old.c_jira_req_priority_link,:old.c_jira_req_priority_name,:old.c_jira_req_status_link,:old.c_jira_req_status_name,:old.c_jira_req_linkingissue,:old.c_jira_req_subtaskissue,:old.c_reviewer01,:old.c_reviewer02,:old.c_reviewer03,:old.c_reviewer04,:old.c_reviewer05,:old.c_reviewer01_status,:old.c_reviewer02_status,:old.c_reviewer03_status,:old.c_reviewer04_status,:old.c_reviewer05_status,:old.c_writer,:old.c_writer_date,:old.c_contents"; - 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_version_link,:new.c_jira_version_name,:new.c_jira_req_issue_link,:new.c_jira_req_issue_key,:new.c_jira_req_priority_link,:new.c_jira_req_priority_name,:new.c_jira_req_status_link,:new.c_jira_req_status_name,:new.c_jira_req_linkingissue,:new.c_jira_req_subtaskissue,:new.c_reviewer01,:new.c_reviewer02,:new.c_reviewer03,:new.c_reviewer04,:new.c_reviewer05,:new.c_reviewer01_status,:new.c_reviewer02_status,:new.c_reviewer03_status,:new.c_reviewer04_status,:new.c_reviewer05_status,:new.c_writer,:new.c_writer_date,:new.c_contents"; + String addColums =",C_PDSERVICE_LINK,C_VERSION_LINK,C_JIRA_LINK,C_JIRA_VER_LINK,C_ISSUE_LINK,C_REVIEWER01,C_REVIEWER01_STATUS,C_REVIEWER02,C_REVIEWER02_STATUS,C_REVIEWER03,C_REVIEWER03_STATUS,C_REVIEWER04,C_REVIEWER04_STATUS,C_REVIEWER05,C_REVIEWER05_STATUS,C_WRITER,C_WRITER_DATE,C_PRIORITY,C_REQ_STATUS,C_CONTENTS"; + String addOldColums =",:old.C_PDSERVICE_LINK,:old.C_VERSION_LINK,:old.C_JIRA_LINK,:old.C_JIRA_VER_LINK,:old.C_ISSUE_LINK,:old.C_REVIEWER01,:old.C_REVIEWER01_STATUS,:old.C_REVIEWER02,:old.C_REVIEWER02_STATUS,:old.C_REVIEWER03,:old.C_REVIEWER03_STATUS,:old.C_REVIEWER04,:old.C_REVIEWER04_STATUS,:old.C_REVIEWER05,:old.C_REVIEWER05_STATUS,:old.C_WRITER,:old.C_WRITER_DATE,:old.C_PRIORITY,:old.C_REQ_STATUS,:old.C_CONTENTS"; + String addNewColums =",:new.C_PDSERVICE_LINK,:new.C_VERSION_LINK,:new.C_JIRA_LINK,:new.C_JIRA_VER_LINK,:new.C_ISSUE_LINK,:new.C_REVIEWER01,:new.C_REVIEWER01_STATUS,:new.C_REVIEWER02,:new.C_REVIEWER02_STATUS,:new.C_REVIEWER03,:new.C_REVIEWER03_STATUS,:new.C_REVIEWER04,:new.C_REVIEWER04_STATUS,:new.C_REVIEWER05,:new.C_REVIEWER05_STATUS,:new.C_WRITER,:new.C_WRITER_DATE,:new.C_PRIORITY,:new.C_REQ_STATUS,:new.C_CONTENTS"; Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement(); Index: web-module/src/main/java/egovframework/api/arms/module_armsscheduler/service/ArmsSchedulerImpl.java =================================================================== diff -u -rfc09276ba0fe90fd86af3bffef3a4afc743ced9b -r40ee4cc668440606ad86dc3b02bcb5b68d5da366 --- web-module/src/main/java/egovframework/api/arms/module_armsscheduler/service/ArmsSchedulerImpl.java (.../ArmsSchedulerImpl.java) (revision fc09276ba0fe90fd86af3bffef3a4afc743ced9b) +++ web-module/src/main/java/egovframework/api/arms/module_armsscheduler/service/ArmsSchedulerImpl.java (.../ArmsSchedulerImpl.java) (revision 40ee4cc668440606ad86dc3b02bcb5b68d5da366) @@ -89,7 +89,7 @@ logger.info("project -> " + project.getSelf()); boolean anyMatch = list.stream().anyMatch(dto -> - StringUtils.equals(dto.getC_jira_link(), project.getSelf().toString()) + StringUtils.equals(dto.getC_jira_key(), project.getKey()) ); if(anyMatch){ @@ -106,10 +106,6 @@ pdServiceJiraDTO.setC_jira_name(projectDetail.getName()); pdServiceJiraDTO.setC_jira_link(projectDetail.getSelf().toString()); pdServiceJiraDTO.setC_contents(projectDetail.getDescription()); - pdServiceJiraDTO.setC_jira_avatar_16(projectDetail.getComponents().toString()); - pdServiceJiraDTO.setC_jira_avatar_24(projectDetail.getIssueTypes().toString()); - pdServiceJiraDTO.setC_jira_avatar_32(projectDetail.getProjectRoles().toString()); - pdServiceJiraDTO.setC_jira_avatar_48(projectDetail.getVersions().toString()); pdServiceJiraDTO.setRef(2L); pdServiceJiraDTO.setC_type("default"); Index: web-module/src/main/java/egovframework/api/arms/module_reqadd/model/ReqAddDTO.java =================================================================== diff -u -ref0cae1a3da03bd8e051eabd4a5e986f2714405e -r40ee4cc668440606ad86dc3b02bcb5b68d5da366 --- web-module/src/main/java/egovframework/api/arms/module_reqadd/model/ReqAddDTO.java (.../ReqAddDTO.java) (revision ef0cae1a3da03bd8e051eabd4a5e986f2714405e) +++ web-module/src/main/java/egovframework/api/arms/module_reqadd/model/ReqAddDTO.java (.../ReqAddDTO.java) (revision 40ee4cc668440606ad86dc3b02bcb5b68d5da366) @@ -43,51 +43,19 @@ @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; - @Column(name = "c_version_name") - private String c_version_name; + @Column(name = "c_jira_link") + private String c_jira_link; - @Column(name = "c_jira_project_link") - private String c_jira_project_link; + @Column(name = "c_jira_ver_link") + private String c_jira_ver_link; - @Column(name = "c_jira_project_name") - private String c_jira_project_name; + //ReqStatus Issue Link + @Column(name = "c_issue_link") + private String c_issue_link; - @Column(name = "c_jira_version_link") - private String c_jira_version_link; - - @Column(name = "c_jira_version_name") - private String c_jira_version_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_priority_link") - private Long c_jira_req_priority_link; - - @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_name") - private String c_jira_req_status_name; - - @Column(name = "c_jira_req_linkingissue") - private String c_jira_req_linkingissue; - - @Column(name = "c_jira_req_subtaskissue") - private String c_jira_req_subtaskissue; - @Column(name = "c_reviewer01") private String c_reviewer01; @@ -124,6 +92,12 @@ @Column(name = "c_writer_date") private String c_writer_date; + @Column(name = "c_priority") + private Long c_priority; + + @Column(name = "c_req_status") + private String c_req_status; + @Lob @Column(name = "c_contents") private String c_contents; @@ -136,14 +110,6 @@ 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 String getC_version_link() { return c_version_link; } @@ -152,110 +118,30 @@ this.c_version_link = c_version_link; } - public String getC_version_name() { - return c_version_name; + public String getC_jira_link() { + return c_jira_link; } - public void setC_version_name(String c_version_name) { - this.c_version_name = c_version_name; + public void setC_jira_link(String c_jira_link) { + this.c_jira_link = c_jira_link; } - public String getC_jira_project_link() { - return c_jira_project_link; + public String getC_jira_ver_link() { + return c_jira_ver_link; } - public void setC_jira_project_link(String c_jira_project_link) { - this.c_jira_project_link = c_jira_project_link; + public void setC_jira_ver_link(String c_jira_ver_link) { + this.c_jira_ver_link = c_jira_ver_link; } - public String getC_jira_project_name() { - return c_jira_project_name; + public String getC_issue_link() { + return c_issue_link; } - public void setC_jira_project_name(String c_jira_project_name) { - this.c_jira_project_name = c_jira_project_name; + public void setC_issue_link(String c_issue_link) { + this.c_issue_link = c_issue_link; } - public String getC_jira_version_link() { - return c_jira_version_link; - } - - public void setC_jira_version_link(String 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_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 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_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_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; - } - public String getC_reviewer01() { return c_reviewer01; } @@ -352,6 +238,22 @@ this.c_writer_date = c_writer_date; } + public Long getC_priority() { + return c_priority; + } + + public void setC_priority(Long c_priority) { + this.c_priority = c_priority; + } + + public String getC_req_status() { + return c_req_status; + } + + public void setC_req_status(String c_req_status) { + this.c_req_status = c_req_status; + } + public String getC_contents() { return c_contents; } Index: web-module/src/main/resources/egovframework/sqlmap/com/ext/jstree/springiBatis/aRMS_ReqAdd_Template_SQL_Oracle_iBatis.xml =================================================================== diff -u -rfc09276ba0fe90fd86af3bffef3a4afc743ced9b -r40ee4cc668440606ad86dc3b02bcb5b68d5da366 --- web-module/src/main/resources/egovframework/sqlmap/com/ext/jstree/springiBatis/aRMS_ReqAdd_Template_SQL_Oracle_iBatis.xml (.../aRMS_ReqAdd_Template_SQL_Oracle_iBatis.xml) (revision fc09276ba0fe90fd86af3bffef3a4afc743ced9b) +++ web-module/src/main/resources/egovframework/sqlmap/com/ext/jstree/springiBatis/aRMS_ReqAdd_Template_SQL_Oracle_iBatis.xml (.../aRMS_ReqAdd_Template_SQL_Oracle_iBatis.xml) (revision 40ee4cc668440606ad86dc3b02bcb5b68d5da366) @@ -113,6 +113,7 @@ C_PDSERVICE_LINK NUMBER, C_VERSION_LINK VARCHAR2(4000 BYTE), C_JIRA_LINK VARCHAR2(4000 BYTE), + C_JIRA_VER_LINK VARCHAR2(4000 BYTE), C_ISSUE_LINK VARCHAR2(4000 BYTE), C_REVIEWER01 VARCHAR2(4000 BYTE), C_REVIEWER01_STATUS VARCHAR2(4000 BYTE),