From c254ef2ee7121bbea936705e408b5ff671cf4a91 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 07 12월 2021 09:31:34 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/DepartmentService.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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..8b813da 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,11 @@
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);
-
+ List<Map<String, Object>> findProjectDepartment(Project project);
}
--
Gitblit v1.8.0