사용자정의필드 추가 수정, 이슈 메일 발송 대상자 추가

이민희

2021-11-29 5f4db7ac47dca80e2ca9c9bda39408aa83e484de

사용자정의필드 추가 수정, 이슈 메일 발송 대상자 추가

 src/main/java/kr/wisestone/owl/service/IssueService.java

@@ -72,4 +72,6 @@
    void modifyParentIssue(IssueForm issueForm);

    void findPartner(Map<String, Object> resJsonData, Map<String, Object> params);

    void findMailTarget(Map<String, Object> resJsonData, Map<String, Object> params);
}

 src/main/java/kr/wisestone/owl/service/impl/IssueCustomFieldValueServiceImpl.java

@@ -295,6 +295,12 @@

                switch (CustomFieldType.valueOf(issueCustomFieldValueCondition.getCustomFieldType())) {
                    case INPUT:
                    case NUMBER:
                    case DATETIME:
                    case IP_ADDRESS:
                    case EMAIL:
                    case SITE:
                    case TEL:
                        result = this.issueCustomFieldValueMapper.findLikeUseValue(issueCustomFieldValueCondition);
                        break;
                    case MULTI_SELECT:

 src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java

@@ -926,6 +926,12 @@
        if (StringUtils.isEmpty(value)) {
            switch(customFieldType) {
                case INPUT:
                case NUMBER:
                case DATETIME:
                case IP_ADDRESS:
                case EMAIL:
                case SITE:
                case TEL:
                    result = "<span translate=\"common.noValueEntered\">입력한 값이 없습니다.</span>";
                    break;
                case SINGLE_SELECT:

 src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java

@@ -830,20 +830,23 @@
        List<Issue> downIssues = this.issueRepository.findByParentIssueId(issue.getId());
        List<IssueVo> downIssueVos = ConvertUtil.convertObjectsToClasses(downIssues, IssueVo.class);
        List<IssueVo> resultList = new ArrayList<>();

        for(IssueVo downIssueVo : downIssueVos){
            for(Issue downIssue : downIssues){
                downIssueVo.setTitle(downIssue.getTitle());
                downIssueVo.setIssueTypeVo(ConvertUtil.copyProperties(downIssue.getIssueType(), IssueTypeVo.class));
                downIssueVo.setPriorityVo(ConvertUtil.copyProperties(downIssue.getPriority(), PriorityVo.class));
                downIssueVo.setSeverityVo(ConvertUtil.copyProperties(downIssue.getSeverity(), SeverityVo.class));
                this.setRegister(downIssue, downIssueVo); // 등록자
                this.setIssueDepartment(downIssue, downIssueVo);  //  담당부서 정보 셋팅
                this.setIssueCustomFields(downIssue, downIssueVo);   // 사용자정의필드 정보 세팅
        if(downIssues != null && downIssueVos.size()>0){
            for(IssueVo downIssueVo : downIssueVos){
                for(Issue downIssue : downIssues){
                    downIssueVo.setTitle(downIssue.getTitle());
                    downIssueVo.setIssueTypeVo(ConvertUtil.copyProperties(downIssue.getIssueType(), IssueTypeVo.class));
                    downIssueVo.setPriorityVo(ConvertUtil.copyProperties(downIssue.getPriority(), PriorityVo.class));
                    downIssueVo.setSeverityVo(ConvertUtil.copyProperties(downIssue.getSeverity(), SeverityVo.class));
                    this.setRegister(downIssue, downIssueVo); // 등록자
                    this.setIssueDepartment(downIssue, downIssueVo);  //  담당부서 정보 셋팅
                    this.setIssueCustomFields(downIssue, downIssueVo);   // 사용자정의필드 정보 세팅
                }
                resultList.add(downIssueVo);
            }
            resultList.add(downIssueVo);
            issueVo.setIssueDownVos(resultList); //프론트에서 List형태로 받아줘서 리스트 형식으로 보내줌
        }else{
            issueVo.setIssueDownVos(null);
        }
        issueVo.setIssueDownVos(resultList); //프론트에서 List형태로 받아줘서 리스트 형식으로 보내줌
    }

    //  이슈 상세 정보를 셋팅한다.
@@ -865,7 +868,7 @@
        this.setIssueComments(issue, issueVo);  //  댓글 정보 셋팅
        this.setIssueHistory(issue, issueVo);   //  이슈 기록 정보 셋팅
        this.setRelationIssue(issue, issueVo);        //연관 일감 셋팅
        this.setDownIssues(issue, issueVo);
        this.setDownIssues(issue, issueVo); //하위 일감 세팅

        IssueType issueType = this.issueTypeService.getIssueType(issueVo.getIssueTypeVo().getId()); // 이슈의 이슈유형 객체
        Integer using = issueType.getUsePartner() != null ? issueType.getUsePartner().intValue() : 0; // 이슈유형별로 사용중인 업체/ISP/호스팅 값
@@ -2391,6 +2394,12 @@

            switch (customField.getCustomFieldType()) {
                case INPUT:
                case NUMBER:
                case DATETIME:
                case IP_ADDRESS:
                case EMAIL:
                case SITE:
                case TEL:
                    if (cellValue.length() > 100) {
                        throw new OwlRuntimeException(
                                this.messageAccessor.getMessage(MsgConstants.CUSTOM_FIELD_TEXT_TYPE_MAX_LENGTH_OUT));
@@ -2700,4 +2709,17 @@
            resJsonData.put(Constants.RES_KEY_CONTENTS, usePartnerVos);
        }
    }

    @Override
    public void findMailTarget(Map<String, Object> resJsonData, Map<String, Object> params) {
        Long issueId = MapUtil.getLong(params, "issueId");
        Issue issue = this.getIssue(issueId);
        IssueVo issueVo = new IssueVo();

        this.setIssueCompanyField(issue, issueVo);  //업체 정보 세팅
        this.setIssueIspField(issue, issueVo);  //ISP 정보 세팅
        this.setIssueHostingField(issue, issueVo);  //HOSTING 정보 세팅

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

 src/main/java/kr/wisestone/owl/web/controller/IssueController.java

@@ -75,6 +75,18 @@
        return this.setSuccessMessage(resJsonData);
    }

    //  메일 발송 대상자 목록 조회
    @RequestMapping(value = "/issue/findMailTarget", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
    public
    @ResponseBody
    Map<String, Object> findMailTarget(@RequestBody Map<String, Map<String, Object>> params) {
        Map<String, Object> resJsonData = new HashMap<>();

        this.issueService.findMailTarget(resJsonData, params.get(Constants.REQ_KEY_CONTENT));

        return this.setSuccessMessage(resJsonData);
    }

    //  이슈 상세 조회
    @RequestMapping(value = "/issue/detail", produces = MediaType.APPLICATION_JSON_VALUE)
    public