이슈 수정 진행[프론트]

wyu

2021-11-18 a993b44941dfd5de7df8a15a7f1c1fb314b00c22

이슈 수정 진행[프론트]

 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;
    }

 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;
    }

 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;
    }

 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;
    }

 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,

 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,

 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,

 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;