From f3a8cd42ca61550b98d7af093ebaaee1185e35f2 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 17 11월 2021 16:43:51 +0900
Subject: [PATCH] 이슈 수정 진행[프론트]
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 6 ++
src/main/java/kr/wisestone/owl/vo/IssueVo.java | 36 ++++++++++++
src/main/webapp/views/issue/issueModify.html | 2
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 16 +++++
src/main/webapp/scripts/app/issue/issueModify.controller.js | 65 +++++++++++++++------
5 files changed, 104 insertions(+), 21 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index 947aeae..1fdcfc3 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -792,6 +792,9 @@
issueVo.setIssueStatusVo(ConvertUtil.copyProperties(issue.getIssueStatus(), IssueStatusVo.class));
issueVo.setPriorityVo(ConvertUtil.copyProperties(issue.getPriority(), PriorityVo.class));
issueVo.setSeverityVo(ConvertUtil.copyProperties(issue.getSeverity(), SeverityVo.class));
+ issueVo.setCompanyFieldVo(ConvertUtil.copyProperties(issue.getCompanyField(), CompanyFieldVo.class));
+ issueVo.setIspFieldVo(ConvertUtil.copyProperties(issue.getIspFieldId(), IspFieldVo.class));
+ issueVo.setHostingFieldVo(ConvertUtil.copyProperties(issue.getHostingFieldId(), HostingFieldVo.class));
this.setRegister(issue, issueVo); // �벑濡앹옄 �젙蹂� �뀑�똿
//this.setIssueUser(issue, issueVo); // �떞�떦�옄 �젙蹂� �뀑�똿
@@ -833,6 +836,9 @@
issueVo.setIssueStatusVo(issueStatusVo);
issueVo.setPriorityVo(ConvertUtil.copyProperties(issue.getPriority(), PriorityVo.class));
issueVo.setSeverityVo(ConvertUtil.copyProperties(issue.getSeverity(), SeverityVo.class));
+ issueVo.setCompanyFieldVo(ConvertUtil.copyProperties(issue.getCompanyField(), CompanyFieldVo.class));
+ issueVo.setIspFieldVo(ConvertUtil.copyProperties(issue.getIspFieldId(), IspFieldVo.class));
+ issueVo.setHostingFieldVo(ConvertUtil.copyProperties(issue.getHostingFieldId(), HostingFieldVo.class));
this.setRegister(issue, issueVo); // �벑濡앹옄 �젙蹂� �뀑�똿
//this.setIssueUser(issue, issueVo); // �떞�떦�옄 �젙蹂� �뀑�똿
this.setIssueDepartment(issue, issueVo); // �떞�떦遺��꽌 �젙蹂� �뀑�똿
diff --git a/src/main/java/kr/wisestone/owl/vo/IssueVo.java b/src/main/java/kr/wisestone/owl/vo/IssueVo.java
index bf9803c..ab9768d 100644
--- a/src/main/java/kr/wisestone/owl/vo/IssueVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/IssueVo.java
@@ -35,6 +35,9 @@
private PriorityVo priorityVo; // �씠�뒋 �긽�꽭�뿉�꽌 �궗�슜
private SeverityVo severityVo; // �씠�뒋 �긽�꽭�뿉�꽌 �궗�슜
private UserVo registerVo; // �씠�뒋 �긽�꽭�뿉�꽌 �궗�슜
+ private CompanyFieldVo companyFieldVo; // �씠�뒋 �긽�꽭�뿉�꽌 �궗�슜
+ private IspFieldVo ispFieldVo; // �씠�뒋 �긽�꽭�뿉�꽌 �궗�슜
+ private HostingFieldVo hostingFieldVo; // �씠�뒋 �긽�꽭�뿉�꽌 �궗�슜
private Boolean modifyPermissionCheck = Boolean.FALSE;
private List<UserVo> userVos = Lists.newArrayList();
private List<DepartmentVo> departmentVos = Lists.newArrayList(); //�떞�떦遺��꽌 異붽�
@@ -49,6 +52,7 @@
private Long attachedFileCount;
private Long issueCommentCount;
private String modifyByName; // 蹂�寃쎌옄 �젙蹂� - �씠�뒋 蹂�寃� �젙蹂� �긽�꽭 �솗�씤�뿉�꽌 �궗�슜
+ private String byName; // 蹂�寃쎌옄 �젙蹂� - �씠�뒋 蹂�寃� �젙蹂� �긽�꽭 �솗�씤�뿉�꽌 �궗�슜
private WorkflowStatusVo workflowStatusVo;
private Long parentIssueId; // �긽�쐞 �씪媛�
@@ -334,6 +338,30 @@
this.registerVo = registerVo;
}
+ public CompanyFieldVo getCompanyFieldVo() {
+ return companyFieldVo;
+ }
+
+ public void setCompanyFieldVo(CompanyFieldVo companyFieldVo) {
+ this.companyFieldVo = companyFieldVo;
+ }
+
+ public IspFieldVo getIspFieldVo() {
+ return ispFieldVo;
+ }
+
+ public void setIspFieldVo(IspFieldVo ispFieldVo) {
+ this.ispFieldVo = ispFieldVo;
+ }
+
+ public HostingFieldVo getHostingFieldVo() {
+ return hostingFieldVo;
+ }
+
+ public void setHostingFieldVo(HostingFieldVo hostingFieldVo) {
+ this.hostingFieldVo = hostingFieldVo;
+ }
+
public List<IssueHistoryVo> getIssueHistoryVos() {
return issueHistoryVos;
}
@@ -350,6 +378,14 @@
this.modifyByName = modifyByName;
}
+ public String getByName() {
+ return byName;
+ }
+
+ public void setByName(String byName) {
+ this.byName = byName;
+ }
+
public void setWorkflowStatusVo(WorkflowStatusVo workflowStatusVo) {
this.workflowStatusVo = workflowStatusVo;
}
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index 36b56a7..6dd109d 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -372,6 +372,22 @@
var content = {
title : $rootScope.preventXss($scope.vm.form.title), // �젣紐�
description : $rootScope.preventXss($scope.vm.form.description), // �궡�슜
+ //
+ companyManager : $rootScope.preventXss($scope.vm.companyManager), // �궡�슜
+ companyTel : $rootScope.preventXss($scope.vm.companyTel), // �궡�슜
+ companyEmail : $rootScope.preventXss($scope.vm.companyEmail), // �궡�슜
+ companyMemo : $rootScope.preventXss($scope.vm.companyMemo), // �궡�슜
+ ispCode : $rootScope.preventXss($scope.vm.ispCode), // �궡�슜
+ ispManager : $rootScope.preventXss($scope.vm.ispManager), // �궡�슜
+ ispTel : $rootScope.preventXss($scope.vm.ispTel), // �궡�슜
+ ispEmail : $rootScope.preventXss($scope.vm.ispEmail), // �궡�슜
+ ispMemo : $rootScope.preventXss($scope.vm.ispMemo), // �궡�슜
+ hostingCode : $rootScope.preventXss($scope.vm.hostingCode ), // �궡�슜
+ hostingManager : $rootScope.preventXss($scope.vm.hostingManager), // �궡�슜
+ hostingTel : $rootScope.preventXss($scope.vm.hostingTel), // �궡�슜
+ hostingEmail : $rootScope.preventXss($scope.vm.hostingEmail), // �궡�슜
+ hostingMemo : $rootScope.preventXss($scope.vm.hostingMemo), // �궡�슜
+ //
projectId : (function () { // �봽濡쒖젥�듃 �븘�씠�뵒
var projectId = "";
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index 010d31e..9660d85 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -33,7 +33,7 @@
setFormByIssueTypeCustomFields : setFormByIssueTypeCustomFields, // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂대�� �엯�젰 �뤌�뿉�꽌 �궗�슜�븷 �닔 �엳寃� 媛�怨듯븳�떎.
setUseValueByIssueTypeCustomFields : setUseValueByIssueTypeCustomFields, // �씠�뒋�뿉�꽌 �궗�슜�옄媛� �꽑�깮�븳 �궗�슜�옄 �젙�쓽 �븘�뱶 媛믪쓣 �엯�젰 �뤌�뿉 �뀑�똿�븳�떎.
detail : detail, // �씠�뒋 �젙蹂� 議고쉶
- removeManager : removeManager, // �떞�떦�옄 �궘�젣
+ // removeManager : removeManager, // �떞�떦�옄 �궘�젣
removeDepartment : removeDepartment, // �떞�떦遺��꽌 �궘�젣
removeUploadFile : removeUploadFile, // �듅�젙 �뙆�씪�쓣 �궘�젣
setIssueTypeTemplate : setIssueTypeTemplate, // �씠�뒋 �쑀�삎 �뀥�뵆由� �쟻�슜�븯湲�
@@ -56,8 +56,8 @@
priorityId : "", // �슦�꽑�닚�쐞 �븘�씠�뵒
severityId : "", // 以묒슂�룄 �븘�씠�뵒
issueStatusId : "", // �씠�뒋 �긽�깭 �븘�씠�뵒
- users : [], // �떞�떦�옄
- departments : [], // �뵥�떦遺��꽌
+ // users : [], // �떞�떦�옄
+ departments : [], // �떞�떦遺��꽌
files : [], // �뾽濡쒕뱶 �뙆�씪
attachedFiles : [], // �꽟癒몃끂�듃濡� �뙆�씪 �뾽濡쒕뱶瑜� �븷 寃쎌슦 �꽌踰꾩뿉�꽌 pk瑜� �뵲怨� issue id�� �뿰�룞 �옉�뾽�씠 �븘�슂�븯�떎.
startCompleteDateRange : "", // �떆�옉�씪 ~ 醫낅즺�씪
@@ -85,10 +85,10 @@
hostingEmail : "", // �샇�뒪�똿 �씠硫붿씪
hostingMemo : "", // �샇�뒪�똿 鍮꾧퀬
autoCompletePage : {
- user : {
- page : 0,
- totalPage : 0
- },
+ // user : {
+ // page : 0,
+ // totalPage : 0
+ // },
project : {
page : 0,
totalPage : 0
@@ -122,11 +122,11 @@
angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
- // �봽濡쒖젥�듃媛� 蹂�寃쎈릺硫� �떞�떦�옄 珥덇린�솕
+ // �봽濡쒖젥�듃媛� 蹂�寃쎈릺硫� �떞�떦遺��꽌 珥덇린�솕
$scope.$watch("vm.form.projects", function (newValue, oldValue) {
if (angular.isDefined(newValue)) {
if (newValue.length < 1) {
- $scope.vm.form.users = [];
+ $scope.vm.form.departments = [];
$scope.vm.form.issueCustomFields = [];
}
else {
@@ -158,9 +158,9 @@
}
// �떞�떦�옄 �궘�젣
- function removeManager(index) {
- $scope.vm.form.users.splice(index, 1);
- }
+ // function removeManager(index) {
+ // $scope.vm.form.users.splice(index, 1);
+ // }
// �떞�떦遺��꽌 �궘�젣
function removeDepartment(index) {
@@ -386,10 +386,6 @@
return projectId;
})(),
- issueTypeId : $scope.vm.form.issueTypeId, // �씠�뒋 �쑀�삎 �븘�씠�뵒
- priorityId : $scope.vm.form.priorityId, // �슦�꽑�닚�쐞 �븘�씠�뵒
- severityId : $scope.vm.form.severityId, // 以묒슂�룄 �븘�씠�뵒
- issueStatusId : $scope.vm.form.issueStatusId, // �씠�뒋 �긽�깭 �븘�씠�뵒
companyId : (function () { // �봽濡쒖젥�듃 �븘�씠�뵒
var companyId = "";
@@ -418,6 +414,10 @@
return hostingId;
})(),
+ issueTypeId : $scope.vm.form.issueTypeId, // �씠�뒋 �쑀�삎 �븘�씠�뵒
+ priorityId : $scope.vm.form.priorityId, // �슦�꽑�닚�쐞 �븘�씠�뵒
+ severityId : $scope.vm.form.severityId, // 以묒슂�룄 �븘�씠�뵒
+ issueStatusId : $scope.vm.form.issueStatusId, // �씠�뒋 �긽�깭 �븘�씠�뵒
userIds : (function () {
var userIds = [];
@@ -428,7 +428,6 @@
return userIds;
})(),
- removeFiles : $scope.vm.form.removeFiles,
departmentIds : (function () {
var departmentIds = [];
@@ -438,6 +437,7 @@
return departmentIds;
})(),
+ removeFiles : $scope.vm.form.removeFiles,
attachedFileIds : (function () {
var attachedFileIds = [];
@@ -668,16 +668,41 @@
if (angular.isDefined(result.data.data)) {
$scope.vm.form.title = result.data.data.title;
$scope.vm.form.description = result.data.data.description;
+
$scope.vm.form.projects.push(result.data.data.projectVo);
- $scope.vm.form.departments.push(result.data.data.departmentVo);
$scope.vm.projectName = result.data.data.projectVo.name;
- $scope.vm.departmentName = result.data.data.departmentVo.departmentName;
+
$scope.vm.form.issueTypeId = String(result.data.data.issueTypeVo.id);
$scope.vm.form.priorityId = String(result.data.data.priorityVo.id);
$scope.vm.form.severityId = String(result.data.data.severityVo.id);
$scope.vm.form.issueStatusId = String(result.data.data.issueStatusVo.id);
- $scope.vm.form.users = result.data.data.userVos;
+
+ /*$scope.vm.form.users = result.data.data.userVos;*/
+ $scope.vm.form.departments = result.data.data.departmentVos;
$scope.vm.form.files = result.data.data.attachedFileVos;
+ //
+ $scope.vm.form.companyFields.push(result.data.data.companyFieldVo);
+ $scope.vm.companyName = result.data.data.companyFieldVo.name;
+ $scope.vm.companyManager = result.data.data.companyFieldVo.manager;
+ $scope.vm.companyTel = result.data.data.companyFieldVo.tel;
+ $scope.vm.companyEmail = result.data.data.companyFieldVo.email;
+ $scope.vm.companyMemo = result.data.data.companyFieldVo.memo;
+
+ $scope.vm.form.ispFields.push(result.data.data.ispFieldVo);
+ $scope.vm.ispName = result.data.data.ispFieldVo.name;
+ $scope.vm.ispCode = result.data.data.ispFieldVo.code;
+ $scope.vm.ispManager = result.data.data.ispFieldVo.manager;
+ $scope.vm.ispTel = result.data.data.ispFieldVo.tel;
+ $scope.vm.ispEmail = result.data.data.ispFieldVo.email;
+ $scope.vm.ispMemo = result.data.data.ispFieldVo.memo;
+
+ $scope.vm.form.hostingFields.push(result.data.data.hostingFieldVo);
+ $scope.vm.hostingName = result.data.data.hostingFieldVo.name;
+ $scope.vm.hostingCode = result.data.data.hostingFieldVo.code;
+ $scope.vm.hostingManager = result.data.data.hostingFieldVo.manager;
+ $scope.vm.hostingTel = result.data.data.hostingFieldVo.tel;
+ $scope.vm.hostingEmail = result.data.data.hostingFieldVo.email;
+ $scope.vm.hostingMemo = result.data.data.hostingFieldVo.memo;
if ($rootScope.isDefined(result.data.data.startDate)) {
$scope.vm.form.startCompleteDateRange = result.data.data.startDate + " ~ " + result.data.data.completeDate;
diff --git a/src/main/webapp/views/issue/issueModify.html b/src/main/webapp/views/issue/issueModify.html
index ee78357..a577ee0 100644
--- a/src/main/webapp/views/issue/issueModify.html
+++ b/src/main/webapp/views/issue/issueModify.html
@@ -123,7 +123,7 @@
<div class="col-lg-4">
<div class="form-group mb10">
<label class="issue-label"> <span translate="common.assigneeTeam">�떞�떦遺��꽌</span> </label>
- <js-autocomplete-multi data-input-name="department"
+ <js-autocomplete-multi data-input-name="departments"
selected-model="vm.form.departments"
search="vm.departmentName"
source="fn.getIssueDepartmentList(vm.departmentName, vm.form.departments)"
--
Gitblit v1.8.0