From 9f955be440cad5e6b868800ff0a0acd17c0a3004 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 13 1월 2022 15:30:35 +0900
Subject: [PATCH] - issue_company 테이블에 컬럼 추가 및 'tel' 컬럼 사이즈 변경 - 이슈 추가,수정 시 업체 추가된 항목들 추가 - 하위이슈 페이징 오류 수정
---
src/main/webapp/scripts/app/issue/issueAddDown.controller.js | 221 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 198 insertions(+), 23 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAddDown.controller.js b/src/main/webapp/scripts/app/issue/issueAddDown.controller.js
index 0285107..7770aa3 100644
--- a/src/main/webapp/scripts/app/issue/issueAddDown.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddDown.controller.js
@@ -39,6 +39,12 @@
containsPartner : containsPartner,
getPartners : getPartners,
addDownIssue : addDownIssue,
+ getDepartments : getDepartments,
+ getCompanyTypeListCallBack : getCompanyTypeListCallBack,
+ getParentSectorListCallBack : getParentSectorListCallBack,
+ getChildSectorListCallBack : getChildSectorListCallBack,
+ getRegionListCallBack : getRegionListCallBack,
+ getStatusListCallBack : getStatusListCallBack,
};
$scope.vm = {
@@ -51,7 +57,7 @@
issueCompanyFields : [], // �뾽泥댁젙蹂�
issueIspFields : [], // ISP �젙蹂�
issueHostingFields : [], // �샇�뒪�똿�젙蹂�
- issueTypeId : "", // �씠�뒋 �쑀�삎 �븘�씠�뵒
+ issueTypeId : parameter.issueTypeId, // �씠�뒋 �쑀�삎 �븘�씠�뵒
priorityId : "", // �슦�꽑�닚�쐞 �븘�씠�뵒
severityId : "", // 以묒슂�룄 �븘�씠�뵒
users : [], // �떞�떦�옄
@@ -62,6 +68,16 @@
detectingDateRange : "", // �깘吏��씪
issueCustomFields : [], // �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �궗�슜�옄 �젙�쓽 �븘�뱶
removeFiles : [], // �궘�젣 �뙆�씪
+ companyTypeId : "",
+ companyType : "", //湲곗뾽援щ텇
+ parentSectorId : "",
+ parentSector : "", //�뾽醫�(��遺꾨쪟)
+ childSectorId : "",
+ childSector : "", //�뾽醫�(以묐텇瑜�)
+ regionId : "",
+ region : "", //吏��뿭
+ statusId : "",
+ status : "", //�긽�깭
},
id : parameter.id,
infiniteAdd : false, // �뿰�냽 �깮�꽦
@@ -92,8 +108,6 @@
hostingUrl : "", // �샇�뒪�똿 url
hostingMemo :"", // �샇�뒪�똿 鍮꾧퀬
-
-
autoCompletePage : {
user : {
page : 0,
@@ -118,6 +132,26 @@
hostingField : {
page : 0,
totalPage : 0
+ },
+ companyType : {
+ page : 0,
+ totalPage : 0
+ },
+ parentSector : {
+ page : 0,
+ totalPage : 0
+ },
+ childSector : {
+ page : 0,
+ totalPage : 0
+ },
+ region : {
+ page : 0,
+ totalPage : 0
+ },
+ status : {
+ page : 0,
+ totalPage : 0
}
},
summerNote : {
@@ -128,6 +162,14 @@
priorities : [], // �슦�꽑�닚�쐞 �젙蹂�
severities : [], // 以묒슂�룄 �젙蹂�
fileTableConfigs : [], // �뙆�씪 �뾽濡쒕뱶 �젙蹂� �뀒�씠釉�
+
+ typeCategory : {
+ companyType : "COMPANYTYPE",
+ parentSector : "PARENTSECTOR",
+ childSector : "CHILDSECTOR",
+ region : "REGION",
+ status : "STATUS"
+ },
};
angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
@@ -373,6 +415,31 @@
$scope.vm.autoCompletePage.hostingField.totalPage = result.data.page.totalPage;
}
+ // �뾽泥� 移댄뀒怨좊━ autocomplete page �뾽�뜲�씠�듃
+ function getCompanyTypeListCallBack(result) {
+ $scope.vm.autoCompletePage.companyType.totalPage = result.data.page.totalPage;
+ }
+
+ // �뾽泥� 移댄뀒怨좊━ autocomplete page �뾽�뜲�씠�듃
+ function getParentSectorListCallBack(result) {
+ $scope.vm.autoCompletePage.parentSector.totalPage = result.data.page.totalPage;
+ }
+
+ // �뾽泥� 移댄뀒怨좊━ autocomplete page �뾽�뜲�씠�듃
+ function getChildSectorListCallBack(result) {
+ $scope.vm.autoCompletePage.childSector.totalPage = result.data.page.totalPage;
+ }
+
+ // �뾽泥� 移댄뀒怨좊━ autocomplete page �뾽�뜲�씠�듃
+ function getRegionListCallBack(result) {
+ $scope.vm.autoCompletePage.region.totalPage = result.data.page.totalPage;
+ }
+
+ // �뾽泥� 移댄뀒怨좊━ autocomplete page �뾽�뜲�씠�듃
+ function getStatusListCallBack(result) {
+ $scope.vm.autoCompletePage.status.totalPage = result.data.page.totalPage;
+ }
+
// �뤌 泥댄겕
function formCheck(formInvalid) {
if (formInvalid) {
@@ -393,24 +460,55 @@
$scope.vm.companyEmail = result[0].email;
$scope.vm.companyUrl = result[0].url;
$scope.vm.companyMemo = result[0].memo;
+ $scope.vm.form.companyTypeId = result[0].companyTypeId;
+ $scope.vm.form.parentSectorId = result[0].parentSectorId;
+ $scope.vm.form.childSectorId = result[0].childSectorId;
+ $scope.vm.form.regionId = result[0].regionId;
+ $scope.vm.form.statusId = result[0].statusId;
+ $scope.vm.form.companyType = result[0].companyTypeName;
+ $scope.vm.form.parentSector = result[0].parentSectorName;
+ $scope.vm.form.childSector = result[0].childSectorName;
+ $scope.vm.form.region = result[0].regionName;
+ $scope.vm.form.status = result[0].statusName;
- $scope.vm.ispId = ispFieldVo.id;
- $scope.vm.ispName = ispFieldVo.name;
- $scope.vm.ispCode = ispFieldVo.code;
- $scope.vm.ispManager = ispFieldVo.manager;
- $scope.vm.ispTel = ispFieldVo.tel;
- $scope.vm.ispEmail = ispFieldVo.email;
- $scope.vm.ispUrl = ispFieldVo.url;
- $scope.vm.ispMemo = ispFieldVo.memo;
+ $scope.vm.ispId = "";
+ $scope.vm.ispName = "";
+ $scope.vm.ispCode = "";
+ $scope.vm.ispManager = "";
+ $scope.vm.ispTel = "";
+ $scope.vm.ispEmail = "";
+ $scope.vm.ispUrl = "";
+ $scope.vm.ispMemo = "";
- $scope.vm.hostingId = hostingFieldVo.id;
- $scope.vm.hostingName = hostingFieldVo.name;
- $scope.vm.hostingCode = hostingFieldVo.code;
- $scope.vm.hostingManager = hostingFieldVo.manager;
- $scope.vm.hostingTel = hostingFieldVo.tel;
- $scope.vm.hostingEmail = hostingFieldVo.email;
- $scope.vm.hostingUrl = hostingFieldVo.url;
- $scope.vm.hostingMemo = hostingFieldVo.memo;
+ $scope.vm.hostingId = "";
+ $scope.vm.hostingName = "";
+ $scope.vm.hostingCode = "";
+ $scope.vm.hostingManager = "";
+ $scope.vm.hostingTel = "";
+ $scope.vm.hostingEmail = "";
+ $scope.vm.hostingUrl = "";
+ $scope.vm.hostingMemo = "";
+
+ if (ispFieldVo != null){
+ $scope.vm.ispId = ispFieldVo.id;
+ $scope.vm.ispName = ispFieldVo.name;
+ $scope.vm.ispCode = ispFieldVo.code;
+ $scope.vm.ispManager = ispFieldVo.manager;
+ $scope.vm.ispTel = ispFieldVo.tel;
+ $scope.vm.ispEmail = ispFieldVo.email;
+ $scope.vm.ispUrl = ispFieldVo.url;
+ $scope.vm.ispMemo = ispFieldVo.memo;
+ }
+ if (hostingFieldVo != null){
+ $scope.vm.hostingId = hostingFieldVo.id;
+ $scope.vm.hostingName = hostingFieldVo.name;
+ $scope.vm.hostingCode = hostingFieldVo.code;
+ $scope.vm.hostingManager = hostingFieldVo.manager;
+ $scope.vm.hostingTel = hostingFieldVo.tel;
+ $scope.vm.hostingEmail = hostingFieldVo.email;
+ $scope.vm.hostingUrl = hostingFieldVo.url;
+ $scope.vm.hostingMemo = hostingFieldVo.memo;
+ }
});
// ISP�젙蹂� 寃곌낵 媛� Event 泥섎━(set)
@@ -451,6 +549,52 @@
companyEmail :$scope.vm.companyEmail,
companyUrl : $scope.vm.companyUrl,
companyMemo : $scope.vm.companyMemo,
+ companyTypeId : (function () {
+ var companyTypeId = -1;
+ if ($scope.vm.form.companyType !== "" && $scope.vm.form.companyTypeId !== "" && $scope.vm.form.companyTypeId !== -1) {
+ companyTypeId = $scope.vm.form.companyTypeId;
+ }else if ($scope.vm.form.companyTypes != null) {
+ companyTypeId = $scope.vm.form.companyTypes[0].id;
+ }
+ return companyTypeId;
+ })(),
+ parentSectorId : (function () {
+ var parentSectorId = -1;
+ if ($scope.vm.form.parentSector !== "" && $scope.vm.form.parentSectorId !== "" && $scope.vm.form.parentSectorId !== -1) {
+ parentSectorId = $scope.vm.form.parentSectorId;
+ }else if ($scope.vm.form.parentSectors != null) {
+ parentSectorId = $scope.vm.form.parentSectors[0].id;
+ }
+ return parentSectorId;
+ })(),
+ childSectorId : (function () {
+ var childSectorId = -1;
+ if ($scope.vm.form.childSector !== "" && $scope.vm.form.childSectorId !== "" && $scope.vm.form.childSectorId !== -1) {
+ childSectorId = $scope.vm.form.childSectorId;
+ }else if ($scope.vm.form.childSectors != null) {
+ childSectorId = $scope.vm.form.childSectors[0].id;
+ }
+ return childSectorId;
+ })(),
+ regionId : (function () {
+ var regionId = -1;
+ if ($scope.vm.form.region !== "" && $scope.vm.form.regionId !== "" && $scope.vm.form.regionId !== -1) {
+ regionId = $scope.vm.form.regionId;
+ }else if ($scope.vm.form.regions != null) {
+ regionId = $scope.vm.form.regions[0].id;
+ }
+ return regionId;
+ })(),
+ statusId : (function () {
+ var statusId = -1;
+ if ($scope.vm.form.status !== "" && $scope.vm.form.statusId !== "" && $scope.vm.form.statusId !== -1) {
+ statusId = $scope.vm.form.statusId;
+ }else if ($scope.vm.form.statuses != null) {
+ statusId = $scope.vm.form.statuses[0].id;
+ }
+ return statusId;
+ })(),
+ statusName : $scope.vm.form.status,
ispName : $scope.vm.ispName,
ispCode : $scope.vm.ispCode,
ispManager : $scope.vm.ispManager,
@@ -548,14 +692,18 @@
var companyField = $scope.vm.form.issueCompanyFields[0];
issueCompanyFields.push({
- id : companyField.id,
companyId : $scope.vm.companyId,
name : $scope.vm.companyName,
manager : $scope.vm.companyManager,
tel : $scope.vm.companyTel,
email :$scope.vm.companyEmail,
url :$scope.vm.companyUrl,
- memo : $scope.vm.companyMemo
+ memo : $scope.vm.companyMemo,
+ companyTypeId : companyField.companyTypeId,
+ parentSectorId : companyField.parentSectorId,
+ childSectorId : companyField.childSectorId,
+ regionId : companyField.regionId,
+ statusId : companyField.statusId
});
}
@@ -680,12 +828,16 @@
SweetAlert.error($filter("translate")("issue.errorSelectRelationIssue"), "");
return;
}*/
+ var ids = [];
+ if (downId != null) {
+ ids.push(downId);
+ }
var contents = {
//relationIssueType : $scope.vm.form.relationIssueTypeId,
// issueId : $rootScope.currentDetailIssueId,
issueId : parameter.id,
- id : downId,
+ ids : ids,
parentIssueId : parameter.id
};
@@ -889,6 +1041,26 @@
}
+ function getDepartments() {
+ if($scope.vm.form.issueTypeId === ""){
+ $scope.vm.form.issueTypeId = $rootScope.issueTypeMenu.id
+ }
+ var content = {
+ issueTypeId : $scope.vm.form.issueTypeId,
+ };
+ Issue.findReadyDepartments($resourceProvider.getContent(
+ content,
+ $resourceProvider.getPageContent(0, 1))).then(function (result) {
+ if (result.data.message.status === "success") {
+ angular.forEach(result.data.data, function (department) {
+ department.byName = department.departmentName;
+ $scope.vm.form.departments.push(department);
+ });
+ }
+ });
+
+ }
+
// 理쒖큹 �떎�뻾
function startExecute() {
@@ -896,7 +1068,8 @@
getIssueTypes : $scope.fn.getIssueTypes(),
getPriorities : $scope.fn.getPriorities(),
getSeverities : $scope.fn.getSeverities(),
- getPartners : $scope.fn.getPartners()
+ getPartners : $scope.fn.getPartners(),
+ getDepartments : $scope.fn.getDepartments()
};
$q.all(promises).then(function (results) {
// �쁽�옱 �봽濡쒖젥�듃 �꽕�젙
@@ -909,6 +1082,8 @@
var id = $rootScope.getCurrentIssueTypeId();
if (id != null) {
$scope.vm.form.issueTypeId = id.toString();
+ } else {
+ $scope.vm.form.issueTypeId = parameter.issueTypeId.toString();
}
$log.debug("promises 寃곌낵 ", results);
});
--
Gitblit v1.8.0