From a9277be576a7b76de9bfbaf5e83cd6d6407dbd98 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 17 11월 2021 11:14:57 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
index ed110b9..3f1fd72 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -104,7 +104,10 @@
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.COMPANY_REMOVE_NOT_SELECT));
}
- this.companyFieldRepository.flush();
+ for (Long id : companyFieldForm.getRemoveIds()) {
+ this.companyFieldRepository.deleteById(id);
+ this.companyFieldRepository.flush();
+ }
}
// �뾽泥� 紐⑸줉�쓣 �뿊��濡� �떎�슫濡쒕뱶 �븳�떎.
@@ -123,29 +126,22 @@
}
CompanyFieldCondition companyFieldCondition = CompanyFieldCondition.make(conditions);
-
-
List<Map<String, Object>> results = this.companyFieldMapper.find(companyFieldCondition);
List<CompanyFieldVo> companyFieldVos = ConvertUtil.convertListToListClass(results, CompanyFieldVo.class);
+
// code_ko_KR �뿉 code紐� �꽕�젙
ExportExcelVo excelInfo = new ExportExcelVo();
excelInfo.setFileName(this.messageAccessor.message("�뾽泥� 紐⑸줉"));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyName", this.messageAccessor.message("departmentManage.departmentName"), 6, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("", this.messageAccessor.message("departmentManage.departmentDescription"), 10, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyPhone", this.messageAccessor.message("departmentManage.departmentCount"), 10, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyEmail", this.messageAccessor.message("departmentManage.departmentCount"), 10, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyDesc", this.messageAccessor.message("departmentManage.departmentCount"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("name", this.messageAccessor.message("companyField.companyName"), 6, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("manager", this.messageAccessor.message("companyField.companyManager"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("tel", this.messageAccessor.message("companyField.companyTel"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("email", this.messageAccessor.message("companyField.companyEmail"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("memo", this.messageAccessor.message("companyField.companyMemo"), 10, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.setDatas(companyFieldVos);
model.addAttribute(Constants.EXCEL, excelInfo);
return new ModelAndView(this.excelView);
- }
-
- // �궘�젣 �븷 �뾽泥닿� �엳�뒗吏� �솗�씤
- @Override
- public boolean company(Long Id) {
- return this.companyFieldMapper.findByCompany(Id) > 0;
}
// 寃��깋 寃곌낵瑜� CompanyFieldVo 濡� 蹂��솚�븳�떎.
--
Gitblit v1.8.0