From 8e538d93ca3f8da8d082ad2ee497625349d9a4dd Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 05 11월 2021 17:00:19 +0900
Subject: [PATCH] 부서관리 백엔드 수정
---
src/main/java/kr/wisestone/owl/service/impl/DepartmentManageServiceImpl.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/DepartmentManageServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/DepartmentManageServiceImpl.java
index 5a51f55..db658d9 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/DepartmentManageServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/DepartmentManageServiceImpl.java
@@ -1,5 +1,6 @@
package kr.wisestone.owl.service.impl;
+import kr.wisestone.owl.domain.UserLevel;
import kr.wisestone.owl.web.form.UserLevelForm;
import org.springframework.ui.Model;
import com.google.common.collect.Lists;
@@ -63,7 +64,6 @@
@Override
public List<DepartmentManageVo> findDepartment(Map<String, Object> resJsonData,
DepartmentManageCondition condition, Pageable pageable) {
-
condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
condition.setPageSize(pageable.getPageSize());
@@ -72,8 +72,6 @@
return this.convertDepartmentManageVoToMap(results, totalDepartmentCount, pageable, resJsonData);
}
-
-
// �궗�슜�옄 遺��꽌 ID濡� 議고쉶�븳�떎.
@Override
@@ -95,12 +93,31 @@
// 遺��꽌瑜� �궘�젣�븳�떎.
@Override
- public void removeUserLevel(DepartmentManageForm departmentManageForm) {
+ public void removeDepartment(DepartmentManageForm departmentManageForm) {
if (departmentManageForm.getRemoveIds().size() < 1) {
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.PROJECT_REMOVE_NOT_SELECT));
}
this.departmentManageRepository.flush();
+ }
+
+ // 遺��꽌 �긽�꽭 議고쉶�븳�떎.
+ @Override
+ public void detailDepartment(Map<String, Object> resJsonData, DepartmentManageCondition departmentManageCondition) {
+ DepartmentManageVo departmentManageVo = new DepartmentManageVo();
+
+ if (departmentManageVo.getId() != null) {
+ DepartmentManage departmentManage = this.getDepartment(departmentManageCondition.getId());
+ departmentManageVo = ConvertUtil.copyProperties(departmentManage, DepartmentManageVo.class);
+ }
+ resJsonData.put(Constants.RES_KEY_CONTENTS, departmentManageVo);
+ }
+
+ // 遺��꽌 �젙蹂대�� �닔�젙�븳�떎.
+ @Override
+ public void modifyDepartment(DepartmentManageForm departmentManageForm) {
+ DepartmentManage departmentManage = ConvertUtil.copyProperties(departmentManageForm, DepartmentManage.class);
+ departmentManageRepository.saveAndFlush(departmentManage);
}
@@ -122,6 +139,7 @@
return departmentManageVos;
}
+ // 遺��꽌 紐⑸줉�쓣 �뿊��濡� �떎�슫濡쒕뱶 �븳�떎.
@Override
public ModelAndView downloadExcel(HttpServletRequest request, Model model) {
@@ -148,6 +166,7 @@
excelInfo.setFileName(this.messageAccessor.message("遺��꽌 紐⑸줉"));
excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentName", this.messageAccessor.message("departmentManage.departmentName"), 6, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentDescription", this.messageAccessor.message("departmentManage.departmentDescription"), 20, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentCount", this.messageAccessor.message("departmentManage.departmentCount"), 3, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.setDatas(departmentManageVos);
--
Gitblit v1.8.0