OWL ITS + 탐지시스템(인터넷 진흥원)
이민희
2021-11-30 85343ff457681e2b340e95c02a178c63837aed0f
이전 하위 일감에 대한 히스토리 기록 남기기 완료
6개 파일 변경됨
26 ■■■■■ 파일 변경됨
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java 16 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/custom_components/widget/delay-issue-widget/delay-issue-widget.html 2 ●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/custom_components/widget/my-assignee-issue-widget/my-assignee-issue-widget.html 2 ●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/custom_components/widget/register-issue-widget/register-issue-widget.html 2 ●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/custom_components/widget/risk-issue-widget/risk-issue-widget.html 2 ●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/custom_components/widget/severity-issue-widget/severity-issue-widget.html 2 ●●● 패치 | 보기 | raw | blame | 히스토리
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -2502,7 +2502,7 @@
        //  사용자 시스템 기능 사용 정보 수집
        log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_ANOTHER_USER_SEND_EMAIL));
        this.systemEmailService.directEmail(issueForm.getSendEmails().toArray(new String[issueForm.getSendEmails().size()]), EmailType.ISSUE_SEND, issueMap, null);
        this.systemEmailService.directEmail(issueForm.getSendEmails().toArray(new String[issueForm.getSendEmails().size()]), EmailType.ISSUE_SEND, issueMap, null); //mailType.ISSUE_SEND - 템플릿 설정
    }
    //  예약 발생 이슈를 실행한다
@@ -2510,6 +2510,7 @@
    @Transactional
    public void reservationIssue() {
        List<IssueReservation> issueReservations = this.issueReservationService.findByIssueReservationTypeNotNull();
        Calendar calendar = Calendar.getInstance();
        int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
@@ -2674,10 +2675,15 @@
    @Override
    public void modifyParentIssue(IssueForm issueDownForm) {
        Issue issue = this.getIssue(issueDownForm.getId()); //하위 이슈
        Issue parentIssue = issue.getParentIssue(); //변경 전 하위이슈의 상위이슈
        Long newParentIssueId = issueDownForm.getParentIssueId(); //변경할 하위이슈의 상위이슈
        StringBuilder sb = new StringBuilder();
        Issue parentIssue = issue.getParentIssue(); //변경 전 하위이슈의 상위이슈
        if(parentIssue != null){ //변경 전 하위이슈의 상위이슈가 존재 할 경우
            this.issueHistoryService.detectDownIssues(IssueHistoryType.DELETE, issue, sb);
            this.issueHistoryService.addIssueHistory(parentIssue, IssueHistoryType.MODIFY, sb.toString());
        }
        if (newParentIssueId != null) { // 추가 할 경우
           // todo 이전 하위 일감 히스토리기록 필요
@@ -2710,7 +2716,7 @@
        }
    }
    /*@Override
    @Override
    @Transactional
    public void findMailTargetAll(Map<String, Object> resJsonData, IssueCondition condition, Pageable pageable) {
        IssueVo issueVo = new IssueVo();
@@ -2746,7 +2752,7 @@
        resJsonData.put(Constants.RES_KEY_CONTENTS, emailList);
        resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
                totalPage, totalCount));
    }*/
    }
    /*@Override
    @Transactional
src/main/webapp/custom_components/widget/delay-issue-widget/delay-issue-widget.html
@@ -62,7 +62,7 @@
                        <td class="text-center">
                            {{issue.projectName}}
                        </td>
                        <td class="text-left titlename cursor">
                        <td class="text-center titlename cursor">
                            <span ng-click="fn.moveIssue(issue)">{{issue.title}}</span>
                        </td>
                        <td class="text-center">
src/main/webapp/custom_components/widget/my-assignee-issue-widget/my-assignee-issue-widget.html
@@ -74,7 +74,7 @@
                        <td class="text-center">
                            {{issue.projectName}}
                        </td>
                        <td class="text-left titlename cursor">
                        <td class="text-center titlename cursor">
                            <span ng-click="fn.moveIssue(issue)">{{issue.title}}</span>
                        </td>
                        <td class="text-center">
src/main/webapp/custom_components/widget/register-issue-widget/register-issue-widget.html
@@ -71,7 +71,7 @@
                        <td class="text-center">
                            {{issue.projectName}}
                        </td>
                        <td class="text-left titlename cursor">
                        <td class="text-center titlename cursor">
                            <span ng-click="fn.moveIssue(issue)">{{issue.title}}</span>
                        </td>
                        <td class="text-center">
src/main/webapp/custom_components/widget/risk-issue-widget/risk-issue-widget.html
@@ -81,7 +81,7 @@
                        <td class="text-center">
                            {{issue.projectName}}
                        </td>
                        <td class="text-left titlename cursor">
                        <td class="text-center titlename cursor">
                            <span ng-click="fn.moveIssue(issue)">{{issue.title}}</span>
                        </td>
                        <td class="text-center">
src/main/webapp/custom_components/widget/severity-issue-widget/severity-issue-widget.html
@@ -113,7 +113,7 @@
                        <td class="text-center">
                            {{issue.projectName}}
                        </td>
                        <td class="text-left titlename cursor">
                        <td class="text-center titlename cursor">
                            <span ng-click="fn.moveIssue(issue)">{{issue.title}}</span>
                        </td>
                        <td class="text-center">