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 | 68 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 16 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 77eb812..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,8 @@
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;
import kr.wisestone.owl.common.ExcelConditionCheck;
import kr.wisestone.owl.constant.Constants;
@@ -19,7 +22,6 @@
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Service;
-import org.springframework.ui.Model;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
@@ -50,6 +52,7 @@
return this.departmentManageRepository;
}
+ // 遺��꽌 異붽�
@Override
public DepartmentManage addDepartmentManage(DepartmentManageForm departmentManageForm) {
DepartmentManage departmentManage = ConvertUtil.copyProperties(departmentManageForm, DepartmentManage.class);
@@ -57,6 +60,20 @@
return departmentManage;
}
+ // 遺��꽌 紐⑸줉�쓣 媛��졇�삩�떎.
+ @Override
+ public List<DepartmentManageVo> findDepartment(Map<String, Object> resJsonData,
+ DepartmentManageCondition condition, Pageable pageable) {
+ condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
+ condition.setPageSize(pageable.getPageSize());
+
+ List<Map<String, Object>> results = this.departmentManageMapper.find(condition);
+ Long totalDepartmentCount = this.departmentManageMapper.count(condition);
+
+ return this.convertDepartmentManageVoToMap(results, totalDepartmentCount, pageable, resJsonData);
+ }
+
+ // �궗�슜�옄 遺��꽌 ID濡� 議고쉶�븳�떎.
@Override
public DepartmentManage getDepartment(Long id) {
if (id == null) {
@@ -74,40 +91,58 @@
return departmentManage;
}
+ // 遺��꽌瑜� �궘�젣�븳�떎.
@Override
- public List<DepartmentManageVo> findDepartment(Map<String, Object> resJsonData,
- DepartmentManageCondition condition, Pageable pageable) {
-
- condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
- condition.setPageSize(pageable.getPageSize());
-
- List<Map<String, Object>> results = this.departmentManageMapper.find(condition);
- Long totalDepartmentCount = this.departmentManageMapper.count(condition);
-
- return this.convertDepartmentManageVoToMap(results, totalDepartmentCount, pageable, resJsonData);
+ 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);
+ }
+
+
// 寃��깋 寃곌낵瑜� DepartmentManageVo 濡� 蹂��솚�븳�떎.
- private List<DepartmentManageVo> convertDepartmentManageVoToMap(List<Map<String, Object>> results, Long totalDepartmentCount, Pageable pageable, Map<String, Object> resJsonData) {
+ private List<DepartmentManageVo> convertDepartmentManageVoToMap(List<Map<String, Object>> results, Long totalDepartmentsCount, Pageable pageable, Map<String, Object> resJsonData) {
List<DepartmentManageVo> departmentManageVos = Lists.newArrayList();
for (Map<String, Object> result : results) {
DepartmentManageVo departmentManageVo = ConvertUtil.convertMapToClass(result, DepartmentManageVo.class);
- // 遺��꽌紐낅쭔 蹂��솚 �븯硫� �릺�뒗嫄닿� ?
departmentManageVos.add(departmentManageVo);
}
- int totalPage = (int) Math.ceil((totalDepartmentCount - 1) / pageable.getPageSize()) + 1;
+ int totalPage = (int) Math.ceil((totalDepartmentsCount - 1) / pageable.getPageSize()) + 1;
resJsonData.put(Constants.RES_KEY_CONTENTS, departmentManageVos);
resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
- totalPage, totalDepartmentCount));
+ totalPage, totalDepartmentsCount));
return departmentManageVos;
}
- // 遺��꽌 紐⑸줉�쓣 �뿊��濡� �떎�슫濡쒕뱶 �븳�떎.
+ // 遺��꽌 紐⑸줉�쓣 �뿊��濡� �떎�슫濡쒕뱶 �븳�떎.
+ @Override
public ModelAndView downloadExcel(HttpServletRequest request, Model model) {
+
ModelAndView modelAndView = this.workspaceService.checkUseExcelDownload(model);
if (modelAndView != null) {
return modelAndView;
@@ -131,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