Merge remote-tracking branch 'origin/master'

박지현

2022-02-22 1dad4d94cc415d2f8092aff0368744289337f504

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

@@ -6,8 +6,10 @@
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.DepartmentCondition;
import kr.wisestone.owl.web.condition.IssueCondition;
import kr.wisestone.owl.web.condition.ProjectCondition;
import kr.wisestone.owl.web.form.EmailCommonForm;
import kr.wisestone.owl.web.form.EmailTemplateForm;
import kr.wisestone.owl.web.form.IssueApiForm;
import kr.wisestone.owl.web.form.IssueForm;
@@ -32,7 +34,11 @@

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

    Issue addDownIssue(Map<String, Object> resJsonData, IssueForm issueForm, List<MultipartFile> files);

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

    Issue addDownIssue(Map<String, Object> resJsonData, User user, IssueForm issueForm, List<MultipartFile> multipartFiles);

    List<Issue> addApiIssue(IssueApiForm issueApiForm) throws CloneNotSupportedException;

@@ -82,7 +88,7 @@

    ModelAndView downloadExcelTemplate(HttpServletRequest request, Model model);

    void importExcel(MultipartFile multipartFile) throws Exception;
    void importExcel(IssueForm issueForm, MultipartFile multipartFile) throws Exception;

    List<Long> findByProjectId(Long projectId);

@@ -90,7 +96,7 @@

    void sendIssueEmail(IssueForm issueForm);

    void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm);
    void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm, List<MultipartFile> files);

    void reservationIssue();

@@ -100,7 +106,13 @@

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

    void findReadyDepartments(Map<String, Object> resJsonData, DepartmentCondition make, Pageable pageable);

    void findApiIssue(ApiMonitorCondition apiMonitorCondition, Map<String, Object> resJsonData);

    void setCountDownIssues(List<IssueVo> issueVos);

    void makeIssueMapToIssue(Issue issue, Map<String, Object> issueMap);

    void sendCommonEmail(EmailCommonForm make, List<MultipartFile> files);
}