충돌 수정

이민희

2021-12-02 6a72a3edec87cca9996c7ab3be3fd48479881945

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

@@ -2,10 +2,13 @@

import kr.wisestone.owl.domain.Issue;
import kr.wisestone.owl.domain.IssueType;
import kr.wisestone.owl.domain.User;
import kr.wisestone.owl.domain.Workflow;
import kr.wisestone.owl.vo.IssueVo;
import kr.wisestone.owl.web.condition.ApiMonitorCondition;
import kr.wisestone.owl.web.condition.IssueCondition;
import kr.wisestone.owl.web.condition.ProjectCondition;
import kr.wisestone.owl.web.form.IssueApiForm;
import kr.wisestone.owl.web.form.IssueForm;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
@@ -21,6 +24,11 @@
    void addIssueVersion(Long id);

    Issue addIssue(IssueForm issueForm, List<MultipartFile> files);

    Issue addIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles);

    Issue addApiIssue(IssueApiForm issueApiForm);


    List<IssueVo> findIssue(Map<String, Object> resJsonData,
                            IssueCondition condition, Pageable pageable);
@@ -65,6 +73,8 @@

    void sendIssueEmail(IssueForm issueForm);

    void sendIssueEmailPartners(IssueForm issueForm);

    void reservationIssue();

    Map<String, Object> findTask(IssueCondition taskCondition);
@@ -73,11 +83,5 @@

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

    void findMailTargetAll(Map<String, Object> resJsonData, IssueCondition condition, Pageable pageable);

    /*void findMailTargetCompany(Map<String, Object> resJsonData, Map<String, Object> params);

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

    void findMailTargetHosting(Map<String, Object> resJsonData, Map<String, Object> params);*/
    void findApiIssue(ApiMonitorCondition apiMonitorCondition, Map<String, Object> resJsonData);
}