From cc869e4f0c0dc594b2244fb4540ab56edfd2602a Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 29 11월 2021 15:07:12 +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, 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 e09de70..8b813da 100644
--- a/src/main/java/kr/wisestone/owl/service/DepartmentService.java
+++ b/src/main/java/kr/wisestone/owl/service/DepartmentService.java
@@ -1,6 +1,7 @@
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;
@@ -30,7 +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