From 8d65cd03a228e9998b278fcfa953dca1880282f9 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Wed, 30 Aug 2023 17:41:41 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EC=95=88=EC=A0=95=ED=99=94=20=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 수정요청사항 반영 --- .../cclt/web/ConciliatorManageController.java | 16 ++++ .../cclt/ConciliatorManage_SQL_Mysql.xml | 3 +- .../cclt/ConciliatorManageDetail.jsp | 79 ++++++++++++++++--- .../adjPgrMgr/cclt/ConciliatorManageList.jsp | 19 ++--- .../adjst/adjstReqRegistInformation.jsp | 2 +- .../web/kccadr/adjst/adjstReqRegistStep2.jsp | 4 +- .../adjstExp/adjstReqRegistInformation.jsp | 2 +- .../kccadr/kccadrCom/kccadrConstantsJsp.jsp | 2 +- 8 files changed, 104 insertions(+), 23 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java b/src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java index 6d6ce9ae..d5185097 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java @@ -1,5 +1,6 @@ package kcc.kccadr.adjPgrMgr.cclt.web; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -20,6 +21,8 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import com.mysql.fabric.xmlrpc.base.Array; + import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.EgovMessageSource; @@ -120,6 +123,7 @@ public class ConciliatorManageController { model.addAttribute("paginationInfo", paginationInfo); List list = conciliatorManageService.selectConciliatorManageList(conciliatorManageVO); this.decryptInfomation(list , null); + model.addAttribute("list", list); if(StringUtils.isNotBlank(conciliatorManageVO.getSearchKeyword())){ @@ -151,8 +155,20 @@ public class ConciliatorManageController { model.addAttribute("fileList", fileList); } this.decryptInfomation(null , info); + + String memTeam = info.getMemTeam(); + String[] memTeamArray; + if(StringUtil.isNotEmpty(memTeam)) { + memTeamArray = memTeam.split("§"); + }else { + memTeamArray = new String[]{""}; + } + model.addAttribute("model", info); model.addAttribute("list", conciliatorManageService.selectConciliatorDeptList(conciliatorManageVO)); + + model.addAttribute("memTeamArray", memTeamArray); + return "kccadr/adjPgrMgr/cclt/ConciliatorManageDetail"; } diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml index 7ee44dc3..f238ce8c 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml @@ -60,7 +60,8 @@ DATE_FORMAT(T1.LAST_UPDT_PNTTM, '%Y-%m-%d') AS lastUpdtPnttm, T1.LAST_UPDUSR_ID AS lastUpdusrId, DECODE(T2.MEM_DEPT_NMS, NULL , '-', REPLACE(T2.MEM_DEPT_NMS, '부', '')) AS memDeptNms, - (SELECT COUNT(1) FROM ADR_MEM_DEPT_MAP WHERE MEM_SEQ = T1.MEM_SEQ) AS memDeptTot + (SELECT COUNT(1) FROM ADR_MEM_DEPT_MAP WHERE MEM_SEQ = T1.MEM_SEQ) AS memDeptTot, + T1.MEM_TEAM as memTeam FROM ADR_MEM_MGR T1 LEFT JOIN ( SELECT S2.MEM_SEQ, diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageDetail.jsp index 4d8fc603..2fa676d2 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageDetail.jsp @@ -45,7 +45,7 @@ } function fncCancle (){ - if(confirm("작성된 내용의 수정을 취소하시겠습니까?")){ + if(confirm("작성내용을 저장하려면 수정 버튼을 먼저 클릭해야 합니다.\n저장하지 않고 이전목록으로 돌아가시겠습니까?")){ fncGoList(); } } @@ -85,7 +85,19 @@ } if(confirm("작성된 내용을 수정 하시겠습니까?")){ - + + var memTeam = ""; + $('tr [id^="memTeam"]').each(function (index, item) { + if(item.value != ''){ + if(index != 0){ + memTeam += "§" + item.value; + }else{ + memTeam += item.value; + } + } + }); + $('#memTeam').val(memTeam); + var data = new FormData(document.getElementById("model")); _fileForm2.forEach(function(obj, idx) { if (obj) data.append("file"+idx, obj.fileObj); @@ -156,7 +168,18 @@ goFrom.action = ""; goFrom.submit(); } - + + + + function fncMemTeamCreate(obj){ + var memTeamArrayLeng = parseInt($('#memArrayCnt').val()) == 0 ? 1 : parseInt($('#memArrayCnt').val()); + var memTeamHtml = "소속"+ memTeamArrayLeng +""; + + var newRow = document.getElementById("table0").insertRow($(obj.parentElement.parentElement).closest('tr').prevAll().length + memTeamArrayLeng); + newRow.innerHTML = memTeamHtml; + $('#memArrayCnt').val(memTeamArrayLeng + 1); + } + @@ -173,6 +196,8 @@ + +
@@ -191,7 +216,7 @@

조정위원 상세/수정

- +
@@ -203,13 +228,49 @@ - + - - - + + + + + + + + + + + + + + + + @@ -348,7 +409,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageList.jsp index c928b99a..e71acd5b 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageList.jsp @@ -210,8 +210,9 @@ <%----%> - + + @@ -226,6 +227,7 @@ + @@ -249,19 +251,18 @@ +
아이디
성명 소속
+ + 소속 + + ${status.index} + + + + + +
+ + 소속 + + + +
연락처
번호 조정부 이름소속 아이디 전화번호 위원임기 - <%-- - - - - - - 조정부(${list.memDeptTot}) - - --%> + + + ${memTeam}
+ +<%-- --%> + 		')"> diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp index 58ceb1fa..b8e343c2 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp @@ -79,7 +79,7 @@ function tutorialPop(){

조정신청

- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep2.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep2.jsp index 8a0afb52..19a4c90f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep2.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep2.jsp @@ -35,7 +35,7 @@ margin-right: 15px !important; } .btn_wrap.btn_layout03 .btnType01{height: 46px} - + .post_adr span{display: block; padding: 5px 10px 0 30px; font-size: 14px; color: #e40000; word-break: keep-all;} <%-- --%>