From f557cd3c7c1d981e23ed6b8220c8d8c4906a7e27 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 화, 07 12월 2021 19:30:47 +0900 Subject: [PATCH] - 사용자 필드 기능 수정 - 이슈 추가/수정시 워크플로우에 설정된 담당부서로 변경되도록 수정 * DB 초기화 필요 --- src/main/java/kr/wisestone/owl/service/DepartmentService.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/service/DepartmentService.java b/src/main/java/kr/wisestone/owl/service/DepartmentService.java index 8e45f0b..4386624 100644 --- a/src/main/java/kr/wisestone/owl/service/DepartmentService.java +++ b/src/main/java/kr/wisestone/owl/service/DepartmentService.java @@ -1,10 +1,12 @@ package kr.wisestone.owl.service; import kr.wisestone.owl.domain.Department; +import kr.wisestone.owl.domain.Project; import kr.wisestone.owl.vo.DepartmentVo; import kr.wisestone.owl.web.condition.DepartmentCondition; import kr.wisestone.owl.web.condition.UserCondition; import kr.wisestone.owl.web.form.DepartmentForm; +import kr.wisestone.owl.web.form.UserDepartmentForm; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.ui.Model; @@ -29,10 +31,13 @@ ModelAndView downloadExcel(HttpServletRequest request, Model model); - boolean department(Long id); + boolean countInDepartment(Long id); List<Map<String, Object>> findByDepartmentIds( UserCondition condition); + void findProjectDepartment(Map<String, Object> resJsonData, DepartmentCondition departmentCondition); + void findWorkflowDepartment(Map<String, Object> resJsonData, DepartmentCondition departmentCondition); + List<Map<String, Object>> findProjectDepartment(Project project); } -- Gitblit v1.8.0