Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

이민희

2021-12-28 eb97c024100641e9f123e647654a7f7167a414db

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

@@ -16,6 +16,7 @@
import kr.wisestone.owl.vo.IssueHistoryVo;
import kr.wisestone.owl.vo.IssueVo;
import kr.wisestone.owl.web.condition.IssueHistoryCondition;
import kr.wisestone.owl.web.form.EmailTemplateForm;
import kr.wisestone.owl.web.form.IssueForm;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -311,8 +312,14 @@
    //  이슈 아이디에 해당하는 기록 정보를 가져온다.
    @Override
    @Transactional(readOnly = true)
    public List<IssueHistoryVo> findIssueHistory(Long issueId) {
        return this.issueHistoryRepository.findByIssueId(issueId);
    public List<IssueHistoryVo> findIssueHistory(Issue issue) {
        List<IssueHistoryVo> issueHistoryVos = this.issueHistoryRepository.findByIssueId(issue.getId());
        if (issueHistoryVos != null && issueHistoryVos.size() > 0) {
            for (IssueHistoryVo issueHistoryVo : issueHistoryVos) {
                issueHistoryVo.setTitle(issue.getTitle());
            }
        }
        return issueHistoryVos;
    }

    //  이슈 변경 내역을 추출한다.
@@ -443,7 +450,7 @@
    public void recordRemoveWorkflowToIssueStatus(String oldIssueStatusName, String newIssueStatusName, StringBuilder description) {
        description.append("<ul class=\"activity-list\">");

        String title = "<span translate=\"common.upddetectReservationIssueStatusateWorkflowNotExist\">변경된 워크플로우에서 상태가 존재하지 않아 이슈의 상태가 변경되었습니다.</span>";
        String title = "<span translate=\"common.updateWorkflowNotExist\">변경된 워크플로우에서 상태가 존재하지 않아 이슈의 상태가 변경되었습니다.</span>";
        //  이력 정보를 html 태그로 만들어 준다.
        this.makeIssueHistoryHtml(description, title, oldIssueStatusName, newIssueStatusName);

@@ -529,10 +536,16 @@
    // 이슈 메일 전송 정보를 기록한다.
    @Override
    public void detectSendIssueMail(IssueHistoryType type, IssueForm issueForm, StringBuilder description) {
        this.detectSendIssueMail(type, issueForm.getSendEmails(), description);
    }

    // 이슈 메일 전송 정보를 기록한다.
    @Override
    public void detectSendIssueMail(IssueHistoryType type, List<String> sendMails, StringBuilder description) {
        if (type == IssueHistoryType.SEND) {
            description.append("<span translate=\"issue.sendIssueMailHistory\">이슈 메일 전송을 완료했습니다. </span>");
            if(issueForm.getSendEmails() != null && issueForm.getSendEmails().size() > 0){
                for (String sendEmail : issueForm.getSendEmails()){
            if(sendMails != null && sendMails.size() > 0){
                for (String sendEmail : sendMails){
                    description.append("<span class=\"text-primary bold\">&nbsp;>&nbsp;" + CommonUtil.decryptAES128(sendEmail) + "</span>");
                }
            }
@@ -541,8 +554,13 @@

    // 업체 정보 변경 정보를 기록한다.
    @Override
    public void detectIssueCompany(IssueHistoryType type, Map<String, Object> param, IssueCompany issueCompany, StringBuilder description) {
        Long id = MapUtil.getLong(param, "companyId");
    public void detectIssueCompany(IssueHistoryType type, Map<String, Object> param, CompanyField companyField, IssueCompany issueCompany, StringBuilder description) {
        Long id = 0L;
        if (param != null) {
            id = MapUtil.getLong(param, "companyId");
        }else if(companyField != null) {
            id = companyField.getId();
        }
        Long companyFieldId = issueCompany.getCompanyField().getId();

        if (type == IssueHistoryType.ADD) { //추가 할 경우
@@ -577,8 +595,13 @@

    // ISP 정보 변경 정보를 기록한다.
    @Override
    public void detectIssueIsp(IssueHistoryType type, Map<String, Object> param, IssueIsp issueIsp, StringBuilder description) {
        Long id = MapUtil.getLong(param, "companyId");
    public void detectIssueIsp(IssueHistoryType type, Map<String, Object> param, IspField ispField, IssueIsp issueIsp, StringBuilder description) {
        Long id = 0L;
        if (param != null) {
            id = MapUtil.getLong(param, "companyId");
        } else if(ispField != null) {
            id = ispField.getId();
        }
        Long ispFieldId = issueIsp.getIspField().getId();

        if (type == IssueHistoryType.ADD) {
@@ -613,8 +636,13 @@

    // 호스팅 정보 변경 정보를 기록한다.
    @Override
    public void detectIssueHosting(IssueHistoryType type, Map<String, Object> param, IssueHosting issueHosting, StringBuilder description) {
        Long id = MapUtil.getLong(param, "companyId");
    public void detectIssueHosting(IssueHistoryType type, Map<String, Object> param, HostingField hostingField, IssueHosting issueHosting, StringBuilder description) {
        Long id = 0L;
        if (param != null) {
            id = MapUtil.getLong(param, "companyId");
        }else if(hostingField != null) {
            id = hostingField.getId();
        }
        Long hostingFieldId = issueHosting.getHostingField().getId();

        if (type == IssueHistoryType.ADD) {