~jhpark/owl-kisa.git - maprexDevGit

			@@ -11,14 +11,14 @@
			import kr.wisestone.owl.domain.enumType.EmailType;
			import kr.wisestone.owl.domain.enumType.IssueHistoryType;
			import kr.wisestone.owl.domain.enumType.IssueStatusType;
			import kr.wisestone.owl.exception.ApiAuthException;
			import kr.wisestone.owl.exception.ApiParameterException;
			import kr.wisestone.owl.exception.OwlRuntimeException;
			import kr.wisestone.owl.mapper.DepartmentMapper;
			import kr.wisestone.owl.mapper.IssueMapper;
			import kr.wisestone.owl.mapper.IssueRelationMapper;
			import kr.wisestone.owl.mapper.ProjectMapper;
			import kr.wisestone.owl.repository.IssueRelationRepository;
			import kr.wisestone.owl.repository.IssueRepository;
			import kr.wisestone.owl.repository.UserDepartmentRepository;
			import kr.wisestone.owl.repository.WorkflowDepartmentRepository;
			import kr.wisestone.owl.repository.*;
			import kr.wisestone.owl.service.*;
			import kr.wisestone.owl.util.*;
			import kr.wisestone.owl.util.DateUtil;
			@@ -33,6 +33,8 @@
			import org.slf4j.Logger;
			import org.slf4j.LoggerFactory;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.data.domain.Page;
			import org.springframework.data.domain.PageRequest;
			import org.springframework.data.domain.Pageable;
			import org.springframework.data.jpa.repository.JpaRepository;
			import org.springframework.messaging.simp.SimpMessagingTemplate;
			@@ -44,7 +46,10 @@

			import javax.servlet.http.HttpServletRequest;
			import java.io.IOException;
			import java.text.ParseException;
			import java.util.*;

			import static kr.wisestone.owl.domain.enumType.CustomFieldType.*;

			@Service
			public class IssueServiceImpl extends AbstractServiceImpl<Issue, Long, JpaRepository<Issue, Long>> implements IssueService {
			@@ -80,6 +85,18 @@

			@Autowired
			private ApiTokenService apiTokenService;

			@Autowired
			private CompanyFieldService companyFieldService;

			@Autowired
			private CompanyFieldCategoryService companyFieldCategoryService;

			@Autowired
			private IspFieldService ispFieldService;

			@Autowired
			private HostingFieldService hostingFieldService;

			@Autowired
			private CommonConfiguration configuration;
			@@ -169,10 +186,22 @@
			private IssueMapper issueMapper;

			@Autowired
			private IssueCompanyRepository issueCompanyRepository;

			@Autowired
			private IssueIspRepository issueIspRepository;

			@Autowired
			private IssueHostingRepository issueHostingRepository;

			@Autowired
			private ExcelConditionCheck excelConditionCheck;

			@Autowired
			private SimpMessagingTemplate simpMessagingTemplate;

			@Autowired
			private UserDepartmentService userDepartmentService;

			@Autowired
			private UserDepartmentRepository userDepartmentRepository;
			@@ -182,6 +211,12 @@

			@Autowired
			private WorkflowDepartmentRepository workflowDepartmentRepository;

			@Autowired
			private IssueRelationMapper issueRelationMapper;

			@Autowired
			private WorkflowTransitionService workflowTransitionService;

			@Override
			protected JpaRepository<Issue, Long> getRepository() {
			@@ -199,17 +234,26 @@
			this.issueVersionService.addIssueVersion(issue);
			}

			@Override
			@Transactional
			public void addIssueVersion(Long id, Long userId) {
			Issue issue = this.getIssue(id);
			User user = this.userService.getUser(userId);
			// 이슈 버전 생성
			this.issueVersionService.addIssueVersion(issue, user);
			}


			private IssueForm convertToIssueForm(IssueApiForm issueApiForm, User user) {
			if (issueApiForm.getIssueTypeId() == null) {
			throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_PARAMETER_ISSUE_TYPE_ERROR));
			throw new ApiParameterException(this.messageAccessor.getMessage(MsgConstants.API_PARAMETER_ISSUE_TYPE_ERROR));
			}

			IssueForm issueForm = ConvertUtil.copyProperties(issueApiForm, IssueForm.class);
			// issueForm.setFiles(issueApiForm.getFiles());
			IssueType issueType = this.issueTypeService.getIssueType(issueApiForm.getIssueTypeId());
			if (issueType == null){
			throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_PARAMETER_ISSUE_TYPE_ERROR));
			throw new ApiParameterException(this.messageAccessor.getMessage(MsgConstants.API_PARAMETER_ISSUE_TYPE_ERROR));
			}

			Workflow workflow = issueType.getWorkflow();
			@@ -223,13 +267,16 @@
			}
			}
			} else if (issueApiForm.getIssueStatusId() == null){
			throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_ISSUE_STATUS_NOT_EXIST));
			throw new ApiParameterException(this.messageAccessor.getMessage(MsgConstants.API_ISSUE_STATUS_NOT_EXIST));
			} else if (!this.workflowTransitionService.contains(issueApiForm.getIssueStatusId(), workflow.getId())) {
			//이슈 상태 유효성 확인
			throw new ApiParameterException(this.messageAccessor.getMessage(MsgConstants.API_ISSUE_STATUS_NOT_EXIST_IN_WORKFLOW));
			}

			// 프로젝트 입력
			Project project = issueType.getProject();
			if (project == null){
			throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_PARAMETER_PROJECT_ERROR));
			throw new ApiParameterException(this.messageAccessor.getMessage(MsgConstants.API_PARAMETER_PROJECT_ERROR));
			}
			issueForm.setProjectId(project.getId());

			@@ -253,23 +300,25 @@

			// 상위일감에 사용할 중복값 설정
			List<CustomFieldApiOverlap> customFieldApiOverlaps = this.customFieldApiOverlapService.find(user.getId(), issueApiForm.getIssueTypeId());
			if (customFieldApiOverlaps == null \|\| customFieldApiOverlaps.size() == 0){
			throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_OVERLAP_SETTING_NOT_EXIST));
			}
			for(int i=0; i < customFieldApiOverlaps.size() ; i++ ){
			CustomFieldApiOverlap customFieldApiOverlap = customFieldApiOverlaps.get(i);
			issueApiForm.addUseIssueCustomFieldId(customFieldApiOverlap.getCustomField().getId());
			}
			// if (customFieldApiOverlaps == null \|\| customFieldApiOverlaps.size() == 0){
			// throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_OVERLAP_SETTING_NOT_EXIST));
			// }
			if (customFieldApiOverlaps != null && customFieldApiOverlaps.size() > 0) {
			for (int i = 0; i < customFieldApiOverlaps.size(); i++) {
			CustomFieldApiOverlap customFieldApiOverlap = customFieldApiOverlaps.get(i);
			issueApiForm.addUseIssueCustomFieldId(customFieldApiOverlap.getCustomField().getId());
			}

			// 중복된 이슈검색
			List<Issue> issues = this.findIssue(issueApiForm, customFieldApiOverlaps, user.getId());
			int size = issues.size();
			if (size > 0) {
			Issue targetIssue = issues.get(0);
			if (targetIssue.getParentIssue() != null) {
			issueForm.setParentIssueId(targetIssue.getParentIssue().getId());
			} else {
			issueForm.setParentIssueId(targetIssue.getId());
			// 중복된 상위 이슈검색
			List<Issue> issues = this.findIssue(issueApiForm, customFieldApiOverlaps, user.getId());
			int size = issues.size();
			if (size > 0) {
			Issue targetIssue = issues.get(0);
			if (targetIssue.getParentIssue() != null) {
			issueForm.setParentIssueId(targetIssue.getParentIssue().getId());
			} else {
			issueForm.setParentIssueId(targetIssue.getId());
			}
			}
			}

			@@ -277,6 +326,8 @@

			// 사용자 정의 필드 설정
			issueForm.setIssueCustomFields(issueApiForm.getCustomFieldValues());
			// 같은 도메인 업체 찾기
			this.findCompanyField(issueForm);

			// api 입력값 적용
			ConvertUtil.copyProperties(issueApiForm, issueForm);
			@@ -284,8 +335,54 @@
			return issueForm;

			} else {
			throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_USER_ERROR));
			throw new ApiAuthException(this.messageAccessor.getMessage(MsgConstants.API_USER_ERROR));
			}
			}

			private IssueForm findCompanyField(IssueForm issueForm) {
			if(issueForm.getIssueCustomFields() != null && issueForm.getIssueCustomFields().size() > 0) {
			CompanyFieldCondition condition = new CompanyFieldCondition();
			List<Map<String, Object>> companyFields = this.companyFieldService.find(condition);
			List<Map<String, Object>> issueCompanyFields = Lists.newArrayList();
			List<Map<String, Object>> issueIspFields = Lists.newArrayList();
			List<Map<String, Object>> issueHostingFields = Lists.newArrayList();

			for (Map<String, Object> issueCustomField : issueForm.getIssueCustomFields()) {
			Long customFieldId = MapUtil.getLong(issueCustomField, "customFieldId");
			CustomField customField = this.customFieldService.getCustomField(customFieldId);
			if(customField != null && customField.getCustomFieldType().toString().equals("SITE") && customField.getName().equals("도메인")) {
			String useValue = issueCustomField.get("useValue").toString();
			if(companyFields != null && companyFields.size() > 0) {
			for (Map<String, Object> companyField : companyFields) {
			CompanyFieldVo companyFieldVo = ConvertUtil.convertMapToClass(companyField, CompanyFieldVo.class);
			if(companyFieldVo.getUrl() != null && useValue.equals(companyFieldVo.getUrl())) {
			companyField.put("companyId", companyField.get("id"));
			issueCompanyFields.add(companyField);
			if(companyFieldVo.getIspId() != null && companyFieldVo.getIspId() != -1) {
			Map<String, Object> ispField = this.ispFieldService.find(companyFieldVo.getIspId());
			if (ispField != null) {
			ispField.put("ispId", ispField.get("id"));
			issueIspFields.add(ispField);
			}
			}
			if(companyFieldVo.getHostingId() != null && companyFieldVo.getHostingId() != -1) {
			Map<String, Object> hostingField = this.hostingFieldService.find(companyFieldVo.getHostingId());
			if (hostingField != null) {
			hostingField.put("hostingId", hostingField.get("id"));
			issueHostingFields.add(hostingField);
			}
			}
			}
			}
			}
			}
			issueForm.setIssueCompanyFields(issueCompanyFields);
			issueForm.setIssueIspFields(issueIspFields);
			issueForm.setIssueHostingFields(issueHostingFields);
			}
			}

			return issueForm;
			}

			private User convertToUser(String token) {
			@@ -305,12 +402,20 @@
			IssueForm issueForm = this.convertToIssueForm(issueApiForm, user);

			List<Issue> issues = Lists.newArrayList();
			if (issueForm.getParentIssueId() != null) {
			if (issueForm.getParentIssueId() != null // 기존 추가된 상위 일감이 없거나 설정된 중복 이슈 id가 없을때
			\|\| issueApiForm.getUseIssueCustomFieldIds().size() == 0) {
			issues.add(addIssue(user, issueForm, issueApiForm.getMultipartFiles()));
			} else {
			// 상위 이슈 추가
			// 가상 상위 이슈 추가
			IssueForm parentIssueForm = issueForm.clone();
			// 가상 상위 이슈 추가
			parentIssueForm.setUseIssueCustomFields(issueApiForm.getUseIssueCustomFieldIds());
			// 같은 도메인 업체 찾기
			IssueForm partners = this.findCompanyField(parentIssueForm);
			parentIssueForm.setIssueCompanyFields(partners.getIssueCompanyFields());
			parentIssueForm.setIssueIspFields(partners.getIssueIspFields());
			parentIssueForm.setIssueHostingFields(partners.getIssueHostingFields());

			Issue issue = addIssue(user, parentIssueForm, null);
			issues.add(issue);
			// 하위 이슈 추가
			@@ -343,7 +448,9 @@
			IssueCustomFieldValueFormComparator comp = new IssueCustomFieldValueFormComparator();
			Collections.sort(issueCustomFieldValueForms, comp);

			List<String> userValues = Lists.newArrayList();
			for (IssueCustomFieldValueForm issueCustomFieldValueForm : issueCustomFieldValueForms) {
			userValues.add(issueCustomFieldValueForm.getUseValue());
			for(CustomFieldApiOverlap customFieldApiOverlap : customFieldApiOverlaps) {
			if (customFieldApiOverlap.getCustomField().getId().equals(issueCustomFieldValueForm.getCustomFieldId())) {
			if (useIdx > 0) {
			@@ -357,7 +464,9 @@

			IssueCustomFieldValueCondition issueCustomFieldValueCondition = new IssueCustomFieldValueCondition();
			issueCustomFieldValueCondition.setUseValue(concatUseValue);
			issueCustomFieldValueCondition.setUseValues(userValues);
			issueCustomFieldValueCondition.setIssueTypeId(issueApiform.getIssueTypeId());
			// issueCustomFieldValueCondition.setIssueStatusType("CLOSE");
			List<Map<String, Object>> results = this.issueMapper.findByCustomFieldValue(issueCustomFieldValueCondition);
			if (results != null && results.size() > 0) {
			for (Map<String, Object> result : results) {
			@@ -380,6 +489,8 @@
			@Override
			@Transactional
			public Issue addIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles) {
			StringBuilder detectIssueChange = new StringBuilder();

			// 사용하고 있는 업무 공간이 활성 상태인지 확인한다. 사용 공간에서 로그인한 사용자가 비활성인지 확인한다.
			Workspace workspace = this.workspaceService.checkUseWorkspace(user, user.getLastWorkspaceId());
			// 프로젝트 유효성 체크
			@@ -410,6 +521,12 @@
			if (issueForm.getParentIssueId() != null){
			Issue parentIssue = this.getIssue(issueForm.getParentIssueId());
			issue.setParentIssue(parentIssue);

			// 상위 이슈가 종료일경우 대기로 변경
			IssueStatus parentIssueStatus = parentIssue.getIssueStatus();
			if (parentIssueStatus.getIssueStatusType().equals(IssueStatusType.CLOSE)) {
			parentIssue.setIssueStatus(issueStatus);
			}
			}

			issue.setIssueNumber(this.issueNumberGeneratorService.generateIssueNumber(project)); // 각 프로젝트의 고유 이슈 번호 생성
			@@ -422,12 +539,20 @@
			// 담당부서 지정
			this.issueDepartmentService.modifyIssueDepartment(issue, user, project.getWorkspace(), issueForm.getDepartmentIds());
			// 업체 정보 저장
			this.issueCompanyService.modifyIssueCompanyField(issue, issueForm.getIssueCompanyFields());
			this.issueCompanyService.modifyIssueCompanyField(issue, issueForm, detectIssueChange);
			// ISP 정보 저장
			this.issueIspService.modifyIssueIspField(issue, issueForm.getIssueIspFields());
			this.issueIspService.modifyIssueIspField(issue, issueForm, detectIssueChange);
			// HOSTING 정보 저장
			this.issueHostingService.modifyIssueHostingField(issue, issueForm.getIssueHostingFields());
			this.issueHostingService.modifyIssueHostingField(issue, issueForm, detectIssueChange);

			if (issueForm.getParentIssueId() != null){
			Issue parentIssue = this.getIssue(issueForm.getParentIssueId());
			if (issueForm.getIsApi().equals(Issue.IS_API_YES)
			\|\| (issueForm.getInheritYn() != null && issueForm.getInheritYn())) {
			// 하위이슈에 상위이슈의 파트너 정보 적용
			this.inheritPartners(issue, parentIssue);
			}
			}

			// 첨부 파일 저장
			// multipartFile 을 file Map List 객체로 변경한다.
			@@ -462,10 +587,20 @@
			return addRelIssue(user, issueForm, multipartFiles);
			}

			// 연관이슈를 생성한다.
			// 하위이슈를 생성한다.
			@Override
			@Transactional
			public Issue addRelIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles) {
			public Issue addDownIssue(Map<String, Object> resJsonData, IssueForm issueForm, List<MultipartFile> multipartFiles) {
			User user = this.webAppUtil.getLoginUserObject();
			return addDownIssue(resJsonData, user, issueForm, multipartFiles);
			}

			// 하위이슈를 생성한다.
			@Override
			@Transactional
			public Issue addDownIssue(Map<String, Object> resJsonData, User user, IssueForm issueForm, List<MultipartFile> multipartFiles) {
			StringBuilder detectIssueChange = new StringBuilder();

			// 사용하고 있는 업무 공간이 활성 상태인지 확인한다. 사용 공간에서 로그인한 사용자가 비활성인지 확인한다.
			Workspace workspace = this.workspaceService.checkUseWorkspace(user, user.getLastWorkspaceId());
			// 프로젝트 유효성 체크
			@@ -508,11 +643,105 @@
			// 담당부서 지정
			this.issueDepartmentService.modifyIssueDepartment(issue, user, project.getWorkspace(), issueForm.getDepartmentIds());
			// 업체 정보 저장
			this.issueCompanyService.modifyIssueCompanyField(issue, issueForm.getIssueCompanyFields());
			this.issueCompanyService.modifyIssueCompanyField(issue, issueForm, detectIssueChange);
			// ISP 정보 저장
			this.issueIspService.modifyIssueIspField(issue, issueForm.getIssueIspFields());
			this.issueIspService.modifyIssueIspField(issue, issueForm, detectIssueChange);
			// HOSTING 정보 저장
			this.issueHostingService.modifyIssueHostingField(issue, issueForm.getIssueHostingFields());
			this.issueHostingService.modifyIssueHostingField(issue, issueForm, detectIssueChange);

			// 첨부 파일 저장
			// multipartFile 을 file Map List 객체로 변경한다.
			List<Map<String, Object>> convertFileMaps = this.convertMultipartFileToFile(multipartFiles);
			this.attachedFileService.addAttachedFile(convertFileMaps, issue, user.getAccount());

			// 텍스트 에디터에 첨부한 파일을 이슈와 연결
			this.checkNotHaveIssueIdAttachedFile(issue, issueForm);
			// 사용자 정의 필드 저장
			this.issueCustomFieldValueService.modifyIssueCustomFieldValue(issue, issueForm.getIssueCustomFields());
			// 이슈 이력 생성
			this.issueHistoryService.addIssueHistory(issue, user, IssueHistoryType.ADD, null);
			// 이슈 위험 관리 생성
			this.issueRiskService.addIssueRisk(issue, project.getWorkspace());

			// 영속성 컨텍스트 비우기
			this.clear();
			// 이슈 생성, 삭제시 예약 이메일에 등록해놓는다.
			this.reservationIssueEmail(issue, EmailType.ISSUE_ADD);
			// 사용자 시스템 기능 사용 정보 수집

			UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class);
			log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(userVo, ElasticSearchConstants.ISSUE_ADD));

			IssueVo issueVo = this.convertToIssueVo(issue);
			resJsonData.put(Constants.RES_KEY_CONTENTS, issueVo);

			return issue;
			}

			/**
			* Issue를 IssueVo로 변환(하위이슈의 파트너 정보 상속 시 필요)
			* @param issue Issue
			* @return IssueVo
			*/
			private IssueVo convertToIssueVo(Issue issue) {
			IssueVo issueVo = ConvertUtil.copyProperties(issue, IssueVo.class);
			issueVo.setInheritPartners(issue.getIssueType().getInheritPartners());
			issueVo.setUsePartner(issue.getIssueType().getUsePartner());
			return issueVo;
			}

			// 연관이슈를 생성한다.
			@Override
			@Transactional
			public Issue addRelIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles) {
			StringBuilder detectIssueChange = new StringBuilder();
			// 사용하고 있는 업무 공간이 활성 상태인지 확인한다. 사용 공간에서 로그인한 사용자가 비활성인지 확인한다.
			Workspace workspace = this.workspaceService.checkUseWorkspace(user, user.getLastWorkspaceId());
			// 프로젝트 유효성 체크
			Project project = this.projectService.getProject(issueForm.getProjectId());
			// 이슈 유형 유효성 체크
			IssueType issueType = this.issueTypeService.getIssueType(issueForm.getIssueTypeId());
			// 우선순위 유효성 체크
			Priority priority = this.priorityService.getPriority(issueForm.getPriorityId());
			// 중요도 유효성 체크
			Severity severity = this.severityService.getSeverity(issueForm.getSeverityId());

			// 제목 유효성 체크
			this.verifyTitle(issueForm.getTitle());
			// 날짜 유효성 체크
			this.checkStartCompleteDate(issueForm.getStartDate(), issueForm.getCompleteDate());
			// 담당 부서 유효성 체크
			//this.verifyIssueDepartment(project, issueForm);

			// 이슈 상태 유형이 '대기' 인 이슈 상태 가져오기
			IssueStatus issueStatus = this.issueStatusService.findByIssueStatusTypeIsReady(issueType.getWorkflow());

			Issue issue = ConvertUtil.copyProperties(issueForm, Issue.class);
			issue.setProject(project);
			issue.setIssueStatus(issueStatus);
			issue.setIssueType(issueType);
			issue.setPriority(priority);
			issue.setSeverity(severity);
			if (issueForm.getParentIssueId() != null){
			Issue parentIssue = this.getIssue(issueForm.getParentIssueId());
			issue.setParentIssue(parentIssue);
			}

			issue.setIssueNumber(this.issueNumberGeneratorService.generateIssueNumber(project)); // 각 프로젝트의 고유 이슈 번호 생성

			issue = this.issueRepository.saveAndFlush(issue);

			issue.setReverseIndex(issue.getId() * -1); // 쿼리 속도 개선을 위해 리버스 인덱스 생성
			// 담당자 지정
			//this.issueUserService.modifyIssueUser(issue, project.getWorkspace(), issueForm.getUserIds());
			// 담당부서 지정
			this.issueDepartmentService.modifyIssueDepartment(issue, user, project.getWorkspace(), issueForm.getDepartmentIds());
			// 업체 정보 저장
			this.issueCompanyService.modifyIssueCompanyField(issue, issueForm, detectIssueChange);
			// ISP 정보 저장
			this.issueIspService.modifyIssueIspField(issue, issueForm, detectIssueChange);
			// HOSTING 정보 저장
			this.issueHostingService.modifyIssueHostingField(issue, issueForm, detectIssueChange);

			// 첨부 파일 저장
			// multipartFile 을 file Map List 객체로 변경한다.
			@@ -560,7 +789,7 @@
			}

			// 이슈 정보를 이메일 전송에 사용하기 위해 Map 형태로 변환한다.
			private void makeIssueMapToIssue(Issue issue, Map<String, Object> issueMap) {
			public void makeIssueMapToIssue(Issue issue, Map<String, Object> issueMap) {
			issueMap.put("title", issue.getTitle());
			issueMap.put("issueNumber", issue.getIssueNumber());
			issueMap.put("issueTypeName", issue.getIssueType().getName());
			@@ -614,7 +843,7 @@
			useValues.add(issueCustomFieldValueVo.getUseValue());
			customField.put(issueCustomFieldValueVo.getCustomFieldVo().getName(), useValues);
			} else {
			if (issueCustomFieldValueVo.getCustomFieldVo().getCustomFieldType().equals(CustomFieldType.INPUT.toString())) {
			if (issueCustomFieldValueVo.getCustomFieldVo().getCustomFieldType().equals(INPUT.toString())) {
			customField.put(issueCustomFieldValueVo.getCustomFieldVo().getName(), issueCustomFieldValueVo.getUseValue());
			} else {
			customField.put(issueCustomFieldValueVo.getCustomFieldVo().getName(), Lists.newArrayList(issueCustomFieldValueVo.getUseValue()));
			@@ -668,15 +897,28 @@
			}
			}

			// 날짜 유효성 체크
			/**
			* 날짜 유효성 체크
			* @param startDate 시작 일자(문자)
			* @param completeDate 종료 일자(문자)
			*/
			private void checkStartCompleteDate(String startDate, String completeDate) {
			if (!StringUtils.isEmpty(startDate) && !StringUtils.isEmpty(completeDate)) {
			Date start = DateUtil.convertStrToDate(startDate, "yy-MM-dd");
			Date end = DateUtil.convertStrToDate(completeDate, "yy-MM-dd");
			if (start.getTime() > end.getTime()) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.DATE_PICKER_NOT_AVAILABLE));
			}
			checkStartCompleteDate(start, end);
			}
			}

			/**
			* 날짜 유효성 체크
			* @param start 시작 일자
			* @param end 종료 일자
			*/
			private void checkStartCompleteDate(Date start, Date end) {
			if (start.getTime() > end.getTime()) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.DATE_PICKER_NOT_AVAILABLE));
			}
			}

			@@ -736,7 +978,6 @@
			@Override
			@Transactional(readOnly = true)
			public List<IssueVo> findIssue(Map<String, Object> resJsonData, IssueCondition issueCondition, Pageable pageable) {

			// 검색 조건을 만든다
			if (!this.makeIssueSearchCondition(issueCondition, Lists.newArrayList("01", "02", "03"), pageable)) {
			// 이슈 목록을 찾지 못할 경우 기본 정보로 리턴한다.
			@@ -753,42 +994,40 @@
			return Lists.newArrayList();
			}

			// 튜닝 전 - 1.3 / 1.2 / 1.1
			// 튜닝 후 (단일/다중 검색 조건 3개 기준) - 0.49 / 0.41 / 0.47 / 0.41

			List<IssueVo> issueVos = Lists.newArrayList(); // 이슈 목록 데이터 저장 컬렉션
			// 사용자 정의 필드로 검색한 이슈 아이디 값
			List<String> issueKeys = Lists.newArrayList(issueIds);
			issueCondition.setIssueIds(issueKeys);

			issueCondition.setLoginUserId(this.webAppUtil.getLoginId());
			issueCondition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
			User user = this.webAppUtil.getLoginUserObject();

			issueCondition.setLoginUserId(user.getId());
			issueCondition.setWorkspaceId(user.getLastWorkspaceId());


			List<Map<String, Object>> results = Lists.newArrayList();
			Long totalCount = 0L;
			UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
			// UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());

			if (this.userWorkspaceService.checkWorkspaceManager(user)
			\|\| MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
			this.SetAllDepartmentId(issueCondition);
			} else{
			this.SetMyDepartmentId(issueCondition);
			/*results = this.issueMapper.findByDepartment(issueCondition);
			totalCount = this.issueMapper.countByDepartment(issueCondition);*/
			}
			// if (!this.userWorkspaceService.checkWorkspaceManager(user)
			// && !MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE)) { //최고관리자 & 프로젝트,이슈 관리자 일 경우 모든 이슈 보기
			// this.SetMyDepartmentId(issueCondition);
			//this.SetAllDepartmentId(issueCondition);
			// } /*else{
			// results = this.issueMapper.findByDepartment(issueCondition);
			// totalCount = this.issueMapper.countByDepartment(issueCondition);
			// }*/
			// StopWatch serviceStart = new StopWatch();
			// serviceStart.start();
			results = this.issueMapper.find(issueCondition);
			// serviceStart.stop();
			// log.error("result : " + serviceStart.toString());

			// serviceStart = new StopWatch();
			// serviceStart.start();
			totalCount = this.issueMapper.count(issueCondition);


			// 튜닝 전 - 0.8, 0.9, 0.9, 0.9, 0.9
			/*StopWatch serviceStart = new StopWatch();
			serviceStart.start();*/
			// 튜닝 전 - 1.1, 1.1, 1.3, 1.2

			/*serviceStart.stop();
			log.debug("serviceENd1 : " + serviceStart.getTime());*/
			// serviceStart.stop();
			// log.error("totalCount : " + serviceStart.toString());

			int totalPage = (int) Math.ceil((totalCount - 1) / pageable.getPageSize()) + 1;
			// 이슈 아이디 초기화
			@@ -800,11 +1039,12 @@
			this.setMapToIssueVo(results, issueVos, issueCondition, user);

			if (issueCondition.getTree()) {
			this.setParentIssue(issueVos);
			this.setDownIssues(user, issueVos);
			this.setRelationIssues(issueVos);
			}
			this.setCountDownIssues(issueVos);

			this.setCountDownIssues(issueVos);
			this.SetWorkflowDepartment(issueVos); //워크플로우에 설정한 담당부서 가져오기

			resJsonData.put(Constants.RES_KEY_CONTENTS, issueVos);
			@@ -829,9 +1069,9 @@
			IssueVo addIssueVo = ConvertUtil.copyProperties(downIssue, IssueVo.class);
			addIssueVo.setIssueTypeId(downIssue.getIssueType().getId());
			downIssueVos.add(addIssueVo);

			}
			issueVo.setIssueDownVos(downIssueVos);

			if (downIssueVos.size() > 0) {
			this.setDownIssues(user, downIssueVos);
			}
			@@ -841,11 +1081,10 @@
			this.setIssueDepartmentList(issueVos, issueCondition, user);
			// 등록자 정보 추가
			this.setRegister(issueVos); // 담당자 정보 셋팅

			// 사용자 정의 필드 정보 추가
			this.setIssueCustomFieldValue(issueVos, issueCondition);

			this.SetWorkflowDepartment(issueVos); //워크플로우에 설정한 담당부서 가져오기
			//워크플로우에 설정한 담당부서 가져오기
			this.SetWorkflowDepartment(issueVos);
			}
			}

			@@ -855,6 +1094,20 @@
			List<IssueVo> relationIssues = this.issueRelationService.findRelationIssue(issueVo.getId());
			for(IssueVo relationIssue : relationIssues){
			issueVo.addRelationIssueVo(ConvertUtil.copyProperties(relationIssue, IssueVo.class));
			}
			}
			}

			// 상위 이슈 체크
			private void setParentIssue(List<IssueVo> issueVos) {
			for(IssueVo issueVo : issueVos) {
			if(issueVo.getParentIssueId() != null) {
			Issue parentIssue = this.getIssue(issueVo.getParentIssueId());
			//issueVo.setParentIssueVo(ConvertUtil.copyProperties(parentIssue, IssueVo.class));
			if(parentIssue.getIssueCustomFieldValues() == null \|\| parentIssue.getIssueCustomFieldValues().size() == 0){
			issueVo.setIssueCustomFieldValueVos(null);
			}
			ConvertUtil.copyProperties(parentIssue, issueVo);
			}
			}
			}
			@@ -896,15 +1149,19 @@
			public void findApiIssue(ApiMonitorCondition apiMonitorCondition, Map<String, Object> resJsonData) {

			IssueTypeCondition issueTypeCondition = new IssueTypeCondition();
			issueTypeCondition.setIsApi(Issue.IS_API_YES);
			List<IssueTypeVo> issueTypes = this.issueTypeService.findIssueType(issueTypeCondition);

			// 값이 없을 경우 초기값 입력
			if (StringUtils.isEmpty(apiMonitorCondition.getSearchPeriod())) {
			apiMonitorCondition.setSearchPeriod(DateUtil.LAST_SEVEN_DAYS);
			}

			// 검색 일자를 구한다.
			List<Date> searchDates = CommonUtil.findSearchPeriod(apiMonitorCondition.getSearchPeriod());
			List<Date> searchDates = Lists.newArrayList();
			if (apiMonitorCondition.getSearchPeriod().equals(DateUtil.CUSTOM_INPUT)) {
			Date startDate = DateUtil.convertStrToDate(apiMonitorCondition.getSearchStartDate(), "yyyy-MM-dd");
			Date endDate = DateUtil.addDays(DateUtil.convertStrToDate(apiMonitorCondition.getSearchEndDate(), "yyyy-MM-dd"), 1);

			searchDates = CommonUtil.findSearchPeriod(startDate, endDate);
			} else {
			searchDates = CommonUtil.findSearchPeriod(apiMonitorCondition.getSearchPeriod());
			}

			// 날짜가 검색되지 않았으면 오류
			if (searchDates.size() < 1) {
			@@ -1042,6 +1299,9 @@
			private void setMapToIssueVo(List<Map<String, Object>> results, List<IssueVo> issueVos, IssueCondition issueCondition, User user) {
			for (Map<String, Object> result : results) {
			IssueVo issueVo = ConvertUtil.convertMapToClass(result, IssueVo.class);
			if (MapUtil.getString(result, "inheritPartners") != null && MapUtil.getString(result, "inheritPartners").equals("1")) {
			issueVo.setInheritPartners(true);
			}
			issueVos.add(issueVo);
			issueCondition.addIssueIds(String.valueOf(issueVo.getId()));
			}
			@@ -1066,6 +1326,9 @@
			condition.setLoginUserId(this.webAppUtil.getLoginId());
			condition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());

			User user = this.webAppUtil.getLoginUserObject();
			UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());

			// 프로젝트 키가 존재할 경우 프로젝트 키에 해당하는 프로젝트를 조회하고 검색 조건에 셋팅한다.
			if (!this.getProjectByProjectKey(condition.getProjectKey(), condition)) {
			return false;
			@@ -1073,9 +1336,17 @@

			// 프로젝트를 선택하지 않았으면 해당 업무 공간에서 참여하고 있는 프로젝트를 찾는다.
			if (condition.getProjectIds().size() < 1) {
			List<Map<String, Object>> projects = this.projectService.findByWorkspaceIdAndIncludeProjectAll(projectStatues, condition.getProjectType());
			List<Long> projectIds = Lists.newArrayList();
			List<Map<String, Object>> projects = Lists.newArrayList();
			if (this.userWorkspaceService.checkWorkspaceManager(user) \|\| MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT)){
			return true;
			}/*else if (MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE)){
			projects = this.projectService.findByWorkspaceIdAndIncludeProjectAll(projectStatues, condition.getProjectType());
			}*/
			else {
			projects = this.projectService.findByWorkspaceIdAndIncludeProject(projectStatues, condition.getProjectType());
			}

			List<Long> projectIds = Lists.newArrayList();
			for (Map<String, Object> result : projects) {
			Long projectId = MapUtil.getLong(result, "id");

			@@ -1113,7 +1384,10 @@
			// 프로젝트를 선택하지 않았으면 해당 업무 공간에서 참여하고 있는 프로젝트를 찾는다.
			if (condition.getProjectIds().size() < 1) {
			List<Map<String, Object>> projects = null;
			if (this.userWorkspaceService.checkWorkspaceManager(user)) {
			UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
			if (this.userWorkspaceService.checkWorkspaceManager(user)
			\|\| (MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT) &&
			MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE))) {
			projects = this.projectMapper.findByWorkspaceManagerAll(projectCondition);
			} else {
			projects = this.projectService.findByWorkspaceIdAndIncludeProjectAll(projectCondition);
			@@ -1222,7 +1496,7 @@
			}

			// 이슈 수정 권한을 갖고 있는지 확인
			if (this.checkHasPermission(issueVo, issueVo.getUserVos(), user)) {
			if (this.checkHasPermission(issueVo, issueVo.getUserVos(), user, null)) {
			issueVo.setModifyPermissionCheck(Boolean.TRUE);
			}
			}
			@@ -1259,7 +1533,7 @@
			}

			// 이슈 수정 권한을 갖고 있는지 확인
			if (this.checkHasPermission(issueVo, issueVo.getUserVos(), user)) {
			if (this.checkHasPermission(issueVo, issueVo.getUserVos(), user, issueVo.getDepartmentVos())) {
			issueVo.setModifyPermissionCheck(Boolean.TRUE);
			}
			}
			@@ -1270,10 +1544,24 @@
			@Transactional(readOnly = true)
			public void detailIssue(Map<String, Object> resJsonData, IssueCondition issueCondition) {
			IssueVo issueVo = new IssueVo();
			Pageable relPageable = issueCondition.getRelPageable();
			Pageable downPageable = issueCondition.getDownPageable();

			if (issueCondition.getId() != null) {
			Issue issue = this.getIssue(issueCondition.getId());
			issueVo = ConvertUtil.copyProperties(issue, IssueVo.class);
			User user = this.webAppUtil.getLoginUserObject();

			if (relPageable != null) {
			issueVo.setRelPageNumber(relPageable.getPageNumber());
			issueVo.setRelPageSize(relPageable.getPageSize());
			issueVo.setRelPage(relPageable.getPageNumber() * relPageable.getPageSize());
			}
			if (downPageable != null) {
			issueVo.setDownPageNumber(downPageable.getPageNumber());
			issueVo.setDownPage(downPageable.getPageNumber() * downPageable.getPageSize());
			issueVo.setDownPageSize(downPageable.getPageSize());
			}

			switch (issueCondition.getDeep()) {
			case "01": // 프로젝트, 이슈 유형, 이슈 상태, 우선순위, 중요도, 담당부서, 첨부파일, 사용자 정의 필드 정보를 셋팅한다.
			@@ -1290,17 +1578,15 @@
			this.setIssueCustomFields(issue, issueVo); // 사용자 정의 필드 값 정보 셋팅
			this.setRelationIssue(issue, issueVo); //연관 일감 셋팅
			this.setDownIssues(issue, issueVo); //하위 이슈 세팅

			break;

			case "02": // 프로젝트, 이슈 유형, 이슈 상태, 우선순위, 중요도, 담당자, 첨부파일, 사용자 정의 필드 정보, 댓글, 기록을 셋팅한다.
			this.setIssueDetail(issueVo, issue); // 이슈 상세 정보를 셋팅한다.
			this.setIssueTableConfigs(issue, issueVo);
			this.setIssueDetail(issueVo, issue, user); // 이슈 상세 정보를 셋팅한다.
			this.setIssueTableConfigs(issue, issueVo, issueCondition);
			issueVo.setProjectVo(ConvertUtil.copyProperties(issue.getProject(), ProjectVo.class));
			break;
			}
			}

			// 사용자 시스템 기능 사용 정보 수집
			log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_DETAIL));

			@@ -1308,8 +1594,9 @@
			}

			// 테이블 설정 셋팅
			private void setIssueTableConfigs(Issue issue, IssueVo issueVo) {
			Long IssueTypeId = issue.getIssueType().getId();
			private void setIssueTableConfigs(Issue issue, IssueVo issueVo, IssueCondition issueCondition) {
			//Long IssueTypeId = issue.getIssueType().getId();
			Long IssueTypeId = issueCondition.getIssueTypeId();

			for (int tableConfigType : IssueTableConfig.IssueTableTypes) {
			if (tableConfigType != IssueTableConfig.ISSUE_TABLE_TYPE_MAIN) {
			@@ -1329,8 +1616,21 @@

			// 하위 이슈 정보를 셋팅한다
			private void setDownIssues(Issue issue, IssueVo issueVo) {
			List<Issue> downIssues = this.issueRepository.findByParentIssueId(issue.getId());
			if(downIssues != null && downIssues.size()>0){
			Page<Issue> downIssues = null;

			List<Issue> downIssueList = this.issueRepository.findByParentIssueId(issue.getId());
			if(downIssueList != null && downIssueList.size() > 0) {
			int startPage = 0;
			if (issueVo.getDownPage() != 0) {
			startPage = (int) Math.floor(issueVo.getDownPage()/issueVo.getDownPageSize());
			}
			Pageable pageable = PageRequest.of(startPage, issueVo.getDownPageSize());
			downIssues = this.issueRepository.findByParentIssueId(issue.getId(), pageable);
			}
			if(downIssues != null){
			issueVo.setDownTotalPage(downIssues.getTotalPages());
			issueVo.setDownTotalCount(downIssues.getTotalElements());

			List<IssueVo> resultList = new ArrayList<>();
			for(Issue downIssue : downIssues){
			IssueVo downIssueVo = ConvertUtil.copyProperties(downIssue, IssueVo.class);
			@@ -1345,6 +1645,13 @@
			this.setRegister(downIssue, downIssueVo); // 등록자
			this.setIssueDepartment(downIssue, downIssueVo); // 담당부서 정보 셋팅
			this.setIssueCustomFields(downIssue, downIssueVo); // 사용자정의필드 정보 세팅
			this.setIssueHistory(downIssue, downIssueVo); // 이슈 기록 정보 셋팅
			this.setIssueComments(downIssue, downIssueVo); // 댓글 정보 셋팅
			this.setIssueCompanyField(downIssue, downIssueVo); //업체 정보 세팅
			this.setIssueIspField(downIssue, downIssueVo); //ISP 정보 세팅
			this.setIssueHostingField(downIssue, downIssueVo); //HOSTING 정보 세팅

			downIssueVo.setModifyPermissionCheck(issueVo.getModifyPermissionCheck());

			resultList.add(downIssueVo);
			}
			@@ -1355,7 +1662,12 @@
			// 이슈 상세 정보를 셋팅한다.
			@Override
			@Transactional(readOnly = true)
			public void setIssueDetail(IssueVo issueVo, Issue issue) {
			public void setIssueDetail(IssueVo issueVo, Issue issue, User user) {
			// 이슈 수정 권한을 갖고 있는지 확인
			if (this.checkHasPermission(issueVo, issueVo.getUserVos(), user, issueVo.getDepartmentVos())) {
			issueVo.setModifyPermissionCheck(Boolean.TRUE);
			}

			issueVo.setProjectVo(ConvertUtil.copyProperties(issue.getProject(), ProjectVo.class));
			issueVo.setIssueTypeVo(ConvertUtil.copyProperties(issue.getIssueType(), IssueTypeVo.class));
			IssueStatusVo issueStatusVo = ConvertUtil.copyProperties(issue.getIssueStatus(), IssueStatusVo.class, "issueStatusType");
			@@ -1368,10 +1680,10 @@
			this.setIssueDepartment(issue, issueVo); // 담당부서 정보 셋팅
			this.setAttachedFiles(issue, issueVo); // 첨부 파일 정보 셋팅
			this.setIssueCustomFields(issue, issueVo); // 사용자 정의 필드 값 정보 셋팅
			this.setIssueComments(issue, issueVo); // 댓글 정보 셋팅
			this.setIssueHistory(issue, issueVo); // 이슈 기록 정보 셋팅
			this.setRelationIssue(issue, issueVo); //연관 일감 셋팅
			this.setDownIssues(issue, issueVo); //하위 일감 세팅
			this.setIssueComments(issue, issueVo); // 댓글 정보 셋팅
			this.setIssueHistory(issue, issueVo); // 이슈 기록 정보 셋팅

			IssueType issueType = this.issueTypeService.getIssueType(issueVo.getIssueTypeVo().getId()); // 이슈의 이슈유형 객체
			Integer using = issueType.getUsePartner() != null ? issueType.getUsePartner().intValue() : 0; // 이슈유형별로 사용중인 업체/ISP/호스팅 값
			@@ -1390,7 +1702,6 @@
			this.setIssueCompanyField(issue, issueVo); //업체 정보 세팅
			this.setIssueIspField(issue, issueVo); //ISP 정보 세팅
			this.setIssueHostingField(issue, issueVo); //HOSTING 정보 세팅

			this.setParentIssue(issue,issueVo); //상위 이슈 정보 세팅
			}

			@@ -1422,13 +1733,18 @@

			// 연관 이슈 정보를 셋팅한다
			private void setRelationIssue(Issue issue, IssueVo issueVo) {
			Set<IssueRelation> issueRelations = issue.getIssueRelations();
			if (issue != null && issueVo != null && issueRelations.size() > 0) {
			for (IssueRelation issueRelation : issueRelations) {
			IssueRelationVo issueRelationVo = ConvertUtil.copyProperties(issueRelation, IssueRelationVo.class);
			//Set<IssueRelation> issueRelations = issue.getIssueRelations();

			Issue relationIssue = issueRelation.getRelationIssue();
			List<Map<String, Object>> results = this.issueRelationMapper.findByIssueId(issueVo);
			Long totalCount = this.issueRelationMapper.count(issueVo);

			if (issue != null && issueVo != null && results.size() > 0) {
			int totalPage = (int) Math.ceil((totalCount - 1) / issueVo.getRelPageSize()) + 1;
			issueVo.setRelTotalPage(totalPage);
			issueVo.setRelTotalCount(totalCount);
			for (Map<String, Object> result : results) {
			IssueRelationVo issueRelationVo = ConvertUtil.convertMapToClass(result, IssueRelationVo.class);
			Issue relationIssue = this.findOne(MapUtil.getLong(result, "relationIssueId"));
			IssueVo relIssueVo = ConvertUtil.copyProperties(relationIssue, IssueVo.class);
			Project project = this.projectService.getProject(relationIssue.getProject().getId());
			relIssueVo.setProjectId(project.getId());
			@@ -1445,9 +1761,30 @@
			issueStatusVo.setIssueStatusType(relationIssue.getIssueStatus().getIssueStatusType().toString());
			issueRelationVo.setIssueStatusVo(issueStatusVo);

			issueRelationVo.setModifyPermissionCheck(issueVo.getModifyPermissionCheck());

			this.setRegister(relationIssue, relIssueVo); // 등록자
			this.setIssueDepartment(relationIssue, relIssueVo); // 담당부서 정보 셋팅
			this.setIssueCustomFields(relationIssue, relIssueVo); // 사용자정의필드 정보 세팅

			Set<IssueCompany> issueCompanies = relationIssue.getIssueCompanies();
			Iterator<IssueCompany> itrCompany = issueCompanies.iterator();
			while (itrCompany.hasNext()) {
			issueRelationVo.addIssueCompanyVo(ConvertUtil.copyProperties(itrCompany.next(), IssueCompanyVo.class));
			}

			Set<IssueIsp> issueIsps = relationIssue.getIssueIspFields();
			Iterator<IssueIsp> itrIsp = issueIsps.iterator();
			while (itrIsp.hasNext()) {
			issueRelationVo.addIssueIspVo(ConvertUtil.copyProperties(itrIsp.next(), IssueIspVo.class));
			}

			Set<IssueHosting> issueHostings = relationIssue.getIssueHostingFields();
			Iterator<IssueHosting> itrHosting = issueHostings.iterator();
			while (itrHosting.hasNext()) {
			issueRelationVo.addIssueHostingVo(ConvertUtil.copyProperties(itrHosting.next(), IssueHostingVo.class));
			}

			issueVo.addIssueRelationVo(issueRelationVo);
			}
			} else {
			@@ -1499,6 +1836,15 @@
			DepartmentVo departmentVo = ConvertUtil.copyProperties(issueDepartment.getDepartment(), DepartmentVo.class);
			departmentVo.setByName(departmentVo.getDepartmentName());
			departmentVos.add(departmentVo);

			List<UserDepartment> userDepartments = this.userDepartmentRepository.findByDepartmentId(departmentVo.getId());
			if (userDepartments != null && userDepartments.size() > 0) {
			for (UserDepartment userDepartment : userDepartments) {
			if (userDepartment.getUserId().equals(this.webAppUtil.getLoginId())){
			issueVo.setModifyPermissionCheck(Boolean.TRUE);
			}
			}
			}
			}
			issueVo.setDepartmentVos(departmentVos);
			}
			@@ -1540,7 +1886,7 @@

			// 이슈 기록 정보를 셋팅한다.
			private void setIssueHistory(Issue issue, IssueVo issueVo) {
			issueVo.setIssueHistoryVos(this.issueHistoryService.findIssueHistory(issue.getId()));
			issueVo.setIssueHistoryVos(this.issueHistoryService.findIssueHistory(issue));
			}

			// 사용자 정의 필드 값이 같은 이슈 찾기
			@@ -1552,10 +1898,15 @@
			List<Issue> resultIssueVos = Lists.newArrayList();
			String comma = ",";

			List<String> userValues = Lists.newArrayList();
			if (issueCustomFieldValueForms.size() > 0) {
			IssueCustomFieldValueFormComparator comp = new IssueCustomFieldValueFormComparator();
			Collections.sort(issueCustomFieldValueForms, comp);

			String concatUseValue = "";
			for (int i = 0; i < issueCustomFieldValueForms.size(); i++) {
			IssueCustomFieldValueForm issueCustomFieldValueForm = issueCustomFieldValueForms.get(i);
			userValues.add(issueCustomFieldValueForm.getUseValue());
			if (i > 0) {
			concatUseValue = concatUseValue.concat(comma);
			}
			@@ -1564,7 +1915,9 @@

			IssueCustomFieldValueCondition issueCustomFieldValueCondition = new IssueCustomFieldValueCondition();
			issueCustomFieldValueCondition.setUseValue(concatUseValue);
			issueCustomFieldValueCondition.setUseValues(userValues);
			issueCustomFieldValueCondition.setIssueTypeId(issueApiform.getIssueTypeId());
			issueCustomFieldValueCondition.setIssueStatusType("CLOSE");
			List<Map<String, Object>> results = this.issueMapper.findByCustomFieldValue(issueCustomFieldValueCondition);
			if (results != null && results.size() > 0) {
			for (Map<String, Object> result : results) {
			@@ -1599,22 +1952,28 @@
			List<Issue> issues = Lists.newArrayList();
			for (Issue issueVo : issue) {
			issueForm.setId(issueVo.getId());
			issueForm.setTitle(issueVo.getTitle());

			// 자동 종료 상태 설정이 되어 있지 않으면 오류발생
			Issue modifyIssue = this.modifyIssueForApi(user, issueForm, files);
			Issue parentIssue = modifyIssue.getParentIssue();
			IssueType issueType = modifyIssue.getIssueType();
			IssueStatus issueStatus = issueType.getIssueStatus();
			if (issueStatus == null) {

			Set<IssueTypeApiEndStatus> issueTypeApiEndStatuses = issueType.getIssueTypeApiEndStatuses();
			IssueTypeApiEndStatus issueStatus = null;
			if (issueTypeApiEndStatuses != null && issueTypeApiEndStatuses.size() > 0) {
			issueStatus = issueTypeApiEndStatuses.iterator().next();
			} else {
			throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_COMPLETE_ISSUE_STATUS_NOT_EXIST));
			}

			if (parentIssue != null) {

			IssueCondition issueCondition = new IssueCondition(issueVo.getId(), parentIssue.getId());
			List<Map<String, Object>> results = this.issueMapper.findNotCompleteByParentIssueId(issueCondition);
			// 하위 일감이 모두 종료 상태일때 상위 일감도 종료 처리
			if (results == null \|\| results.size() == 0) {
			parentIssue.setIssueStatus(issueType.getIssueStatus());
			parentIssue.setIssueStatus(issueStatus.getIssueStatus());
			this.issueRepository.saveAndFlush(parentIssue);
			}
			}
			@@ -1681,6 +2040,13 @@
			// 이슈 수정(API용)
			private Issue modifyIssueForApi(User user, IssueForm issueForm, List<MultipartFile> multipartFiles) {
			CheckIssueData checkIssueData = this.checkIssue(user, issueForm);

			if (issueForm.getComment() != null && !issueForm.getComment().equals("")) { //댓글 추가
			IssueCommentForm issueCommentForm = new IssueCommentForm();
			issueCommentForm.setDescription(issueForm.getComment());
			issueCommentForm.setIssueId(issueForm.getId());
			this.issueCommentService.addIssueComment(issueCommentForm, user);
			}

			// 이슈 이력 남기기
			this.addIssueHistoryModify(user, issueForm, checkIssueData, multipartFiles);
			@@ -1776,20 +2142,30 @@
			this.checkNotHaveIssueIdAttachedFile(issue, issueForm);
			// 사용자 정의 필드 저장
			this.issueCustomFieldValueService.modifyIssueCustomFieldValue(issue, issueForm.getIssueCustomFields());
			// 이슈 이력 등록
			if (!StringUtils.isEmpty(detectIssueChange.toString())) {
			this.issueHistoryService.addIssueHistory(issue, user, IssueHistoryType.MODIFY, detectIssueChange.toString());
			}
			// 사용자 시스템 기능 사용 정보 수집
			UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class);
			log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(userVo, ElasticSearchConstants.ISSUE_MODIFY));

			// 업체 정보 저장
			this.issueCompanyService.modifyIssueCompanyField(issue, issueForm.getIssueCompanyFields());
			this.issueCompanyService.modifyIssueCompanyField(issue, issueForm, detectIssueChange);
			// ISP 정보 저장
			this.issueIspService.modifyIssueIspField(issue, issueForm.getIssueIspFields());
			this.issueIspService.modifyIssueIspField(issue, issueForm, detectIssueChange);
			// HOSTING 정보 저장
			this.issueHostingService.modifyIssueHostingField(issue, issueForm.getIssueHostingFields());
			this.issueHostingService.modifyIssueHostingField(issue, issueForm, detectIssueChange);

			// 파트너정보 하위이슈 상속
			List<Issue> downIssues = this.issueRepository.findByParentIssueId(issue.getId());
			if (issueForm.getInheritYn() != null && issueForm.getInheritYn()
			&& downIssues != null && downIssues.size() > 0) {
			for (Issue downIssue : downIssues) {
			this.inheritPartners(downIssue, issue);
			}
			}

			// 이슈 이력 등록
			if (!StringUtils.isEmpty(detectIssueChange.toString())) {
			this.issueHistoryService.addIssueHistory(issue, user, IssueHistoryType.MODIFY, detectIssueChange.toString());
			}

			return issue;
			}
			@@ -1906,7 +2282,7 @@
			// 이슈 수정 권한 체크
			private void verifyIssueModifyPermission(Issue issue, User user) {
			// 이슈 수정 권한을 갖고 있는지 확인
			if (!this.checkHasPermission(ConvertUtil.copyProperties(issue, IssueVo.class), this.getIssueUserVos(issue), user)) {
			if (!this.checkHasPermission(ConvertUtil.copyProperties(issue, IssueVo.class), this.getIssueUserVos(issue), user, this.getIssueDepartmentVos(issue))) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.ISSUE_NOT_MODIFY_PERMISSION));
			}
			@@ -1931,18 +2307,41 @@
			return userVos;
			}

			// 이슈에서 담당자 정보를 추출한다.
			private List<DepartmentVo> getIssueDepartmentVos(Issue issue) {
			List<DepartmentVo> departmentVos = Lists.newArrayList();

			Set<IssueDepartment> issueDepartments = issue.getIssueDepartments();

			try {
			for (IssueDepartment issueDepartment : issueDepartments) {
			Department department = issueDepartment.getDepartment();
			DepartmentVo departmentVo = ConvertUtil.copyProperties(department, DepartmentVo.class);
			departmentVos.add(departmentVo);
			}
			} catch (Exception ex) {

			}

			return departmentVos;
			}

			// 이슈 수정 권한을 갖고 있는지 확인
			private boolean checkHasPermission(IssueVo issueVo, List<UserVo> issueUserVos, User user) {
			private boolean checkHasPermission(IssueVo issueVo, List<UserVo> issueUserVos, User user, List<DepartmentVo> departmentVos) {
			boolean hasPermission = false;

			// 업무 공간 관리자일 경우 수정 권한을 갖는다.
			hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.WORKSPACE_MANAGER, issueVo, null, null, user);
			// 프로젝트 관리자일 경우 해당 프로젝트에 등록된 이슈는 수정 권한을 갖는다.
			hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.PROJECT_MANAGER, issueVo, null, null, user);
			// 이슈 관리자일 경우 수정 권한을 갖는다.
			hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.ISSUE_MANAGER, issueVo, null, null, user);
			// 이슈 등록자일 경우 수정 권한을 갖는다.
			hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.REGISTER, issueVo, null, null, user);
			// 이슈 담당자일 경우 수정 권한을 갖는다. => 담당부서로 수정 - 체크
			// 이슈 담당자일 경우 수정 권한을 갖는다.
			//hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.ASSIGNEE, issueVo, issueUserVos);
			// 이슈 담당부서일 경우 수정 권한을 갖는다.
			hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.DEPARTMENT, issueVo, null, departmentVos, user);
			// 담당자가 없으면 모든 사용자가 수정 권한을 갖는다.

			//hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.ALL_ISSUE_MANAGER, issueVo, null, null, user);
			@@ -1952,7 +2351,7 @@
			}

			// 이슈 수정 권한을 확인한다.
			private boolean checkIssueModifyPermission(Boolean hasPermission, String checkType, IssueVo issueVo, List<UserVo> issueUserVos, List<DepartmentVo> issueDepartmentVos, User user) {
			private boolean checkIssueModifyPermission(Boolean hasPermission, String checkType, IssueVo issueVo, List<UserVo> issueUserVos, List<DepartmentVo> departmentVos, User user) {
			if (!hasPermission) {
			switch (checkType) {
			case Issue.WORKSPACE_MANAGER: // 업무 공간 관리자
			@@ -1964,6 +2363,11 @@
			Issue issue = this.getIssue(issueVo.getId());
			// 프로젝트 관리자일 경우 해당 프로젝트에 등록된 이슈는 수정 권한을 갖는다.
			hasPermission = this.projectRoleUserService.checkProjectManager(issue.getProject(), user);
			break;

			case Issue.ISSUE_MANAGER: // 이슈 관리자
			UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
			hasPermission = MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE);
			break;

			case Issue.REGISTER: // 이슈 등록자
			@@ -1987,17 +2391,22 @@

			case Issue.DEPARTMENT:
			// 담당부서가 없으면 모든 사용자가 수정 권한을 갖는다.
			if (issueDepartmentVos.size() < 1) {
			/*if (userDepartmentVos.size() < 1) {
			hasPermission = true;
			break;
			}
			// 이슈 담당부서 여부 확인
			/*for (DepartmentVo issueDepartmentVo : issueDepartmentVos) {
			if (issueDepartmentVo.getId().equals()) {
			hasPermission = true;
			break;
			}
			}*/
			// 이슈 담당부서 여부 확인
			for (DepartmentVo departmentVo : departmentVos) {
			List<UserDepartment> userDepartments = this.userDepartmentService.findByDepartmentId(departmentVo.getId());
			if(userDepartments != null && userDepartments.size() > 0) {
			for (UserDepartment userDepartment : userDepartments) {
			if (userDepartment.getUserId().equals(user.getId())){
			hasPermission = true;
			break;
			}
			}
			}
			}
			break;
			}
			}
			@@ -2020,6 +2429,19 @@
			this.verifyIssueModifyPermission(issue, user);

			IssueStatus issueStatus = this.issueStatusService.getIssueStatus(issueForm.getIssueStatusId());

			if (issueStatus.getIssueStatusType().toString().equals("CLOSE")) {
			List<String> downIssuesStatus = issueForm.getDownIssuesStatus();
			if (downIssuesStatus != null && downIssuesStatus.size() > 0) {
			for (String downIssueStatus : downIssuesStatus) {
			if (!downIssueStatus.equals("CLOSE")) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.ISSUE_NOT_MODIFY_STATUS));
			}
			}
			}
			}

			// 이슈 상태를 변경할 때 선택한 이슈 상태로 변경할 수 있는지 확인한다.
			this.issueStatusService.checkNextIssueStatus(issue, issueStatus);
			// 변경 이력 정보 추출
			@@ -2388,6 +2810,9 @@
			excelInfo.addAttrInfos(new ExportExcelAttrVo("register", this.messageAccessor.message("common.register"), 20, ExportExcelAttrVo.ALIGN_CENTER)); // 등록자
			excelInfo.addAttrInfos(new ExportExcelAttrVo("period", this.messageAccessor.message("common.period"), 20, ExportExcelAttrVo.ALIGN_CENTER)); // 기간
			excelInfo.addAttrInfos(new ExportExcelAttrVo("modifyDate", this.messageAccessor.message("common.modifyDate"), 20, ExportExcelAttrVo.ALIGN_CENTER)); // 최종 변경일
			excelInfo.addAttrInfos(new ExportExcelAttrVo("companyName", this.messageAccessor.message("common.company"), 20, ExportExcelAttrVo.ALIGN_CENTER)); // 업체
			excelInfo.addAttrInfos(new ExportExcelAttrVo("ispName", this.messageAccessor.message("common.isp"), 20, ExportExcelAttrVo.ALIGN_CENTER)); // ISP
			excelInfo.addAttrInfos(new ExportExcelAttrVo("hostingName", this.messageAccessor.message("common.hosting"), 20, ExportExcelAttrVo.ALIGN_CENTER)); // 호스팅


			// 사용자 정의 필드를 사용한 이슈를 찾는다. 만약 이슈가 없다면 여기서 이슈 조회가 끝난다.
			@@ -2448,8 +2873,16 @@

			for (IssueVo issueVo : issueVos) {
			for (Map<String, Object> issueCustomFieldValue : issueCustomFieldValues) {
			int count = 0;
			Map<String, Object> useValues = new HashMap<>();

			if (issueVo.getId().equals(MapUtil.getLong(issueCustomFieldValue, "issueId"))) {
			IssueCustomFieldValueVo issueCustomFieldValueVo = new IssueCustomFieldValueVo();

			useValues.put("useValue"+count, MapUtil.getString(issueCustomFieldValue, "useValue"));
			useValues.put("customFieldId", MapUtil.getLong(issueCustomFieldValue, "customFieldId"));
			issueCustomFieldValueVo.setUseValues(useValues);

			issueCustomFieldValueVo.setUseValue(MapUtil.getString(issueCustomFieldValue, "useValue"));

			CustomFieldVo customFieldVo = new CustomFieldVo();
			@@ -2471,6 +2904,30 @@
			CompanyField companyField = issueCompany.getCompanyField();
			if (companyField != null) {
			issueCompanyVo.setCompanyId(issueCompany.getCompanyField().getId());
			if (issueCompany.getCompanyTypeId() != null && issueCompany.getCompanyTypeId() != -1) {
			CompanyFieldCategory companyType = this.companyFieldCategoryService.find(issueCompany.getCompanyTypeId());
			issueCompanyVo.setCompanyTypeName(companyType.getUseValue());
			}
			if (issueCompany.getParentSectorId() != null && issueCompany.getParentSectorId() != -1) {
			CompanyFieldCategory parentSector = this.companyFieldCategoryService.find(issueCompany.getParentSectorId());
			issueCompanyVo.setParentSectorName(parentSector.getUseValue());
			}
			if (issueCompany.getChildSectorId() != null && issueCompany.getChildSectorId() != -1) {
			CompanyFieldCategory childSector = this.companyFieldCategoryService.find(issueCompany.getChildSectorId());
			issueCompanyVo.setChildSectorName(childSector.getUseValue());
			}
			if (issueCompany.getRegionId() != null && issueCompany.getRegionId() != -1) {
			CompanyFieldCategory region = this.companyFieldCategoryService.find(issueCompany.getRegionId());
			issueCompanyVo.setRegionName(region.getUseValue());
			}
			if (issueCompany.getStatusId() != null && issueCompany.getStatusId() != -1) {
			if (issueCompany.getStatusName() != null && !issueCompany.getStatusName().equals("")) {
			issueCompanyVo.setStatusName(issueCompany.getStatusName());
			} else {
			CompanyFieldCategory status = this.companyFieldCategoryService.find(issueCompany.getStatusId());
			issueCompanyVo.setStatusName(status.getUseValue());
			}
			}
			}
			issueCompanyVos.add(issueCompanyVo);
			}
			@@ -2540,6 +2997,9 @@
			result.put("departments", CommonUtil.convertDepartmentVosToString(issueVo.getDepartmentVos()));
			result.put("priorityName", issueVo.getPriorityName());
			result.put("severityName", issueVo.getSeverityName());
			result.put("companyName", issueVo.getCompanyName());
			result.put("ispName", issueVo.getIspName());
			result.put("hostingName", issueVo.getHostingName());

			UserVo register = this.userService.removeSensitiveUser(issueVo.getRegisterId());
			// 등록자
			@@ -2613,13 +3073,13 @@
			excelInfo.setFileName(this.messageAccessor.message("common.registerExcelIssue")); // 엑셀로 이슈 등록하기
			excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.title"), 20, ExportExcelAttrVo.ALIGN_CENTER)); // 제목
			excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.content"), 40, ExportExcelAttrVo.ALIGN_CENTER)); // 내용
			excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.projectKey"), 10, ExportExcelAttrVo.ALIGN_LEFT)); // 프로젝트 키
			excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.issueType"), 10, ExportExcelAttrVo.ALIGN_CENTER)); // 이슈 타입
			excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.priority"), 5, ExportExcelAttrVo.ALIGN_CENTER)); // 우선순위
			excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.importance"), 5, ExportExcelAttrVo.ALIGN_CENTER)); // 중요도
			excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.department"), 10, ExportExcelAttrVo.ALIGN_CENTER)); // 담당부서
			excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.startDate"), 10, ExportExcelAttrVo.ALIGN_CENTER)); // 시작일
			excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.endDate"), 10, ExportExcelAttrVo.ALIGN_CENTER)); // 종료일
			excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.company"), 10, ExportExcelAttrVo.ALIGN_CENTER)); // 업체
			excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.isp"), 10, ExportExcelAttrVo.ALIGN_CENTER)); // ISP
			excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.hosting"), 10, ExportExcelAttrVo.ALIGN_CENTER)); // 호스팅
			// 프로젝트에 연결된 사용자 정의 필드 정보를 추출하여 엑셀 download 템플릿을 만든다.
			this.makeIssueExcelTemplateCustomFields(excelInfo, conditions);
			// 엑셀에 넣을 데이터 - IssueVos 데이터를 엑셀에서 표시할 수 있는 데이터로 변경한다.
			@@ -2641,7 +3101,7 @@
			// 엑셀 import 로 이슈를 등록한다.
			@Override
			@Transactional
			public void importExcel(MultipartFile multipartFile) throws Exception {
			public void importExcel(IssueForm issueForm, MultipartFile multipartFile) throws Exception {
			/*StopWatch serviceStart = new StopWatch();
			serviceStart.start();*/

			@@ -2652,19 +3112,21 @@
			// 업로드 파일 확장자 체크
			this.verifyMultipartFileExtension(multipartFile);

			Map<String, Project> projectMaps = new HashMap<>(); // 프로젝트 모음
			Map<String, IssueType> issueTypeMaps = new HashMap<>(); // 이슈 타입 모음
			Map<String, Priority> priorityMaps = new HashMap<>(); // 우선 순위 모음
			Map<String, Severity> severityMaps = new HashMap<>(); // 중요도 모음
			Map<String, Object> userMaps = new HashMap<>(); // 사용자 모음
			Map<String, Object> departmentMaps = new HashMap<>(); // 부서 모음
			Map<String, DepartmentVo> departmentMaps = new HashMap<>(); // 부서 모음
			Map<String, CustomField> customFieldMaps = new HashMap<>();
			Map<String, IssueStatus> issueStatusReadyMaps = new HashMap<>(); // 상태 속성 '대기'인 이슈 상태
			Map<Long, Long> issueNumberMaps = new HashMap<>(); // 이슈 번호 모음
			Map<String, Long> issueTypeCustomFieldMaps = new HashMap<>(); // 이슈 타입 + 사용자 정의 필드 연결 정보

			Map<String, CompanyField> companyFieldMaps = new HashMap<>(); //업체 모음
			Map<String, IspField> ispFieldMaps = new HashMap<>(); //isp 모음
			Map<String, HostingField> hostingFieldMaps = new HashMap<>(); //호스팅 모음

			Workspace workspace = this.workspaceService.getWorkspace(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId()); // 이슈를 넣으려는 업무 공간
			// 이슈의 주요 속성을 map 에 저장하여 엑셀 import 에서 지정한 대상(이슈 속성)을 빠르게 찾을 수 있게 한다.
			this.IssueAttributeMapToList(projectMaps, issueTypeMaps, priorityMaps, severityMaps, userMaps, departmentMaps, customFieldMaps, issueNumberMaps, issueTypeCustomFieldMaps, issueStatusReadyMaps);
			this.IssueAttributeMapToList(issueForm, priorityMaps, severityMaps, departmentMaps, customFieldMaps,
			issueTypeCustomFieldMaps, companyFieldMaps, ispFieldMaps, hostingFieldMaps);
			// 0.237 - 0.230

			List<IssueForm> issueForms = Lists.newArrayList();
			@@ -2707,7 +3169,11 @@
			// 1번 헤더부터 데이터 영역
			if (rowIndex > 1) {
			// 이슈로 등록하기 위해 IssueForm 에 데이터를 셋팅한다.
			issueForms.add(this.setIssueFormToExcelField(row, (rowIndex + 1), issueStatusReadyMaps, projectMaps, issueTypeMaps, priorityMaps, severityMaps, userMaps, customFieldMaps, issueNumberMaps, headers));
			IssueForm newIssueForm = this.setIssueFormToExcelField(row, (rowIndex + 1), priorityMaps, severityMaps, customFieldMaps,
			companyFieldMaps, ispFieldMaps, hostingFieldMaps, headers);
			ConvertUtil.copyProperties(issueForm, newIssueForm);

			issueForms.add(newIssueForm);
			}
			}

			@@ -2718,7 +3184,57 @@


			// 이슈 등록
			this.issueMapper.insertBatch(issueForms);
			// this.issueMapper.insertBatch(issueForms);

			for (IssueForm saveIssueForm : issueForms) {
			Issue issue = new Issue();
			ConvertUtil.copyProperties(saveIssueForm, issue);

			IssueType issueType = this.issueTypeService.getIssueType(saveIssueForm.getIssueTypeId());
			Workflow workflow = issueType.getWorkflow();

			Project project = this.projectService.getProject(saveIssueForm.getProjectId());
			Long issueNumber = this.issueNumberGeneratorService.generateIssueNumber(project);

			IssueStatus issueStatus = this.issueStatusService.findByIssueStatusTypeIsReady(workflow);

			issue.setPriority(this.priorityService.getPriority(saveIssueForm.getPriorityId()));
			issue.setSeverity(this.severityService.getSeverity(saveIssueForm.getSeverityId()));
			issue.setIssueStatus(issueStatus);
			issue.setIssueType(issueType);
			issue.setProject(project);
			issue.setIssueNumber(issueNumber);
			if (saveIssueForm.getParentIssueId() != null && saveIssueForm.getParentIssueId() > -1) {
			issue.setParentIssue(this.getIssue(saveIssueForm.getParentIssueId()));
			}

			issue = this.issueRepository.saveAndFlush(issue);

			if (issueForm.getInheritYn() != null && issueForm.getInheritYn() && issue.getParentIssue() != null) {
			// 상위이슈의 파트너 정보 상속
			this.inheritPartners(issue, issue.getParentIssue());
			}

			saveIssueForm.setId(issue.getId());

			IssueDepartment issueDepartment = new IssueDepartment();
			issueDepartment.setIssue(issue);
			issueDepartment.setWorkspace(workspace);

			List<Long> departmentsIds = this.workflowDepartmentService.findFirstDepartmentIds(workflow);
			if (departmentsIds != null && departmentsIds.size() > 0) {
			for (Long departmentId : departmentsIds) {
			issueDepartment.setDepartment(this.departmentService.getDepartment(departmentId));
			}
			issue.addIssueDepartment(issueDepartment);
			}

			saveIssueForm.setIssueStatusId(issueStatus.getId());

			this.setIssuePartners(saveIssueForm, issue);
			}


			// 0.416 - 0.439

			// 1.373 ~ 1.394
			@@ -2737,8 +3253,6 @@
			this.bulkInsertIssueCustomFieldValue(issueForms, issueTypeCustomFieldMaps);
			// 3.628 - 3.445

			// 업체,ISP,호스팅 추가

			/*serviceStart.stop();
			log.debug("2차 저장 시간 : " + serviceStart.getTime());*/

			@@ -2748,7 +3262,71 @@
			// reverse index 업데이트
			this.issueMapper.updateBatch(issueForms);
			// 증가된 이슈 번호를 업데이트 한다.
			this.issueNumberGeneratorService.updateIssueNumber(issueNumberMaps);
			// issueNumberMaps.put(issueForm.getProjectId(), issueForm.getProjectId());
			// this.issueNumberGeneratorService.updateIssueNumber(issueNumberMaps);
			}
			}

			/**
			* 엑셀로 입력한 파트너 정보 저장
			* @param issueForm IssueForm
			*/
			private void setIssuePartners(IssueForm issueForm, Issue issue) {
			IssueCompany issueCompany = new IssueCompany();
			IssueIsp issueIsp = new IssueIsp();
			IssueHosting issueHosting = new IssueHosting();
			//issueCompany 등록
			if (issueForm.getIssueCompanyFields() != null && issueForm.getIssueCompanyFields().size() > 0) {
			for (Map<String, Object> issueCompanyMap : issueForm.getIssueCompanyFields()) {
			CompanyField companyField = ConvertUtil.convertMapToClass(issueCompanyMap, CompanyField.class);
			issueCompany = ConvertUtil.convertMapToClass(issueCompanyMap, IssueCompany.class, "id");
			issueCompany.setCompanyField(companyField);
			issueCompany.setIssue(issue);
			this.issueCompanyRepository.saveAndFlush(issueCompany);

			// 사용자가 ISP를 직접 입력하지 않았을 경우 업체에 등록되어있는 ISP 설정
			if (issueForm.getIssueIspFields() == null \|\| issueForm.getIssueIspFields().size() < 1) {
			// 업체의 ISP가 있는 경우 issueISP 등록
			if (companyField.getIspId() != null && companyField.getIspId() != -1) {
			IspField ispField = this.ispFieldService.getIsp(companyField.getIspId());
			issueIsp = ConvertUtil.copyProperties(ispField, IssueIsp.class, "id");
			issueIsp.setIspField(ispField);
			issueIsp.setIssue(issue);
			this.issueIspRepository.saveAndFlush(issueIsp);
			}
			}
			// 사용자가 호스팅을 직접 입력하지 않았을 경우 업체에 등록되어있는 호스팅 설정
			if (issueForm.getIssueHostingFields() == null \|\| issueForm.getIssueHostingFields().size() < 1) {
			// 업체의 호스팅이 있는 경우 issueHosting 등록
			if (companyField.getHostingId() != null && companyField.getHostingId() != -1) {
			HostingField hostingField = this.hostingFieldService.getHosting(companyField.getHostingId());
			issueHosting = ConvertUtil.copyProperties(hostingField, IssueHosting.class, "id");
			issueHosting.setHostingField(hostingField);
			issueHosting.setIssue(issue);
			this.issueHostingRepository.saveAndFlush(issueHosting);
			}
			}
			}
			}
			//issueIsp 등록
			if (issueForm.getIssueIspFields() != null && issueForm.getIssueIspFields().size() > 0) {
			for (Map<String, Object> issueIspMap : issueForm.getIssueIspFields()) {
			issueIsp = ConvertUtil.convertMapToClass(issueIspMap, IssueIsp.class, "id");
			IspField ispField = ConvertUtil.convertMapToClass(issueIspMap, IspField.class);
			issueIsp.setIspField(ispField);
			issueIsp.setIssue(issue);
			this.issueIspRepository.saveAndFlush(issueIsp);
			}
			}
			//issueHosting 등록
			if (issueForm.getIssueHostingFields() != null && issueForm.getIssueHostingFields().size() > 0) {
			for (Map<String, Object> issueHostingMap : issueForm.getIssueHostingFields()) {
			issueHosting = ConvertUtil.convertMapToClass(issueHostingMap, IssueHosting.class, "id");
			HostingField hostingField = ConvertUtil.convertMapToClass(issueHostingMap, HostingField.class);
			issueHosting.setHostingField(hostingField);
			issueHosting.setIssue(issue);
			this.issueHostingRepository.saveAndFlush(issueHosting);
			}
			}
			}

			@@ -2849,6 +3427,41 @@
			issueCustomField.put("registerId", this.webAppUtil.getLoginId());
			issueCustomFieldValueMaps.add(issueCustomField);
			}

			// 엑셀에 업체명을 입력하지 않았을 경우 같은 도메인 업체 찾기
			if (issueForm.getIssueCompanyFields() == null \|\| issueForm.getIssueCompanyFields().size() < 1) {
			// 같은 도메인 업체 찾기
			IssueForm partners = this.findCompanyField(issueForm);
			Issue issue = this.findOne(issueForm.getId());
			if (partners.getIssueCompanyFields() != null && partners.getIssueCompanyFields().size() > 0) {
			for (Map<String, Object> company : partners.getIssueCompanyFields()) {
			IssueCompany issueCompany = ConvertUtil.convertMapToClass(company, IssueCompany.class);
			CompanyField companyField = ConvertUtil.convertMapToClass(company, CompanyField.class);
			issueCompany.setCompanyField(companyField);
			issueCompany.setIssue(issue);

			this.issueCompanyRepository.saveAndFlush(issueCompany);
			}
			}
			if (partners.getIssueIspFields() != null && partners.getIssueIspFields().size() > 0) {
			for (Map<String, Object> isp : partners.getIssueIspFields()) {
			IssueIsp issueIsp = ConvertUtil.convertMapToClass(isp, IssueIsp.class);
			IspField ispField = ConvertUtil.convertMapToClass(isp, IspField.class);
			issueIsp.setIspField(ispField);
			issueIsp.setIssue(issue);
			this.issueIspRepository.saveAndFlush(issueIsp);
			}
			}
			if (partners.getIssueHostingFields() != null && partners.getIssueHostingFields().size() > 0) {
			for (Map<String, Object> hosting : partners.getIssueHostingFields()) {
			IssueHosting issueHosting = ConvertUtil.convertMapToClass(hosting, IssueHosting.class);
			HostingField hostingField = ConvertUtil.convertMapToClass(hosting, HostingField.class);
			issueHosting.setHostingField(hostingField);
			issueHosting.setIssue(issue);
			this.issueHostingRepository.saveAndFlush(issueHosting);
			}
			}
			}
			}

			if (issueCustomFieldValueMaps.size() > 0) {
			@@ -2857,50 +3470,16 @@
			}

			// 이슈의 주요 속성을 map 에 저장하여 엑셀 import 에서 지정한 대상(이슈 속성)을 빠르게 찾을 수 있게 한다.
			private void IssueAttributeMapToList(Map<String, Project> projectMaps, Map<String, IssueType> issueTypeMaps, Map<String, Priority> priorityMaps, Map<String, Severity> severityMaps,
			Map<String, Object> userMaps, Map<String, Object> departmentMaps, Map<String, CustomField> customFieldMaps, Map<Long, Long> issueNumberMaps, Map<String, Long> issueTypeCustomFieldMaps, Map<String, IssueStatus> issueStatusReadyMaps) {
			// 프로젝트 키로 바로 찾을 수 있게 준비
			List<Project> projects = this.projectService.findByWorkspaceId();
			List<Long> projectIds = Lists.newArrayList();
			private void IssueAttributeMapToList(IssueForm issueForm, Map<String, Priority> priorityMaps, Map<String, Severity> severityMaps,
			Map<String, DepartmentVo> departmentMaps, Map<String, CustomField> customFieldMaps,Map<String, Long> issueTypeCustomFieldMaps,
			Map<String, CompanyField> companyFieldMaps, Map<String, IspField> ispFieldMaps, Map<String, HostingField> hostingFieldMaps) {

			for (Project project : projects) {
			projectIds.add(project.getId());
			// 해당 프로젝트에서 생성되는 다음 이슈 번호를 생성해온다.
			issueNumberMaps.put(project.getId(), this.issueNumberGeneratorService.generateIssueNumber(project));
			projectMaps.put(project.getProjectKey(), project);
			Project project = this.projectService.getProject(issueForm.getProjectId());

			for (IssueTypeCustomField issueTypeCustomField : project.getIssueTypeCustomFields()) {
			// 빠르게 찾기 위해 이슈 타입 아이디 + 사용자 정의 필드 아이디를 키로 한다.
			String makeKey = issueTypeCustomField.getIssueType().getId().toString() + issueTypeCustomField.getCustomField().getId().toString();
			issueTypeCustomFieldMaps.put(makeKey, issueTypeCustomField.getId());
			}

			// 프로젝트에 참여하는 사용자 정보
			List<Map<String, Object>> users = this.userService.findProjectMember(project);
			Map<String, Object> userMap = new HashMap<>();
			// 사용자 정보를 Map 에 저장
			for (Map<String, Object> user : users) {
			userMap.put(CommonUtil.decryptAES128(MapUtil.getString(user, "account")), MapUtil.getLong(user, "userId"));
			}

			userMaps.put(project.getProjectKey(), userMap);

			// 프로젝트에 참여하는 부서 정보
			List<Map<String, Object>> departments = this.departmentService.findProjectDepartment(project);
			List<Long> departmentList = Lists.newArrayList();
			// 부서 정보를 저장
			for (Map<String, Object> department : departments) {
			departmentList.add(MapUtil.getLong(department, "departmentId"));
			}
			}

			// 이슈 유형을 바로 찾을 수 있게 준비
			List<IssueType> issueTypes = this.issueTypeService.findByWorkspaceId();
			for (IssueType issueType : issueTypes) {
			issueTypeMaps.put(issueType.getName(), issueType);

			IssueStatus issueStatus = this.issueStatusService.findByIssueStatusTypeIsReady(issueType.getWorkflow());
			issueStatusReadyMaps.put(issueType.getId().toString(), issueStatus);
			for (IssueTypeCustomField issueTypeCustomField : project.getIssueTypeCustomFields()) {
			// 빠르게 찾기 위해 이슈 타입 아이디 + 사용자 정의 필드 아이디를 키로 한다.
			String makeKey = issueTypeCustomField.getIssueType().getId().toString() + issueTypeCustomField.getCustomField().getId().toString();
			issueTypeCustomFieldMaps.put(makeKey, issueTypeCustomField.getId());
			}

			// 우선순위를 바로 찾을 수 있게 준비
			@@ -2920,98 +3499,190 @@
			for (CustomField customField : customFields) {
			customFieldMaps.put(customField.getName(), customField);
			}

			// 업체 정보를 바로 찾을 수 있게 준비
			List<CompanyField> companyFields = this.companyFieldService.findAll();
			for (CompanyField companyField : companyFields) {
			companyFieldMaps.put(companyField.getName(), companyField);
			}
			// ISP 정보를 바로 찾을 수 있게 준비
			List<IspField> ispFields = this.ispFieldService.findAll();
			for (IspField ispField : ispFields) {
			ispFieldMaps.put(ispField.getName(), ispField);
			}
			// 호스팅 정보를 바로 찾을 수 있게 준비
			List<HostingField> hostingFields = this.hostingFieldService.findAll();
			for (HostingField hostingField : hostingFields) {
			hostingFieldMaps.put(hostingField.getName(), hostingField);
			}
			}

			/**
			* cell String으로 변환 함수
			* @param cell Cell
			* @param isNull boolean
			* @return String
			*/
			private String stringToCell (Cell cell, boolean isNull) {
			String cellStr = "";
			if (!isNull) {
			cellStr = CommonUtil.convertExcelStringToCell(cell);
			// 공백 제거
			cell.setCellValue(cellStr.trim());
			} else {
			cell.setCellValue(cellStr);
			}
			return cellStr;
			}

			/**
			* cell NULL 체크 함수
			* 빈 값이 아닌 cell 체크
			* @param cell Cell
			* @return boolean
			*/
			private Boolean cellNullCheck (Cell cell) {
			int cellType = cell.getCellType();
			if (cellType < Cell.CELL_TYPE_BLANK) {
			if (cellType == Cell.CELL_TYPE_STRING) {
			if (cell.getStringCellValue() != null && !cell.getStringCellValue().equals("")) {
			return false;
			}
			} else {
			return false;
			}
			}
			return true;
			}

			// 엑셀 필드에 있는 정보를 이슈 form 으로 옮긴다.
			private IssueForm setIssueFormToExcelField(Row row, int rowIndex, Map<String, IssueStatus> issueStatusReadyMaps, Map<String, Project> projectMaps, Map<String, IssueType> issueTypeMaps, Map<String,
			Priority> priorityMaps, Map<String, Severity> severityMaps, Map<String, Object> userMaps, Map<String, CustomField> customFieldMaps, Map<Long, Long> issueNumberMaps, List<String> headers) {
			private IssueForm setIssueFormToExcelField(Row row, int rowIndex, Map<String, Priority> priorityMaps,
			Map<String, Severity> severityMaps, Map<String, CustomField> customFieldMaps,
			Map<String, CompanyField> companyFieldMaps, Map<String, IspField> ispFieldMaps, Map<String, HostingField> hostingFieldMaps,
			List<String> headers) throws ParseException {
			IssueForm issueForm = new IssueForm();
			issueForm.setRegisterId(this.webAppUtil.getLoginId());
			Project project = null;

			// 제목, 내용, 프로젝트 키, 이슈 타입, 우선순위, 중요도, 담당자, 시작일, 종료일, 사용자 정의 필드
			for (int cellIndex = 0; cellIndex < headers.size(); cellIndex++) {
			Cell cell = row.getCell(cellIndex);

			String cellStr = "";
			boolean isNull = true;

			if (cell != null) {
			isNull = cellNullCheck(cell);
			cellStr = stringToCell(cell, isNull); //cell을 String으로 변환
			}

			switch (cellIndex) {
			case 0:
			// 이슈 제목을 IssueForm 에 저장한다.
			this.setIssueFormTitle(cell, issueForm, rowIndex);
			if (isNull) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_ISSUE_TITLE_IS_NULL, rowIndex));
			}
			this.setIssueFormTitle(cellStr, issueForm, rowIndex);
			break;

			case 1: // 내용
			if (cell != null) {
			issueForm.setDescription(CommonUtil.convertExcelStringToCell(cell));
			} else {
			// null 입력 방지
			issueForm.setDescription("");
			}

			issueForm.setDescription(cellStr);
			break;

			case 2: // 프로젝트 키와 이슈 번호
			project = this.setIssueFormProjectKeyAndIssueNumber(cell, issueForm, projectMaps, issueNumberMaps, rowIndex);
			case 2:
			// 우선순위를 IssueForm 에 저장한다.
			if (isNull) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_PRIORITY_IS_NULL, rowIndex));
			}
			this.setIssueFormPriority(cellStr, priorityMaps, issueForm, rowIndex);
			break;

			case 3:
			// 이슈 타입을 IssueForm 에 저장한다.
			this.setIssueFormIssueType(cell, issueTypeMaps, issueForm, rowIndex);
			// 이슈 타입에 연결된 워크플로우의 상태 속성 '대기' 인 상태를 issueForm 에 저장한다.
			this.setIssueFormIssueStatus(issueStatusReadyMaps, issueForm, rowIndex);
			break;

			case 4:
			// 우선순위를 IssueForm 에 저장한다.
			this.setIssueFormPriority(cell, priorityMaps, issueForm, rowIndex);
			break;

			case 5:
			// 중요도를 IssueForm 에 저장한다.
			this.setIssueFormSeverity(cell, severityMaps, issueForm, rowIndex);
			if (isNull) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_SEVERITY_IS_NULL, rowIndex));
			}
			this.setIssueFormSeverity(cellStr, severityMaps, issueForm, rowIndex);
			break;
			/*case 6:
			// 담당자를 IssueForm 에 저장한다.
			this.setIssueFormAssignee(cell, userMaps, issueForm, project);
			break;*/
			case 4:
			// 시작일을 IssueForm 에 저장한다.
			this.setIssueFormPeriod(cellStr, issueForm, true, rowIndex, isNull);
			break;
			case 5:
			// 종료일을 IssueForm 에 저장한다.
			this.setIssueFormPeriod(cellStr, issueForm, false, rowIndex, isNull);
			break;
			case 6:
			// 담당부서를 IssueForm 에 저장한다.
			this.setIssueFormAssignee(cell, userMaps, issueForm, project);
			// 업체를 IssueForm 에 저장한다.
			this.setIssueFormCompanyField(cellStr, companyFieldMaps, issueForm, rowIndex);
			break;
			case 7:
			// 시작일을 IssueForm 에 저장한다.
			this.setIssueFormPeriod(cell, issueForm, true, rowIndex);
			// ISP를 IssueForm 에 저장한다.
			this.setIssueFormIspField(cellStr, ispFieldMaps, issueForm, rowIndex);
			break;
			case 8:
			// 종료일을 IssueForm 에 저장한다.
			this.setIssueFormPeriod(cell, issueForm, false, rowIndex);
			// 호스팅을 IssueForm 에 저장한다.
			this.setIssueFormHostingField(cellStr, hostingFieldMaps, issueForm, rowIndex);
			break;
			default:
			// 8번 이상부터는 사용자 정의 필드. 사용자 정의 필드 정보를 IssueForm 에 저장한다.
			this.setIssueFormCustomFieldValue(cell, customFieldMaps, issueForm, headers.get(cellIndex), rowIndex);
			// 9번 부터는 사용자 정의 필드. 사용자 정의 필드 정보를 IssueForm 에 저장한다.
			this.setIssueFormCustomFieldValue(cellStr, customFieldMaps, issueForm, headers.get(cellIndex), rowIndex);
			}
			}

			return issueForm;
			}

			// 이슈 제목을 IssueForm 에 저장한다.
			private void setIssueFormTitle(Cell cell, IssueForm issueForm, int rowIndex) {
			if (cell == null) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_ISSUE_TITLE_IS_NULL, rowIndex));
			private void setIssueFormHostingField(String cell, Map<String, HostingField> hostingFieldMaps, IssueForm issueForm, int rowIndex) {
			if (cell.length() > 0) {
			Map<String, Object> issueHostingFields = new HashMap<>();
			HostingField hostingFieldMap = hostingFieldMaps.get(cell);
			if (hostingFieldMap == null) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_HOSTING_NOT_EXIST, rowIndex));
			}
			ConvertUtil.copyProperties(hostingFieldMap, issueHostingFields);
			issueForm.addIssueHostingField(issueHostingFields);
			}
			}

			String title = CommonUtil.convertExcelStringToCell(cell);
			private void setIssueFormIspField(String cell, Map<String, IspField> ispFieldMaps, IssueForm issueForm, int rowIndex) {
			if (cell.length() > 0) {
			Map<String, Object> issueIspFields = new HashMap<>();
			IspField ispFieldMap = ispFieldMaps.get(cell);
			if (ispFieldMap == null) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_ISP_NOT_EXIST, rowIndex));
			}
			ConvertUtil.copyProperties(ispFieldMap, issueIspFields);
			issueForm.addIssueIspField(issueIspFields);
			}
			}

			private void setIssueFormCompanyField(String cell, Map<String, CompanyField> companyFieldMaps, IssueForm issueForm, int rowIndex) {
			if (cell.length() > 0) {
			Map<String, Object> issueCompanyFields = new HashMap<>();
			CompanyField companyFieldMap = companyFieldMaps.get(cell);
			if (companyFieldMap == null) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_COMPANY_NOT_EXIST, rowIndex));
			}
			ConvertUtil.copyProperties(companyFieldMap, issueCompanyFields);
			issueForm.addissueCompanyField(issueCompanyFields);
			}
			}

			// 이슈 제목을 IssueForm 에 저장한다.
			private void setIssueFormTitle(String title, IssueForm issueForm, int rowIndex) {
			// 제목 유효성 체크
			this.verifyTitle(title);
			issueForm.setTitle(title);
			}

			// 프로젝트 키, 이슈 고유 번호, 담당자를 IssueForm 에 저장한다.
			private Project setIssueFormProjectKeyAndIssueNumber(Cell cell, IssueForm issueForm, Map<String, Project> projectMaps, Map<Long, Long> issueNumberMaps, int rowIndex) {
			// 프로젝트 아이디를 IssueForm 에 저장한다.
			Project project = this.setIssueFormProject(cell, projectMaps, issueForm, rowIndex);

			// 이슈 고유 번호를 IssueForm 에 저장한다.
			this.setIssueFormIssueNumber(issueForm, issueNumberMaps, project, rowIndex);

			return project;
			}

			// 프로젝트 아이디를 IssueForm 에 저장한다.
			@@ -3047,43 +3718,10 @@
			issueNumberMaps.put(project.getId(), ++issueNumber); // 이슈 번호를 1씩 증가 시킨다.
			}

			// 이슈 타입을 IssueForm 에 저장한다.
			private void setIssueFormIssueType(Cell cell, Map<String, IssueType> issueTypeMaps, IssueForm issueForm, int rowIndex) {
			if (cell == null) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_ISSUE_TYPE_IS_NULL, rowIndex));
			}

			IssueType issueType = issueTypeMaps.get(CommonUtil.convertExcelStringToCell(cell));

			if (issueType == null) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_ISSUE_TYPE_NOT_EXIST, rowIndex));
			}

			issueForm.setIssueTypeId(issueType.getId());
			}

			// 이슈 타입에 연결된 워크플로우의 상태 속성 '대기' 인 상태를 issueForm 에 저장한다.
			private void setIssueFormIssueStatus(Map<String, IssueStatus> issueStatusReadyMaps, IssueForm issueForm, int rowIndex) {
			IssueStatus issueStatus = issueStatusReadyMaps.get(issueForm.getIssueTypeId().toString());

			if (issueStatus == null) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_ISSUE_STATUS_READY_NOT_EXIST, rowIndex));
			}

			issueForm.setIssueStatusId(issueStatus.getId());
			}

			// 우선순위를 IssueForm 에 저장한다.
			private void setIssueFormPriority(Cell cell, Map<String, Priority> priorityMaps, IssueForm issueForm, int rowIndex) {
			if (cell == null) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_PRIORITY_IS_NULL, rowIndex));
			}

			Priority priority = priorityMaps.get(CommonUtil.convertExcelStringToCell(cell));
			private void setIssueFormPriority(String priorityStr, Map<String, Priority> priorityMaps, IssueForm issueForm, int rowIndex) {
			Priority priority = priorityMaps.get(priorityStr);

			if (priority == null) {
			throw new OwlRuntimeException(
			@@ -3094,13 +3732,8 @@
			}

			// 중요도를 IssueForm 에 저장한다.
			private void setIssueFormSeverity(Cell cell, Map<String, Severity> severityMaps, IssueForm issueForm, int rowIndex) {
			if (cell == null) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_SEVERITY_IS_NULL, rowIndex));
			}

			Severity severity = severityMaps.get(CommonUtil.convertExcelStringToCell(cell));
			private void setIssueFormSeverity(String strSeverity, Map<String, Severity> severityMaps, IssueForm issueForm, int rowIndex) {
			Severity severity = severityMaps.get(strSeverity);

			if (severity == null) {
			throw new OwlRuntimeException(
			@@ -3110,33 +3743,27 @@
			issueForm.setSeverityId(severity.getId());
			}

			// 담당부서를 IssueForm 에 저장한다.
			private void setIssueFormAssignee(Cell cell, Map<String, Object> userMaps, IssueForm issueForm, Project project) {
			if (cell != null) {
			String[] splitAssignee = CommonUtil.convertExcelStringToCell(cell).split("#");
			Map<String, Object> userMap = (Map<String, Object>) MapUtil.getObject(userMaps, project.getProjectKey());

			List<Long> departmentIds = Lists.newArrayList();
			List<Long> userIds = Lists.newArrayList();

			for (String account : splitAssignee) {
			if (MapUtil.getLong(userMap, account) != null) {
			departmentIds.add(MapUtil.getLong(userMap, account));
			userIds.add(MapUtil.getLong(userMap, account));
			}
			}

			issueForm.setDepartmentIds(departmentIds);
			issueForm.setUserIds(userIds);
			}
			}

			// 시작일, 종료일을 IssueForm 에 저장한다.
			private void setIssueFormPeriod(Cell cell, IssueForm issueForm, Boolean checkStartDate, int rowIndex) {
			if (cell != null && !cell.toString().equals("")) {
			private void setIssueFormPeriod(String periodDate, IssueForm issueForm, Boolean checkStartDate, int rowIndex, boolean isNull) throws ParseException {
			if (!isNull) {

			Date startDate;

			try {
			startDate = cell.getDateCellValue();
			} catch (Exception e) {
			Date startDate = DateUtil.convertStrToDateOnly(periodDate);
			if (startDate == null) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_PERIOD_NOT_VALIDITY_EMPTY, rowIndex));
			}
			@@ -3146,96 +3773,121 @@
			} else {
			issueForm.setCompleteDate(DateUtil.convertDateToStr(startDate, "yyyy-MM-dd"));

			// 종료일만 입력 했을 경우
			if (issueForm.getCompleteDate() != null && issueForm.getStartDate() == null) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_PERIOD_NOT_VALIDITY_EMPTY_START, rowIndex));
			}

			try {
			// 날짜 유효성 체크
			this.checkStartCompleteDate(issueForm.getStartDate(), issueForm.getCompleteDate());
			} catch (OwlRuntimeException e) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_PERIOD_NOT_VALIDITY, rowIndex));
			this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_PERIOD_NOT_VALID, rowIndex));
			}
			}
			}
			}

			// 사용자 정의 필드 정보를 IssueForm 에 저장한다.
			private void setIssueFormCustomFieldValue(Cell cell, Map<String, CustomField> customFieldMaps, IssueForm issueForm, String customFieldName, int rowIndex) {
			if (cell != null) {
			String cellValue = CommonUtil.convertExcelStringToCell(cell);
			Map<String, Object> issueCustomFieldMap = new HashMap<>();
			CustomField customField = customFieldMaps.get(customFieldName);
			// 사용자 정의 필드 정보를 IssueForm 에 저장한다.-
			private void setIssueFormCustomFieldValue(String cellValue, Map<String, CustomField> customFieldMaps, IssueForm issueForm, String customFieldName, int rowIndex) {
			Map<String, Object> issueCustomFieldMap = new HashMap<>();
			CustomField customField = customFieldMaps.get(customFieldName);

			if (customField == null) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_HEADER_CUSTOM_FIELD_NOT_EXIST, rowIndex));
			}
			// 사용자 정의 필드 값이 공백이면 중지
			if (StringUtils.isEmpty(cellValue)) {
			return;
			}
			if (customField == null) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_HEADER_CUSTOM_FIELD_NOT_EXIST, rowIndex));
			}
			// 사용자 정의 필드 값이 공백이면 중지
			if (StringUtils.isEmpty(cellValue)) {
			return;
			}

			boolean validity = false;
			boolean validity = false;

			switch (customField.getCustomFieldType()) {
			case INPUT:
			case NUMBER:
			case DATETIME:
			case IP_ADDRESS:
			case EMAIL:
			case SITE:
			case TEL:
			if (cellValue.length() > 100) {
			switch (customField.getCustomFieldType()) {
			case INPUT:
			case NUMBER:
			case DATETIME:
			case IP_ADDRESS:
			case EMAIL:
			case SITE:
			case TEL:
			if (customField.getCustomFieldType() != INPUT && cellValue.length() > 100) { //INPUT 타입은 100자 제한 없음
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.CUSTOM_FIELD_TEXT_TYPE_MAX_LENGTH_OUT));
			}

			//DATETIME일 경우 format 변경
			if (customField.getCustomFieldType() == DATETIME) {
			Date date = DateUtil.convertStrToDate(cellValue);
			if (date == null) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.CUSTOM_FIELD_TEXT_TYPE_MAX_LENGTH_OUT));
			this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_DATETIME_NOT_DASH, rowIndex));
			}
			}

			issueCustomFieldMap.put("customFieldId", customField.getId());
			issueCustomFieldMap.put("useValue", cellValue);
			issueForm.addIssueCustomFields(issueCustomFieldMap);
			break;
			case SINGLE_SELECT:
			// 값 유효성 체크
			//IP_ADDRESS일 경우 정규표현식 체크
			if (customField.getCustomFieldType() == IP_ADDRESS) {
			String regExp = "^(25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?)\\."
			+ "(25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?)\\."
			+ "(25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?)\\."
			+ "(25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?)$";

			if (!cellValue.matches(regExp)) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_IP_ADDRESS_NOT_VALIDITY, rowIndex));
			}
			}

			issueCustomFieldMap.put("customFieldId", customField.getId());
			issueCustomFieldMap.put("useValue", cellValue);
			issueForm.addIssueCustomFields(issueCustomFieldMap);
			break;
			case SINGLE_SELECT:
			// 값 유효성 체크
			for (CustomFieldValue customFieldValue : customField.getCustomFieldValues()) {
			if (customFieldValue.getValue().equals(cellValue)) {
			validity = true;
			break;
			}
			}

			if (!validity) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.EXCEL_CUSTOM_FIELD_VALUE_NOT_VALIDITY, rowIndex));
			}

			issueCustomFieldMap.put("customFieldId", customField.getId());
			issueCustomFieldMap.put("useValue", cellValue);
			issueForm.addIssueCustomFields(issueCustomFieldMap);

			break;
			case MULTI_SELECT:
			// 값 유효성 체크
			String[] useValues = cellValue.split("#");
			// 해, 달
			for (String useValue : useValues) {
			for (CustomFieldValue customFieldValue : customField.getCustomFieldValues()) {
			if (customFieldValue.getValue().equals(cellValue)) {

			if (customFieldValue.getValue().equals(useValue)) {
			validity = true;
			break;
			Map<String, Object> multiValueMap = new HashMap<>();
			multiValueMap.put("customFieldId", customField.getId());
			multiValueMap.put("useValue", useValue);
			issueForm.addIssueCustomFields(multiValueMap);
			}

			}
			}

			if (!validity) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.EXCEL_CUSTOM_FIELD_VALUE_NOT_VALIDITY, rowIndex));
			}
			if (!validity) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.EXCEL_CUSTOM_FIELD_VALUE_NOT_VALIDITY, rowIndex));
			}

			issueCustomFieldMap.put("customFieldId", customField.getId());
			issueCustomFieldMap.put("useValue", cellValue);
			issueForm.addIssueCustomFields(issueCustomFieldMap);

			break;
			case MULTI_SELECT:
			// 값 유효성 체크
			String[] useValues = cellValue.split("#");
			// 해, 달
			for (String useValue : useValues) {
			for (CustomFieldValue customFieldValue : customField.getCustomFieldValues()) {

			if (customFieldValue.getValue().equals(useValue)) {
			validity = true;
			Map<String, Object> multiValueMap = new HashMap<>();
			multiValueMap.put("customFieldId", customField.getId());
			multiValueMap.put("useValue", useValue);
			issueForm.addIssueCustomFields(multiValueMap);
			}

			}
			}

			if (!validity) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.EXCEL_CUSTOM_FIELD_VALUE_NOT_VALIDITY, rowIndex));
			}

			break;
			}
			break;
			}
			}

			@@ -3293,7 +3945,7 @@
			// 이슈를 템플릿에 따라 파트너 담당자에게 메일로 발송한다.
			@Override
			@Transactional(readOnly = true)
			public void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm) {
			public void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm, List<MultipartFile> multipartFiles) {
			if (emailTemplateForm.getSendEmails().size() < 1) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.ISSUE_NOT_SEND_USER));
			@@ -3320,10 +3972,43 @@
			for(int i=0; i < sendMails.length; i++) {
			sendMails[i] = CommonUtil.decryptAES128(sendMails[i]);
			}
			this.systemEmailService.sendEmail(emailTemplateForm.getTitle(), emailTemplateForm.getTemplate(), sendMails, null);
			this.systemEmailService.sendEmail(emailTemplateForm.getTitle(), emailTemplateForm.getTemplate(), sendMails, null, multipartFiles);

			this.issueHistoryService.detectSendIssueMail(IssueHistoryType.SEND, emailTemplateForm.getSendEmails(), sb);
			this.issueHistoryService.addIssueHistory(issue, IssueHistoryType.SEND, sb.toString());
			}

			@Override
			public void sendCommonEmail(EmailCommonForm emailCommonForm, List<MultipartFile> multipartFiles) {
			if (emailCommonForm.getSendEmails().size() < 1) {
			throw new OwlRuntimeException(
			this.messageAccessor.getMessage(MsgConstants.ISSUE_NOT_SEND_USER));
			}

			Issue issue = null;
			if(emailCommonForm.getIssueId() != null) {
			issue = this.getIssue(emailCommonForm.getIssueId());
			}

			// 발신자 표시
			User user = this.webAppUtil.getLoginUserObject();
			UserVo toUser = this.webAppUtil.getLoginUser();

			// 사용자 시스템 기능 사용 정보 수집
			log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_ANOTHER_USER_SEND_EMAIL));
			StringBuilder sb = new StringBuilder();

			Locale locale = CommonUtil.getUserLanguage(user.getLanguage());
			String[] sendMails = ConvertUtil.ToArray(emailCommonForm.getSendEmails());
			for(int i=0; i < sendMails.length; i++) {
			sendMails[i] = CommonUtil.decryptAES128(sendMails[i]);
			}
			this.systemEmailService.sendEmail(emailCommonForm.getTitle(), emailCommonForm.getDescription(), sendMails, null, multipartFiles);

			if (issue != null) {
			this.issueHistoryService.detectSendIssueMail(IssueHistoryType.SEND, emailCommonForm.getSendEmails(), sb);
			this.issueHistoryService.addIssueHistory(issue, IssueHistoryType.SEND, sb.toString());
			}
			}

			// 예약 발생 이슈를 실행한다
			@@ -3494,43 +4179,128 @@
			@Transactional
			@Override
			public void modifyParentIssue(IssueForm issueDownForm) {
			Issue issue = this.getIssue(issueDownForm.getId()); //하위 이슈
			//Issue issue = this.getIssue(issueDownForm.getId()); //하위 이슈
			Long newParentIssueId = issueDownForm.getParentIssueId(); //변경할 하위이슈의 상위이슈

			StringBuilder sb = new StringBuilder();

			Issue parentIssue = issue.getParentIssue(); //변경 전 하위이슈의 상위이슈
			if(parentIssue != null && parentIssue.getId().equals(newParentIssueId)){ //변경 전 하위이슈의 상위이슈가 존재 할 경우
			this.issueHistoryService.detectDownIssues(IssueHistoryType.DELETE, issue, sb);
			this.issueHistoryService.addIssueHistory(parentIssue, IssueHistoryType.MODIFY, sb.toString());
			}
			for (Long downId : issueDownForm.getIds()) {
			Issue issue = this.getIssue(downId);

			if (newParentIssueId != null) { // 추가 할 경우
			parentIssue = this.getIssue(newParentIssueId); //상위이슈(myIssue)
			issue.setParentIssue(parentIssue); //myIssue를 하위이슈의 상위이슈로 set
			this.issueHistoryService.detectDownIssues(IssueHistoryType.ADD, issue, sb); //issue = 하위이슈
			} else{
			// 삭제 할 경우
			this.issueHistoryService.detectDownIssues(IssueHistoryType.DELETE, issue, sb);
			issue.setParentIssue(null);
			Issue parentIssue = issue.getParentIssue(); //변경 전 하위이슈의 상위이슈
			if(parentIssue != null && parentIssue.getId().equals(newParentIssueId)){ //변경 전 하위이슈의 상위이슈가 존재 할 경우
			this.issueHistoryService.detectDownIssues(IssueHistoryType.DELETE, issue, sb);
			this.issueHistoryService.addIssueHistory(parentIssue, IssueHistoryType.MODIFY, sb.toString());
			}

			if (newParentIssueId != null) { // 추가 할 경우
			parentIssue = this.getIssue(newParentIssueId); //상위이슈(myIssue)
			issue.setParentIssue(parentIssue); //myIssue를 하위이슈의 상위이슈로 set
			this.issueHistoryService.detectDownIssues(IssueHistoryType.ADD, issue, sb); //issue = 하위이슈
			} else{
			// 삭제 할 경우
			this.issueHistoryService.detectDownIssues(IssueHistoryType.DELETE, issue, sb);
			issue.setParentIssue(null);
			}

			if (issueDownForm.getInheritYn() != null && issueDownForm.getInheritYn() && issue.getParentIssue() != null) {
			// 상위이슈의 파트너 정보 상속받기
			issue = this.inheritPartners(issue, parentIssue);
			}

			this.issueHistoryService.addIssueHistory(parentIssue, IssueHistoryType.MODIFY, sb.toString()); //parentIssue = myIssue(기록은 현재 상세페이지에 해야하니까)
			this.issueRepository.saveAndFlush(issue);
			}
			this.issueHistoryService.addIssueHistory(parentIssue, IssueHistoryType.MODIFY, sb.toString()); //parentIssue = myIssue(기록은 현재 상세페이지에 해야하니까)
			this.issueRepository.saveAndFlush(issue);
			}

			/**
			* 상위이슈의 파트너 정보 상속받기
			* @param issue Issue
			* @param parentIssue Issue
			* @return Issue
			*/
			private Issue inheritPartners(Issue issue, Issue parentIssue) {
			if (parentIssue != null) {
			if (parentIssue.getIssueType().getInheritPartners()) {
			IssueCompany issueCompany = new IssueCompany();
			IssueIsp issueIsp = new IssueIsp();
			IssueHosting issueHosting = new IssueHosting();

			if (parentIssue.getIssueCompanies() != null && parentIssue.getIssueCompanies().size() > 0) {
			issue.getIssueCompanies().clear();
			issue.getIssueCompanies().addAll(parentIssue.getIssueCompanies());
			Iterator<IssueCompany> itrCompany = issue.getIssueCompanies().iterator();
			ConvertUtil.copyProperties(itrCompany.next(), issueCompany, "id");
			issueCompany.setIssue(issue);
			issueCompany.setCompanyField(parentIssue.getIssueCompanies().iterator().next().getCompanyField());
			this.issueCompanyRepository.saveAndFlush(issueCompany);
			} else {
			this.issueCompanyRepository.deleteByIssueId(issue.getId());
			this.issueCompanyRepository.flush();
			}
			if (parentIssue.getIssueIspFields() != null && parentIssue.getIssueIspFields().size() > 0) {
			issue.getIssueIspFields().clear();
			issue.getIssueIspFields().addAll(parentIssue.getIssueIspFields());
			Iterator<IssueIsp> itrIsp = issue.getIssueIspFields().iterator();
			ConvertUtil.copyProperties(itrIsp.next(), issueIsp, "id");
			issueIsp.setIssue(issue);
			issueIsp.setIspField(parentIssue.getIssueIspFields().iterator().next().getIspField());
			this.issueIspRepository.saveAndFlush(issueIsp);
			} else {
			this.issueIspRepository.deleteByIssueId(issue.getId());
			this.issueIspRepository.flush();
			}
			if (parentIssue.getIssueHostingFields() != null && parentIssue.getIssueHostingFields().size() > 0) {
			issue.getIssueHostingFields().clear();
			issue.getIssueHostingFields().addAll(parentIssue.getIssueHostingFields());
			Iterator<IssueHosting> itrHosting = issue.getIssueHostingFields().iterator();
			ConvertUtil.copyProperties(itrHosting.next(), issueHosting, "id");
			issueHosting.setIssue(issue);
			issueHosting.setHostingField(parentIssue.getIssueHostingFields().iterator().next().getHostingField());
			this.issueHostingRepository.saveAndFlush(issueHosting);
			} else {
			this.issueHostingRepository.deleteByIssueId(issue.getId());
			this.issueHostingRepository.flush();
			}
			}
			}
			return issue;
			}

			@Override
			public void findPartner(Map<String, Object> resJsonData, Map<String, Object> params) {
			Long issueTypeId = MapUtil.getLong(params, "issueTypeId");
			IssueType issueType = this.issueTypeService.getIssueType(issueTypeId); // 이슈의 이슈유형 객체
			Integer using = issueType.getUsePartner() != null ? issueType.getUsePartner().intValue() : 0; // 이슈유형별로 사용중인 업체/ISP/호스팅 값

			List<UsePartnerVo> usePartnerVos = Lists.newArrayList();
			Integer using = 0;

			if (issueTypeId != null) {
			IssueType issueType = this.issueTypeService.getIssueType(issueTypeId); // 이슈의 이슈유형 객체
			using = issueType.getUsePartner() != null ? issueType.getUsePartner().intValue() : 0; // 이슈유형별로 사용중인 업체/ISP/호스팅 값
			} else {
			for (int partner : UsePartner.partners) {
			using += partner;
			}
			}

			for (Integer usePartner : UsePartner.partners) { //1(업체), 2(ISP), 4(호스팅)
			UsePartnerVo usePartnerVo = UsePartner.checkUsePartner(using, usePartner);
			if (usePartnerVo != null) {
			usePartnerVos.add(usePartnerVo);
			}
			resJsonData.put(Constants.RES_KEY_CONTENTS, usePartnerVos);
			}

			resJsonData.put(Constants.RES_KEY_CONTENTS, usePartnerVos);
			}

			@Override
			public void findReadyDepartments(Map<String, Object> resJsonData, DepartmentCondition condition, Pageable pageable) {
			IssueType issueType = this.issueTypeService.getIssueType(condition.getIssueTypeId());
			if (issueType != null) {
			// 이슈 상태 유형이 '대기' 인 이슈 상태 가져오기
			IssueStatus issueStatus = this.issueStatusService.findByIssueStatusTypeIsReady(issueType.getWorkflow());
			condition.setIssueStatusId(issueStatus.getId());
			condition.setWorkflowId(issueType.getWorkflow().getId());
			}
			List<Map<String, Object>> departmentVos = this.departmentMapper.findByIssueStatusId(condition);
			resJsonData.put(Constants.RES_KEY_CONTENTS, departmentVos);
			}
			}