From a993b44941dfd5de7df8a15a7f1c1fb314b00c22 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 18 11월 2021 15:18:33 +0900
Subject: [PATCH] 이슈 수정 진행[프론트]
---
src/main/java/kr/wisestone/owl/domain/IssueHosting.java | 12 +++++
src/main/resources/migration/V1_11__Alter_Table.sql | 2 +
src/main/java/kr/wisestone/owl/domain/IssueIsp.java | 12 +++++
src/main/java/kr/wisestone/owl/vo/IssueHostingVo.java | 9 ++++
src/main/resources/mybatis/query-template/issueIsp-template.xml | 1
src/main/java/kr/wisestone/owl/vo/IssueIspVo.java | 10 +++++
src/main/resources/mybatis/query-template/issueHosting-template.xml | 1
src/main/webapp/scripts/app/issue/issueModify.controller.js | 48 +++++++++++++++++-------
8 files changed, 79 insertions(+), 16 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/IssueHosting.java b/src/main/java/kr/wisestone/owl/domain/IssueHosting.java
index c7cd429..7496bbb 100644
--- a/src/main/java/kr/wisestone/owl/domain/IssueHosting.java
+++ b/src/main/java/kr/wisestone/owl/domain/IssueHosting.java
@@ -14,6 +14,7 @@
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
private String name;
+ private String code;
private String manager;
private String tel;
private String email;
@@ -29,10 +30,11 @@
public IssueHosting(){}
- public IssueHosting(Issue issue, HostingField hostingField, String name, String manager, String tel, String email, String memo){
+ public IssueHosting(Issue issue, HostingField hostingField, String name, String code, String manager, String tel, String email, String memo){
this.issue = issue;
this.hostingField = hostingField;
this.name = name;
+ this.code = code;
this.manager = manager;
this.tel = tel;
this.email = email;
@@ -55,6 +57,14 @@
this.name = name;
}
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
public String getManager() {
return manager;
}
diff --git a/src/main/java/kr/wisestone/owl/domain/IssueIsp.java b/src/main/java/kr/wisestone/owl/domain/IssueIsp.java
index 681e980..26625bc 100644
--- a/src/main/java/kr/wisestone/owl/domain/IssueIsp.java
+++ b/src/main/java/kr/wisestone/owl/domain/IssueIsp.java
@@ -14,6 +14,7 @@
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
private String name;
+ private String code;
private String manager;
private String tel;
private String email;
@@ -29,10 +30,11 @@
public IssueIsp(){}
- public IssueIsp(Issue issue, IspField ispField, String name, String manager, String tel, String email, String memo){
+ public IssueIsp(Issue issue, IspField ispField, String name, String code, String manager, String tel, String email, String memo){
this.issue = issue;
this.ispField = ispField;
this.name = name;
+ this.code = code;
this.manager = manager;
this.tel = tel;
this.email = email;
@@ -55,6 +57,14 @@
this.name = name;
}
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
public String getManager() {
return manager;
}
diff --git a/src/main/java/kr/wisestone/owl/vo/IssueHostingVo.java b/src/main/java/kr/wisestone/owl/vo/IssueHostingVo.java
index c5ca3ae..f79d1a5 100644
--- a/src/main/java/kr/wisestone/owl/vo/IssueHostingVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/IssueHostingVo.java
@@ -6,6 +6,7 @@
public class IssueHostingVo extends BaseVo{
private Long id;
private String name;
+ private String code;
private String manager;
private String tel;
private String email;
@@ -29,6 +30,14 @@
this.name = name;
}
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
public String getManager() {
return manager;
}
diff --git a/src/main/java/kr/wisestone/owl/vo/IssueIspVo.java b/src/main/java/kr/wisestone/owl/vo/IssueIspVo.java
index ee07126..fb7a994 100644
--- a/src/main/java/kr/wisestone/owl/vo/IssueIspVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/IssueIspVo.java
@@ -6,10 +6,12 @@
public class IssueIspVo extends BaseVo{
private Long id;
private String name;
+ private String code;
private String manager;
private String tel;
private String email;
private String memo;
+
public IssueIspVo(){}
@@ -29,6 +31,14 @@
this.name = name;
}
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
public String getManager() {
return manager;
}
diff --git a/src/main/resources/migration/V1_11__Alter_Table.sql b/src/main/resources/migration/V1_11__Alter_Table.sql
index e2de0ac..9d9de68 100644
--- a/src/main/resources/migration/V1_11__Alter_Table.sql
+++ b/src/main/resources/migration/V1_11__Alter_Table.sql
@@ -152,6 +152,7 @@
`issue_id` bigint(20) NOT NULL,
`hosting_id` bigint(20) DEFAULT NULL,
`name` VARCHAR(50) NULL,
+ `code` VARCHAR(50) NULL,
`manager` VARCHAR(50) NULL,
`tel` VARCHAR (50) NULL,
`email` VARCHAR (255) NULL,
@@ -169,6 +170,7 @@
`issue_id` bigint(20) NOT NULL,
`isp_id` bigint(20) DEFAULT NULL,
`name` VARCHAR(50) NULL,
+ `code` VARCHAR(50) NULL,
`manager` VARCHAR(50) NULL,
`tel` VARCHAR (50) NULL,
`email` VARCHAR (255) NULL,
diff --git a/src/main/resources/mybatis/query-template/issueHosting-template.xml b/src/main/resources/mybatis/query-template/issueHosting-template.xml
index 6acbbc9..b7b5fd9 100644
--- a/src/main/resources/mybatis/query-template/issueHosting-template.xml
+++ b/src/main/resources/mybatis/query-template/issueHosting-template.xml
@@ -8,6 +8,7 @@
ih.issue_id as issueId,
ih.hosting_id as hostingId,
ih.name as hostingName,
+ ih.code as hostingCode,
ih.manager as hostingManager,
ih.tel as hostingTel,
ih.email as hostingEmail,
diff --git a/src/main/resources/mybatis/query-template/issueIsp-template.xml b/src/main/resources/mybatis/query-template/issueIsp-template.xml
index 2d70cb5..90ae128 100644
--- a/src/main/resources/mybatis/query-template/issueIsp-template.xml
+++ b/src/main/resources/mybatis/query-template/issueIsp-template.xml
@@ -8,6 +8,7 @@
ii.issue_id as issueId,
ii.isp_id as ispId,
ii.name as ispName,
+ ii.code as ispCode,
ii.manager as ispManager,
ii.tel as ispTel,
ii.email as ispEmail,
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index 5bc24a4..5ed22af 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -43,7 +43,7 @@
$scope.vm = {
search : {
id : parameter.id,
- deep : "01" // �봽濡쒖젥�듃 �뿰愿��맂 紐⑤뱺 �젙蹂대�� �뼱�뒓�젙�룄源뚯� 媛��졇�삱吏� 寃곗젙, 01 - �궗�슜�옄, 愿�由ъ옄 �젙蹂�
+ deep : "02" // �봽濡쒖젥�듃 �뿰愿��맂 紐⑤뱺 �젙蹂대�� �뼱�뒓�젙�룄源뚯� 媛��졇�삱吏� 寃곗젙, 01 - �궗�슜�옄, 愿�由ъ옄 �젙蹂�
},
form : {
title : "", // �젣紐�
@@ -345,7 +345,7 @@
// �뾽泥댁젙蹂� 寃곌낵 媛� Event 泥섎━(set)
$scope.$on("companyFieldEvent", function (event, result) {
- $scope.vm.issuecompanyId = result[0].id;
+ $scope.vm.companyId = result[0].id;
$scope.vm.companyManager = result[0].manager;
$scope.vm.companyTel = result[0].tel;
$scope.vm.companyEmail = result[0].email;
@@ -388,13 +388,13 @@
return projectId;
})(),
companyId : (function () { // �봽濡쒖젥�듃 �븘�씠�뵒
- var issueCompanyId = "";
+ var companyId = "";
if ($scope.vm.form.issueCompanyFields.length > 0) {
- issueCompanyId = $scope.vm.form.issueCompanyFields[0].id;
+ companyId = $scope.vm.form.issueCompanyFields[0].id;
}
- return issueCompanyId;
+ return companyId;
})(),
ispId : (function () {
@@ -455,10 +455,10 @@
issueCompanyFields : (function () {
var issueCompanyFields = [];
- var issueCompanyField = $scope.vm.form.issueCompanyFields[0];
- issueCompanyFields.companyId = issueCompanyField.id;
- issueCompanyField.id = null;
- issueCompanyFields.push(issueCompanyField);
+ var companyField = $scope.vm.form.issueCompanyFields;
+ issueCompanyFields.companyId = companyField.id;
+ //companyField.id = null;
+ issueCompanyFields.push(companyField);
return issueCompanyFields;
})(),
@@ -466,7 +466,7 @@
issueIspFields : (function () {
var issueIspFields = [];
- var ispField = $scope.vm.form.issueIspFields[0];
+ var ispField = $scope.vm.form.issueIspFields;
issueIspFields.ispId = ispField.id;
ispField.id = null;
issueIspFields.push(ispField);
@@ -477,7 +477,7 @@
issueHostingFields : (function () {
var issueHostingFields = [];
- var hostingField = $scope.vm.form.issueHostingFields[0];
+ var hostingField = $scope.vm.form.issueHostingFields;
issueHostingFields.hostingId = hostingField.id;
hostingField.id = null;
issueHostingFields.push(hostingField);
@@ -716,11 +716,31 @@
$scope.vm.form.departments = result.data.data.departmentVos;
$scope.vm.form.files = result.data.data.attachedFileVos;
// issueVo �뿉 get & set �꽕�젙媛� �꽕�젙 ex)issueCompanyVos
- $scope.vm.form.issueCompanyFields = result.data.data.issueCompanyVos;
+ $scope.vm.form.issueCompanyFields = result.data.data.issueCompanyVos[0];
+ var issueCompanyFieldValue = result.data.data.issueCompanyVos[0];
+ $scope.vm.companyName = issueCompanyFieldValue.name;
+ $scope.vm.companyManager = issueCompanyFieldValue.manager;
+ $scope.vm.companyTel = issueCompanyFieldValue.tel;
+ $scope.vm.companyEmail = issueCompanyFieldValue.email;
+ $scope.vm.companyMemo = issueCompanyFieldValue.memo;
//
- $scope.vm.form.issueIspFields = result.data.data.issueIspVos;
+ $scope.vm.form.issueIspFields = result.data.data.issueIspVos[0]
+ var issueIspFieldValue = result.data.data.issueIspVos[0];
+ $scope.vm.ispName = issueIspFieldValue.name;
+ $scope.vm.ispCode = issueIspFieldValue.code;
+ $scope.vm.ispManager = issueIspFieldValue.manager;
+ $scope.vm.ispTel = issueIspFieldValue.tel;
+ $scope.vm.ispEmail = issueIspFieldValue.email;
+ $scope.vm.ispMemo = issueIspFieldValue.memo;
//
- $scope.vm.form.issueHostingFields = result.data.data.issueHostingVos;
+ $scope.vm.form.issueHostingFields = result.data.data.issueHostingVos[0];
+ var issueHostingFieldValue = result.data.data.issueHostingVos[0];
+ $scope.vm.hostingName = issueHostingFieldValue.name;
+ $scope.vm.hostingCode = issueHostingFieldValue.code;
+ $scope.vm.hostingManager = issueHostingFieldValue.manager;
+ $scope.vm.hostingTel = issueHostingFieldValue.tel;
+ $scope.vm.hostingEmail = issueHostingFieldValue.email;
+ $scope.vm.hostingMemo = issueHostingFieldValue.memo;
//
if ($rootScope.isDefined(result.data.data.startDate)) {
$scope.vm.form.startCompleteDateRange = result.data.data.startDate + " ~ " + result.data.data.completeDate;
--
Gitblit v1.8.0