From 0bd62294f4f29808dcb335fa6f102c2df51223c9 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Thu, 23 Nov 2023 12:30:19 +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=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 감리 응용프로그램 부분 조치사항 수정 --- .../service/impl/AdjReqMgrPastServiceImpl.java | 4 ++-- .../web/AdjReqMgrPastController.java | 15 ++++++--------- .../adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml | 7 ++++--- .../let/uss/ion/cnt/CntManage_SQL_Mysql.xml | 4 +++- .../adjPgrMgr/exmp/app/exmpAppManagerList.jsp | 4 ++-- .../popup/adjReqMgrRegMultyPaymentPopup.jsp | 5 +++-- .../webapp/WEB-INF/jsp/kccadr/stts/sttsAdr.jsp | 4 ++-- .../webapp/WEB-INF/jsp/main/inc/EgovIncFooter.jsp | 5 ++--- .../WEB-INF/jsp/sec/rgm/EgovAuthorGroupManage.jsp | 4 ++-- .../jsp/uss/ion/cnt/cntManageDetailList.jsp | 5 ++++- src/main/webapp/js/kccadr/adjReqMgrPast/value.js | 5 +++++ 11 files changed, 35 insertions(+), 27 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java index 6b83ef72..f14bc50a 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -116,8 +116,8 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements List resultAdjReqMgrList = new ArrayList(); resultAdjReqMgrList = adjReqMgrPastDAO.selectAdjReqMgrListInfo(adjReqMgrPastVO); - if(resultAdjReqMgrList != null) { - +// if(resultAdjReqMgrList != null) { + if(resultAdjReqMgrList.size() > 0) { String rpplTy = resultAdjReqMgrList.get(0).getRpplTy(); int listCnt = resultAdjReqMgrList.size(); diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index 99ffdfce..667807b6 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -2,7 +2,6 @@ package kcc.kccadr.adjReqMgrPast.web; import java.time.LocalDateTime; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Properties; @@ -13,7 +12,6 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.core.env.SystemEnvironmentPropertySource; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; @@ -24,12 +22,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.mvc.support.RedirectAttributes; -import com.dreamsecurity.magicline.util.Log; - import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.LoginVO; -import kcc.com.cmm.service.AdrInnorixFileVO; import kcc.com.cmm.service.EgovCmmUseService; import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.EgovFileMngUtil; @@ -123,9 +118,6 @@ public class AdjReqMgrPastController { public String adjReqMgrPastBasicRegist(@ModelAttribute("searchVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { - System.out.println("git test"); - System.out.println("git test"); - //TODO TEST // adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920"); @@ -171,7 +163,6 @@ public class AdjReqMgrPastController { @RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastDetail.do") public String adjReqMgrPastDetail(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { - System.out.println("git test!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); return "kccadr/adjReqMgrPast/adjReqMgrPastDetail"; } @@ -655,7 +646,13 @@ public class AdjReqMgrPastController { //사용자 유니크 아이디 받아오기 adjReqMgrPastVO.setFrstRegisterId(userId); + if("".equals(adjReqMgrPastVO.getFrstRegistPnttm())) { + adjReqMgrPastVO.setFrstRegistPnttm(null); + } adjReqMgrPastVO.setLastUpdusrId(userId); + if("".equals(adjReqMgrPastVO.getLastUpdtPnttm())) { + adjReqMgrPastVO.setLastUpdtPnttm(null); + } //조정신청, 대리인, 신청인 등록 처리 return adjReqMgrPastService.insertAdjReqMgrRpplReq(adjReqMgrPastVO); } diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml index a650cbba..fa2364b4 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml @@ -395,7 +395,8 @@ left join ADR_MEM_DEPT_MGR_PST AMDMP on AMD.MEM_DEPT_SEQ = AMDMP.MEM_PST_SEQ left join ADR_ASS_MGR_PST AAMP on - AMD.ADR_ADM_ID = AAMP.ASS_PST_SEQ + + AMD.ADR_SEQ = AAMP.ADR_SEQ where AMD.ADR_SEQ= #adrSeq# @@ -917,7 +918,7 @@ LEFT JOIN ADR_MGR_DETAIL amd ON amm.ADR_SEQ = amd.ADR_SEQ LEFT JOIN ADR_ASS_MGR_PST aamp - ON amd.ADR_ADM_ID = aamp.ASS_PST_SEQ + ON amd.adr_seq = aamp.adr_seq LEFT JOIN ADR_MEM_DEPT_MGR_PST amdm ON amd.MEM_DEPT_SEQ = amdm.MEM_PST_SEQ LEFT JOIN ADR_HSTRY ah @@ -1000,7 +1001,7 @@ LEFT JOIN ADR_MGR_DETAIL amd ON amm.ADR_SEQ = amd.ADR_SEQ LEFT JOIN ADR_ASS_MGR_PST aamp - ON amd.ADR_ADM_ID = aamp.ASS_PST_SEQ + ON amd.adr_seq = aamp.adr_seq LEFT JOIN ADR_MEM_DEPT_MGR_PST amdm ON amd.MEM_DEPT_SEQ = amdm.MEM_PST_SEQ LEFT JOIN ADR_HSTRY ah diff --git a/src/main/resources/egovframework/sqlmap/let/uss/ion/cnt/CntManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/uss/ion/cnt/CntManage_SQL_Mysql.xml index 2235c7cb..cf4f96c0 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/ion/cnt/CntManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/ion/cnt/CntManage_SQL_Mysql.xml @@ -137,7 +137,9 @@ " name="delYn" class="check2" title="선택"> " /> - +<%-- --%> + + + diff --git a/src/main/webapp/js/kccadr/adjReqMgrPast/value.js b/src/main/webapp/js/kccadr/adjReqMgrPast/value.js index 75fb9d11..853a0ddf 100644 --- a/src/main/webapp/js/kccadr/adjReqMgrPast/value.js +++ b/src/main/webapp/js/kccadr/adjReqMgrPast/value.js @@ -9,6 +9,11 @@ $('#adrSn').val($('#adrSnTemp').val()); $('#memDeptNm').val($('#memDeptNmTemp').val()); $('#assPstUsrNm').val($('#assPstUsrNmTemp').val()); + + if($('#adrNo').val() == ''){ + alert('조정번호는 필수 입력값입니다.'); + return false; + } console.log(' !! ', $('#adrSn').val()); console.log(' !! ', $('#frstRegistPnttm').val());