From bdb1efdc604fce543e21152b4263a9362f64389f Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 목, 10 3월 2022 15:35:19 +0900
Subject: [PATCH] - api 이슈 추가 시 입력한 ip에 속해있는 업체정보를 가진 이슈의 하위로 입력되도록 수정 - issue_company 테이블에 ip 컬럼 추가 및 이슈 추가/수정 시 ip 대역대 항목 추가
---
src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
index dbd380b..533d144 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
@@ -57,6 +57,8 @@
companyFieldForm.setName(issueForm.getCompanyName());
companyFieldForm.setEmail(issueForm.getCompanyEmail());
companyFieldForm.setUrl(issueForm.getCompanyUrl());
+ companyFieldForm.setIpStart(issueForm.getIpStart());
+ companyFieldForm.setIpEnd(issueForm.getIpEnd());
companyFieldForm.setManager(issueForm.getCompanyManager());
companyFieldForm.setTel(issueForm.getCompanyTel());
companyFieldForm.setMemo(issueForm.getCompanyMemo());
@@ -92,7 +94,7 @@
* @return issueCompany
*/
private IssueCompany CreateIssueCompany(CompanyFieldForm companyFieldForm, Issue issue) {
- IssueCompany issueCompany = ConvertUtil.copyProperties(companyFieldForm, IssueCompany.class);
+ IssueCompany issueCompany = ConvertUtil.copyProperties(companyFieldForm, IssueCompany.class, "id");
issueCompany.setIssue(issue);
if (companyFieldForm.getId() != null && companyFieldForm.getId() != -1) {
CompanyField companyField = this.companyFieldService.getCompany(companyFieldForm.getId());
@@ -128,6 +130,8 @@
issueCompany.setName(MapUtil.getString(param, "name"));
issueCompany.setEmail(MapUtil.getString(param, "email"));
issueCompany.setUrl(MapUtil.getString(param, "url"));
+ issueCompany.setIpStart(MapUtil.getString(param, "ipStart"));
+ issueCompany.setIpEnd(MapUtil.getString(param, "ipEnd"));
issueCompany.setManager(MapUtil.getString(param, "manager"));
issueCompany.setTel(MapUtil.getString(param, "tel"));
issueCompany.setMemo(MapUtil.getString(param, "memo"));
@@ -136,6 +140,7 @@
issueCompany.setChildSectorId(MapUtil.getLong(param, "childSectorId"));
issueCompany.setRegionId(MapUtil.getLong(param, "regionId"));
issueCompany.setStatusId(MapUtil.getLong(param, "statusId"));
+ issueCompany.setStatusName(MapUtil.getString(param, "statusName"));
this.issueCompanyRepository.saveAndFlush(issueCompany);
} else { //異붽� �떆
--
Gitblit v1.8.0