From 8c1e860376e6646753c2c1b77dae132cdd1f1262 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Mon, 10 Jul 2023 14:06:54 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A0=84=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C?= =?UTF-8?q?=EC=8A=A4=ED=85=9C=20=EA=B3=A0=EB=8F=84=ED=99=94=20=EC=BB=A4?= =?UTF-8?q?=EB=B0=8B=20=20-=20=EC=88=98=EC=A0=95=EC=9A=94=EC=B2=AD=20?= =?UTF-8?q?=EC=82=AC=ED=95=AD=20export=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ars/web/AdjstReqStatusController.java | 41 +++---- .../adjPgrMgr/apm/web/ApmController.java | 10 +- .../adjPgrMgr/arm/web/ArmController.java | 35 +++--- .../cclt/service/ConciliatorManageVO.java | 11 ++ .../adjPgrMgr/cfrm/web/CfrmController.java | 29 ++--- .../adjPgrMgr/chd/web/ChdController.java | 36 ++++--- .../adjPgrMgr/crt/web/CrtController.java | 32 +++--- .../adjPgrMgr/dnt/web/DntController.java | 38 +++---- .../adjPgrMgr/drt/web/DrtController.java | 100 ++++++++++-------- .../drtctr/web/DrtCtrController.java | 40 +++---- .../adjPgrMgr/ent/web/EntController.java | 30 +++--- .../web/InternalApprovManageController.java | 11 +- .../adjPgrMgr/oad/web/OadController.java | 36 ++++--- .../adjreqmgr/web/AdjReqMgrController.java | 14 +-- .../adjst/web/AdjstReqWebController.java | 16 +-- .../kccadr/ojct/web/OjctWebController.java | 20 ++-- .../kccadr/ozSchd/web/OzSchdExportUtil.java | 14 +-- .../cclt/ConciliatorManage_SQL_Mysql.xml | 6 +- .../jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp | 8 +- .../cclt/ConciliatorManageDetail.jsp | 54 +++++----- .../jsp/kccadr/adjPgrMgr/cfrm/cfrmReg.jsp | 5 +- 21 files changed, 317 insertions(+), 269 deletions(-) diff --git a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java index ee8e5d94..85a1629b 100644 --- a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java +++ b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java @@ -1058,11 +1058,12 @@ public class AdjstReqStatusController { List resultStampInfo = cmmService.selectAtchFileIdInfo(cmmVO); String atchFileId = ""; - - if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) { - - atchFileId = resultStampInfo.get(0).getAtchFileId(); - + if(resultStampInfo.size() > 0) { + if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) { + + atchFileId = resultStampInfo.get(0).getAtchFileId(); + + } } /*if(!adrSeq.equals("")) { @@ -1071,91 +1072,91 @@ public class AdjstReqStatusController { }*/ - if(!adrNo.equals("")) { + if(StringUtil.isNotEmpty(adrNo)) { oj.put("adrNo", adrNo); } - if(!adrSn.equals("")) { + if(StringUtil.isNotEmpty(adrSn)) { oj.put("adrSn", adrSn); } - if(!cctyTx.equals("")) { + if(StringUtil.isNotEmpty(cctyTx)) { oj.put("cctyTx", cctyTx); } - if(!memDeptNm.equals("")) { + if(StringUtil.isNotEmpty(memDeptNm)) { oj.put("memDeptNm", memDeptNm); } - if(!memName.equals("")) { + if(StringUtil.isNotEmpty(memName)) { oj.put("memName", memName); } - if(!adrAdmNm.equals("")) { + if(StringUtil.isNotEmpty(adrAdmNm)) { oj.put("adrAdmNm", adrAdmNm); } - if(!adrAdmOffmTel.equals("")) { + if(StringUtil.isNotEmpty(adrAdmOffmTel)) { oj.put("adrAdmOffmTel", adrAdmOffmTel); } - if(!applicantNm.equals("")) { + if(StringUtil.isNotEmpty(applicantNm)) { oj.put("applicantNm", applicantNm); } - if(!resPonDentNm.equals("")) { + if(StringUtil.isNotEmpty(resPonDentNm)) { oj.put("resPonDentNm", resPonDentNm); } - if(!resPonDentNmEtc.equals("")) { + if(StringUtil.isNotEmpty(resPonDentNmEtc)) { oj.put("resPonDentNmEtc", resPonDentNmEtc); } - /*if(!appDeDay.equals("")) { + /*if(StringUtil.isNotEmpty(appDeDay)) { oj.put("appDeDay", appDeDay); }*/ - if(!appDeDate.equals("")) { + if(StringUtil.isNotEmpty(appDeDate)) { oj.put("appDeDate", appDeDate); } - if(!appPlace.equals("")) { + if(StringUtil.isNotEmpty(appPlace)) { oj.put("appPlace", appPlace); } - if(!appPlaceAddr.equals("")) { + if(StringUtil.isNotEmpty(appPlaceAddr)) { oj.put("appPlaceAddr", appPlaceAddr); } - if(!atchFileId.equals("")) { + if(StringUtil.isNotEmpty(atchFileId)) { String domain = ""; diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java index 8de14eac..721821a2 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -2749,31 +2749,31 @@ public class ApmController { String applicantNm = corReqVO.getAppliCantNm(); //신청인 이름 String resPonDentNm = corReqVO.getRpplNm(); //피신청인 - if(!adrNo.equals("")) { + if(StringUtil.isNotEmpty(adrNo)) { oj.put("adrNo", adrNo); } - if(!rpplChgCn1.equals("")) { + if(StringUtil.isNotEmpty(rpplChgCn1)) { oj.put("rpplChgCn1", rpplChgCn1); } - if(!rpplChgCn2.equals("")) { + if(StringUtil.isNotEmpty(rpplChgCn2)) { oj.put("rpplChgCn2", rpplChgCn2); } - if(!applicantNm.equals("")) { + if(StringUtil.isNotEmpty(applicantNm)) { oj.put("applicantNm", applicantNm); } - if(!resPonDentNm.equals("")) { + if(StringUtil.isNotEmpty(resPonDentNm)) { oj.put("resPonDentNm", resPonDentNm); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java index fa65333f..3b0d5485 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java @@ -677,80 +677,81 @@ public class ArmController { List resultStampInfo = cmmService.selectAtchFileIdInfo(closeVO); String atchFileId = ""; - - if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) { - - atchFileId = resultStampInfo.get(0).getAtchFileId(); - + if(resultStampInfo.size() > 0) { + if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) { + + atchFileId = resultStampInfo.get(0).getAtchFileId(); + + } } - if(!adrSeq.equals("")) { + if(StringUtil.isNotEmpty(adrSeq)) { oj.put("adrSeq", adrSeq); } - if(!adrNo.equals("")) { + if(StringUtil.isNotEmpty(adrNo)) { oj.put("adrNo", adrNo); } - if(!adrSn.equals("")) { + if(StringUtil.isNotEmpty(adrSn)) { oj.put("adrSn", adrSn); } - if(!cctyTx.equals("")) { + if(StringUtil.isNotEmpty(cctyTx)) { oj.put("cctyTx", cctyTx); } - if(!memDeptNm.equals("")) { + if(StringUtil.isNotEmpty(memDeptNm)) { oj.put("memDeptNm", memDeptNm); } - if(!memName.equals("")) { + if(StringUtil.isNotEmpty(memName)) { oj.put("memName", memName); } - if(!closeCn1.equals("")) { + if(StringUtil.isNotEmpty(closeCn1)) { oj.put("closeCn1", closeCn1); } - if(!applicantNm.equals("")) { + if(StringUtil.isNotEmpty(applicantNm)) { oj.put("applicantNm", applicantNm); } - if(!resPonDentNm.equals("")) { + if(StringUtil.isNotEmpty(resPonDentNm)) { oj.put("resPonDentNm", resPonDentNm); } - if(!appDeDay.equals("")) { + if(StringUtil.isNotEmpty(appDeDay)) { oj.put("appDeDay", appDeDay); } - if(!rplyEndDeDay.equals("")) { + if(StringUtil.isNotEmpty(rplyEndDeDay)) { oj.put("rplyEndDeDay", rplyEndDeDay); } - if(!atchFileId.equals("")) { + if(StringUtil.isNotEmpty(atchFileId)) { String domain = ""; diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cclt/service/ConciliatorManageVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/cclt/service/ConciliatorManageVO.java index 78f3074c..88abc9f9 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cclt/service/ConciliatorManageVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cclt/service/ConciliatorManageVO.java @@ -112,6 +112,8 @@ public class ConciliatorManageVO extends ComDefaultVO { private String emailAdres; // 이메일 private String userNm; // 결재자명 private String procCnd; // 처리구분 I, U + + private String memTeam; // 조정위원 소속 public String[] getMemSeqArr() { @@ -377,6 +379,15 @@ public class ConciliatorManageVO extends ComDefaultVO { public void setProcCnd(String procCnd) { this.procCnd = procCnd; } + + public String getMemTeam() { + return memTeam; + } + + public void setMemTeam(String memTeam) { + this.memTeam = memTeam; + } + diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java index 4c958fcc..3a2bc709 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java @@ -563,12 +563,13 @@ public class CfrmController { cmmVO.setMemGrade("01"); List resultStampInfo = cmmService.selectAtchFileIdInfo(cmmVO); - if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) { - - atchFileId = resultStampInfo.get(0).getAtchFileId(); - + if(resultStampInfo.size() > 0) { + if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) { + + atchFileId = resultStampInfo.get(0).getAtchFileId(); + + } } - //조정조사관 직인 이미지 불러오기 PgrCmmVO resultAdmStampInfo = cmmService.selectAdmAtchFileIdInfo(cmmVO); @@ -617,49 +618,49 @@ public class CfrmController { } - if(!adrNo.equals("")) { + if(StringUtil.isNotEmpty(adrNo)) { oj.put("adrNo", adrNo); } - if(!memDeptNm.equals("")) { + if(StringUtil.isNotEmpty(memDeptNm)) { oj.put("memDeptNm", memDeptNm); } - if(!memName.equals("")) { + if(StringUtil.isNotEmpty(memName)) { oj.put("memName", memName); } - if(!adrAdmNm.equals("")) { + if(StringUtil.isNotEmpty(adrAdmNm)) { oj.put("adrAdmNm", adrAdmNm); } - if(!applicantNm.equals("")) { + if(StringUtil.isNotEmpty(applicantNm)) { oj.put("applicantNm", applicantNm); } - if(!resPonDentNm.equals("")) { + if(StringUtil.isNotEmpty(resPonDentNm)) { oj.put("resPonDentNm", resPonDentNm); } - /*if(!resPonDentNmEtc.equals("")) { + /*if(StringUtil.isNotEmpty(resPonDentNmEtc)) { oj.put("resPonDentNmEtc", resPonDentNmEtc); }*/ - if(!rplyEndDeDay.equals("")) { + if(StringUtil.isNotEmpty(rplyEndDeDay)) { oj.put("rplyEndDeDay", rplyEndDeDay); @@ -670,7 +671,7 @@ public class CfrmController { oj.put("recDeDay", recDeDay); } - if(!closeCn1.equals("")) { + if(StringUtil.isNotEmpty(closeCn1)) { oj.put("closeCn1", closeCn1); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java b/src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java index ffdd3dfb..4a64df71 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java @@ -519,10 +519,12 @@ public class ChdController { String atchFileId = ""; - if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) { - - atchFileId = resultStampInfo.get(0).getAtchFileId(); - + if(resultStampInfo.size() > 0) { + if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) { + + atchFileId = resultStampInfo.get(0).getAtchFileId(); + + } } /*if(!adrSeq.equals("")) { @@ -531,73 +533,73 @@ public class ChdController { }*/ - if(!adrNo.equals("")) { + if(StringUtil.isNotEmpty(adrNo)) { oj.put("adrNo", adrNo); } - if(!adrSn.equals("")) { + if(StringUtil.isNotEmpty(adrSn)) { oj.put("adrSn", adrSn); } - if(!cctyTx.equals("")) { + if(StringUtil.isNotEmpty(cctyTx)) { oj.put("cctyTx", cctyTx); } - if(!memDeptNm.equals("")) { + if(StringUtil.isNotEmpty(memDeptNm)) { oj.put("memDeptNm", memDeptNm); } - if(!memName.equals("")) { + if(StringUtil.isNotEmpty(memName)) { oj.put("memName", memName); } - if(!adrAdmNm.equals("")) { + if(StringUtil.isNotEmpty(adrAdmNm)) { oj.put("adrAdmNm", adrAdmNm); } - if(!adrAdmOffmTel.equals("")) { + if(StringUtil.isNotEmpty(adrAdmOffmTel)) { oj.put("adrAdmOffmTel", adrAdmOffmTel); } - if(!applicantNm.equals("")) { + if(StringUtil.isNotEmpty(applicantNm)) { oj.put("applicantNm", applicantNm); } - if(!resPonDentNm.equals("")) { + if(StringUtil.isNotEmpty(resPonDentNm)) { oj.put("resPonDentNm", resPonDentNm); } - if(!resPonDentNmEtc.equals("")) { + if(StringUtil.isNotEmpty(resPonDentNmEtc)) { oj.put("resPonDentNmEtc", resPonDentNmEtc); } - /*if(!appDeDay.equals("")) { + /*if(StringUtil.isNotEmpty(appDeDay)) { oj.put("appDeDay", appDeDay); }*/ - if(!appDeDate.equals("")) { + if(StringUtil.isNotEmpty(appDeDate)) { oj.put("appDeDate", appDeDate); @@ -615,7 +617,7 @@ public class ChdController { } - if(!atchFileId.equals("")) { + if(StringUtil.isNotEmpty(atchFileId)) { String domain = ""; diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java b/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java index b8f9cb65..55d6b4ab 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java @@ -592,68 +592,68 @@ public class CrtController { List resultStampInfo = cmmService.selectAtchFileIdInfo(closeVO); String atchFileId = ""; - - if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) { - - atchFileId = resultStampInfo.get(0).getAtchFileId(); - + if(resultStampInfo.size() > 0) { + if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) { + + atchFileId = resultStampInfo.get(0).getAtchFileId(); + + } } - - if(!adrSeq.equals("")) { + if(StringUtil.isNotEmpty(adrSeq)) { oj.put("adrSeq", adrSeq); } - if(!adrNo.equals("")) { + if(StringUtil.isNotEmpty(adrNo)) { oj.put("adrNo", adrNo); } - if(!adrSn.equals("")) { + if(StringUtil.isNotEmpty(adrSn)) { oj.put("adrSn", adrSn); } - if(!cctyTx.equals("")) { + if(StringUtil.isNotEmpty(cctyTx)) { oj.put("cctyTx", cctyTx); } - if(!memDeptNm.equals("")) { + if(StringUtil.isNotEmpty(memDeptNm)) { oj.put("memDeptNm", memDeptNm); } - if(!memName.equals("")) { + if(StringUtil.isNotEmpty(memName)) { oj.put("memName", memName); } - if(!closeCn1.equals("")) { + if(StringUtil.isNotEmpty(closeCn1)) { oj.put("closeCn1", closeCn1); } - if(!applicantNm.equals("")) { + if(StringUtil.isNotEmpty(applicantNm)) { oj.put("applicantNm", applicantNm); } - if(!resPonDentNm.equals("")) { + if(StringUtil.isNotEmpty(resPonDentNm)) { oj.put("resPonDentNm", resPonDentNm); } - if(!atchFileId.equals("")) { + if(StringUtil.isNotEmpty(atchFileId)) { String domain = ""; diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java index a12b3647..f2a8cef0 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java @@ -864,11 +864,10 @@ public class DntController { List resultStampInfo = cmmService.selectAtchFileIdInfo(cmmVO); String atchFileId = ""; - - if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) { - - atchFileId = resultStampInfo.get(0).getAtchFileId(); - + if(resultStampInfo.size() > 0) { + if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) { + atchFileId = resultStampInfo.get(0).getAtchFileId(); + } } /*if(!adrSeq.equals("")) { @@ -877,85 +876,86 @@ public class DntController { }*/ - if(!adrNo.equals("")) { + if(StringUtil.isNotEmpty(adrNo)) { oj.put("adrNo", adrNo); } - if(!adrSn.equals("")) { + if(StringUtil.isNotEmpty(adrSn)) { oj.put("adrSn", adrSn); } - if(!cctyTx.equals("")) { + if(StringUtil.isNotEmpty(cctyTx)) { oj.put("cctyTx", cctyTx); } - if(!memDeptNm.equals("")) { +// if(StringUtil.isNotEmpty(memDeptNm)) { + if(StringUtil.isNotEmpty(memDeptNm)) { oj.put("memDeptNm", memDeptNm); } - if(!memName.equals("")) { + if(StringUtil.isNotEmpty(memName)) { oj.put("memName", memName); } - if(!adrAdmNm.equals("")) { + if(StringUtil.isNotEmpty(adrAdmNm)) { oj.put("adrAdmNm", adrAdmNm); } - if(!adrAdmOffmTel.equals("")) { + if(StringUtil.isNotEmpty(adrAdmOffmTel)) { oj.put("adrAdmOffmTel", adrAdmOffmTel); } - if(!applicantNm.equals("")) { + if(StringUtil.isNotEmpty(applicantNm)) { oj.put("applicantNm", applicantNm); } - if(!resPonDentNm.equals("")) { + if(StringUtil.isNotEmpty(resPonDentNm)) { oj.put("resPonDentNm", resPonDentNm); } - if(!resPonDentNmEtc.equals("")) { + if(StringUtil.isNotEmpty(resPonDentNmEtc)) { oj.put("resPonDentNmEtc", resPonDentNmEtc); } - /*if(!appDeDay.equals("")) { + /*if(StringUtil.isNotEmpty(appDeDay)) { oj.put("appDeDay", appDeDay); }*/ - if(!appDeDate.equals("")) { + if(StringUtil.isNotEmpty(appDeDate)) { oj.put("appDeDate", appDeDate); } - if(!appPlace.equals("")) { + if(StringUtil.isNotEmpty(appPlace)) { oj.put("appPlace", appPlace); } - if(!appPlaceAddr.equals("")) { + if(StringUtil.isNotEmpty(appPlaceAddr)) { oj.put("appPlaceAddr", appPlaceAddr); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java b/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java index e0a4dc6a..a11a85e3 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java @@ -849,21 +849,23 @@ public class DrtController { /*String[] strMemName = result.getMemNames().split(",");*/ String[] strMemName; - //조정부가 단독부 일경우 조정부장이 조정위원도 포함 - if(StringUtil.isNotEmpty(result.getMemNames())) { - strMemName = result.getMemNames().split(","); - }else { - strMemName = result.getMemName().split(","); - } + if(result.getMemNames() != null || result.getMemName() != null) { + //조정부가 단독부 일경우 조정부장이 조정위원도 포함 + if(StringUtil.isNotEmpty(result.getMemNames())) { + strMemName = result.getMemNames().split(","); + }else { + strMemName = result.getMemName().split(","); + } - //조정위원 리스트 처리 - for(String name : strMemName) { - - JSONObject ojs = new JSONObject(); - - ojs.put("memName", name); - jsJoMemInfo.add(ojs); - + //조정위원 리스트 처리 + for(String name : strMemName) { + + JSONObject ojs = new JSONObject(); + + ojs.put("memName", name); + jsJoMemInfo.add(ojs); + + } } jsDrtInfo = parseJsonData(result); @@ -1013,11 +1015,12 @@ public class DrtController { List resultStampInfo = cmmService.selectAtchFileIdInfo(cmmVO); String atchFileId = ""; - - if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) { - - atchFileId = resultStampInfo.get(0).getAtchFileId(); - + if(resultStampInfo.size() > 0) { + if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) { + + atchFileId = resultStampInfo.get(0).getAtchFileId(); + + } } //조정조사관 직인 이미지 불러오기 @@ -1032,116 +1035,121 @@ public class DrtController { } - if(openYn.equals("Y")) { - - openYn = "공개"; - - }else { - - openYn = "비공개"; - + if(StringUtil.isNotEmpty(openYn)) { + if(openYn.equals("Y")) { + + openYn = "공개"; + + }else { + + openYn = "비공개"; + + } } - String prtclCn = cmmVO.getPrtclCn().replaceAll("\r\n", "\\\\r\\\\n"); //기일조서 내용 + String prtclCn = ""; + if(StringUtil.isNotEmpty(cmmVO.getPrtclCn())) { + prtclCn = cmmVO.getPrtclCn().replaceAll("\r\n", "\\\\r\\\\n"); //기일조서 내용 + } - if(!adrNo.equals("")) { + if(StringUtil.isNotEmpty(adrNo)) { oj.put("adrNo", adrNo); } - if(!adrSn.equals("")) { + if(StringUtil.isNotEmpty(adrSn)) { oj.put("adrSn", adrSn); } - if(!cctyTx.equals("")) { + if(StringUtil.isNotEmpty(cctyTx)) { oj.put("cctyTx", cctyTx); } - if(!memDeptNm.equals("")) { + if(StringUtil.isNotEmpty(memDeptNm)) { oj.put("memDeptNm", memDeptNm); } - if(!memName.equals("")) { + if(StringUtil.isNotEmpty(memName)) { oj.put("memName", memName); } - if(!adrAdmNm.equals("")) { + if(StringUtil.isNotEmpty(adrAdmNm)) { oj.put("adrAdmNm", adrAdmNm); } - /*if(!adrAdmOffmTel.equals("")) { + /*if(StringUtil.isNotEmpty(adrAdmOffmTel)) { oj.put("adrAdmOffmTel", adrAdmOffmTel); }*/ - if(!applicantNm.equals("")) { + if(StringUtil.isNotEmpty(applicantNm)) { oj.put("applicantNm", applicantNm); } - /*if(!resPonDentNm.equals("")) { + /*if(StringUtil.isNotEmpty(resPonDentNm)) { oj.put("resPonDentNm", resPonDentNm); } - if(!resPonDentNmEtc.equals("")) { + if(StringUtil.isNotEmpty(resPonDentNmEtc)) { oj.put("resPonDentNmEtc", resPonDentNmEtc); }*/ - if(!appDeDate.equals("")) { + if(StringUtil.isNotEmpty(appDeDate)) { oj.put("appDeDate", appDeDate); } - if(!nextAppDate.equals("")) { + if(StringUtil.isNotEmpty(nextAppDate)) { oj.put("nextAppDate", nextAppDate); } - if(!appPlaceInfo.equals("")) { + if(StringUtil.isNotEmpty(appPlaceInfo)) { oj.put("appPlaceInfo", appPlaceInfo); } - /*if(!appPlaceAddr.equals("")) { + /*if(StringUtil.isNotEmpty(appPlaceAddr)) { oj.put("appPlaceAddr", appPlaceAddr); }*/ - if(!openYn.equals("")) { + if(StringUtil.isNotEmpty(openYn)) { oj.put("openYn", openYn); } - if(!prtclCn.equals("")) { + if(StringUtil.isNotEmpty(prtclCn)) { oj.put("prtclCn", prtclCn); } - if(!atchFileId.equals("")) { + if(StringUtil.isNotEmpty(atchFileId)) { String domain = ""; @@ -1160,7 +1168,7 @@ public class DrtController { } - if(!admAtchFileId.equals("")) { + if(StringUtil.isNotEmpty(admAtchFileId)) { String domain = ""; diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java b/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java index 0a3276bd..2cd8babd 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java @@ -1131,10 +1131,12 @@ public class DrtCtrController { String atchFileId = ""; - if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) { - - atchFileId = resultStampInfo.get(0).getAtchFileId(); - + if(resultStampInfo.size() > 0) { + if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) { + + atchFileId = resultStampInfo.get(0).getAtchFileId(); + + } } //조정조사관 직인 이미지 불러오기 @@ -1162,86 +1164,86 @@ public class DrtCtrController { String prtclCn = cmmVO.getPrtclCn().replaceAll("\r\n", "\\\\r\\\\n"); //조정조서 내용 - if(!adrNo.equals("")) { + if(StringUtil.isNotEmpty(adrNo)) { oj.put("adrNo", adrNo); } - if(!adrSn.equals("")) { + if(StringUtil.isNotEmpty(adrSn)) { oj.put("adrSn", adrSn); } - if(!cctyTx.equals("")) { + if(StringUtil.isNotEmpty(cctyTx)) { oj.put("cctyTx", cctyTx); } - if(!memDeptNm.equals("")) { + if(StringUtil.isNotEmpty(memDeptNm)) { oj.put("memDeptNm", memDeptNm); } - if(!memName.equals("")) { + if(StringUtil.isNotEmpty(memName)) { oj.put("memName", memName); } - if(!adrAdmNm.equals("")) { + if(StringUtil.isNotEmpty(adrAdmNm)) { oj.put("adrAdmNm", adrAdmNm); } - if(!applicantNm.equals("")) { + if(StringUtil.isNotEmpty(applicantNm)) { oj.put("applicantNm", applicantNm); } - if(!appDeDate.equals("")) { + if(StringUtil.isNotEmpty(appDeDate)) { oj.put("appDeDate", appDeDate); } - if(!nextAppDate.equals("")) { + if(StringUtil.isNotEmpty(nextAppDate)) { oj.put("nextAppDate", nextAppDate); } - if(!appPlaceInfo.equals("")) { + if(StringUtil.isNotEmpty(appPlaceInfo)) { oj.put("appPlaceInfo", appPlaceInfo); } - if(!openYn.equals("")) { + if(StringUtil.isNotEmpty(openYn)) { oj.put("openYn", openYn); } - if(!prtclCn.equals("")) { + if(StringUtil.isNotEmpty(prtclCn)) { oj.put("prtclCn", prtclCn); } - if(!ctrCn.equals("")) { + if(StringUtil.isNotEmpty(ctrCn)) { oj.put("ctrCn", ctrCn.replaceAll("\r\n", "\\\\r\\\\n")); } - if(!atchFileId.equals("")) { + if(StringUtil.isNotEmpty(atchFileId)) { String domain = ""; @@ -1260,7 +1262,7 @@ public class DrtCtrController { } - if(!admAtchFileId.equals("")) { + if(StringUtil.isNotEmpty(admAtchFileId)) { String domain = ""; diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java b/src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java index 2e64f44e..ed2181e9 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java @@ -633,68 +633,70 @@ public class EntController { String atchFileId = ""; - if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) { - - atchFileId = resultStampInfo.get(0).getAtchFileId(); - + if(resultStampInfo.size() > 0) { + if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) { + + atchFileId = resultStampInfo.get(0).getAtchFileId(); + + } } - if(!adrNo.equals("")) { + if(StringUtil.isNotEmpty(adrNo)) { oj.put("adrNo", adrNo); } - if(!adrSn.equals("")) { + if(StringUtil.isNotEmpty(adrSn)) { oj.put("adrSn", adrSn); } - if(!cctyTx.equals("")) { + if(StringUtil.isNotEmpty(cctyTx)) { oj.put("cctyTx", cctyTx); } - if(!memDeptNm.equals("")) { + if(StringUtil.isNotEmpty(memDeptNm)) { oj.put("memDeptNm", memDeptNm); } - if(!memName.equals("")) { + if(StringUtil.isNotEmpty(memName)) { oj.put("memName", memName); } - if(!applicantNm.equals("")) { + if(StringUtil.isNotEmpty(applicantNm)) { oj.put("applicantNm", applicantNm); } - if(!resPonDentNm.equals("")) { + if(StringUtil.isNotEmpty(resPonDentNm)) { oj.put("resPonDentNm", resPonDentNm); } - if(!resPonDentNmEtc.equals("")) { + if(StringUtil.isNotEmpty(resPonDentNmEtc)) { oj.put("resPonDentNmEtc", resPonDentNmEtc); } - if(!closeCn1.equals("")) { + if(StringUtil.isNotEmpty(closeCn1)) { oj.put("closeCn1", closeCn1); } - if(!atchFileId.equals("")) { + if(StringUtil.isNotEmpty(atchFileId)) { String domain = ""; diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java b/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java index 11360f45..f5a3523c 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java @@ -1186,11 +1186,12 @@ public class InternalApprovManageController { cmmVO.setMemGrade("01"); List resultStampInfo = cmmService.selectAtchFileIdInfo(cmmVO); - - if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) { - - atchFileId = resultStampInfo.get(0).getAtchFileId(); - + if(resultStampInfo.size() > 0) { + if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) { + + atchFileId = resultStampInfo.get(0).getAtchFileId(); + + } } //조정조사관 직인 이미지 불러오기 diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java b/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java index 77217b3b..e9e34175 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java @@ -930,86 +930,88 @@ public class OadController { String atchFileId = ""; - if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) { - - atchFileId = resultStampInfo.get(0).getAtchFileId(); - + if(resultStampInfo.size() > 0) { + if(StringUtil.isNotEmpty(resultStampInfo.get(0).getAtchFileId())) { + + atchFileId = resultStampInfo.get(0).getAtchFileId(); + + } } - if(!adrNo.equals("")) { + if(StringUtil.isNotEmpty(adrNo)) { oj.put("adrNo", adrNo); } - if(!adrSn.equals("")) { + if(StringUtil.isNotEmpty(adrSn)) { oj.put("adrSn", adrSn); } - if(!cctyTx.equals("")) { + if(StringUtil.isNotEmpty(cctyTx)) { oj.put("cctyTx", cctyTx); } - if(!memDeptNm.equals("")) { + if(StringUtil.isNotEmpty(memDeptNm)) { oj.put("memDeptNm", memDeptNm); } - if(!memName.equals("")) { + if(StringUtil.isNotEmpty(memName)) { oj.put("memName", memName); } - if(!applicantNm.equals("")) { + if(StringUtil.isNotEmpty(applicantNm)) { oj.put("applicantNm", applicantNm); } - if(!resPonDentNm.equals("")) { + if(StringUtil.isNotEmpty(resPonDentNm)) { oj.put("resPonDentNm", resPonDentNm); } - if(!resPonDentNmEtc.equals("")) { + if(StringUtil.isNotEmpty(resPonDentNmEtc)) { oj.put("resPonDentNmEtc", resPonDentNmEtc); } - if(!appDeDay.equals("")) { + if(StringUtil.isNotEmpty(appDeDay)) { oj.put("appDeDay", appDeDay); } - if(!closeCn1.equals("")) { + if(StringUtil.isNotEmpty(closeCn1)) { oj.put("closeCn1", closeCn1); } - if(!closeCn2.equals("")) { + if(StringUtil.isNotEmpty(closeCn2)) { oj.put("closeCn2", closeCn2); } - if(!closeCn3.equals("")) { + if(StringUtil.isNotEmpty(closeCn3)) { oj.put("closeCn3", closeCn3); } - if(!atchFileId.equals("")) { + if(StringUtil.isNotEmpty(atchFileId)) { String domain = ""; diff --git a/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java b/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java index a758254b..9c5a73b5 100644 --- a/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java +++ b/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java @@ -1268,43 +1268,43 @@ public class AdjReqMgrController { String reqCn2 = adjReqVO.getReqCn2().replaceAll("\r\n", "\\\\r\\\\n"); //신청원인 - if(!rpplNm.equals("")) { + if(StringUtil.isNotEmpty(rpplNm)) { oj.put("rpplNm", rpplNm); } - if(!rpplPost.equals("")) { + if(StringUtil.isNotEmpty(rpplPost)) { oj.put("rpplPost", rpplPost); } - if(!rpplPhone.equals("")) { + if(StringUtil.isNotEmpty(rpplPhone)) { oj.put("rpplPhone", rpplPhone); } - if(!rpplAddr.equals("") && !rpplAddr.equals(" ")) { + if(StringUtil.isNotEmpty(rpplAddr) && " ".equals(rpplAddr)) { oj.put("rpplAddr", rpplAddr); } - if(!rpplEmail.equals("")) { + if(StringUtil.isNotEmpty(rpplEmail)) { oj.put("rpplEmail", rpplEmail); } - if(!reqCn1.equals("")) { + if(StringUtil.isNotEmpty(reqCn1)) { oj.put("reqCn1", reqCn1); } - if(!reqCn2.equals("")) { + if(StringUtil.isNotEmpty(reqCn2)) { oj.put("reqCn2", reqCn2); diff --git a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java index 94290cc1..564d32cd 100644 --- a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java +++ b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java @@ -1720,43 +1720,43 @@ public class AdjstReqWebController { } - if(!rpplNm.equals("")) { + if(StringUtil.isNotEmpty(rpplNm)) { oj.put("rpplNm", rpplNm); } - if(!rpplPost.equals("")) { + if(StringUtil.isNotEmpty(rpplPost)) { oj.put("rpplPost", rpplPost); } - if(!rpplPhone.equals("")) { + if(StringUtil.isNotEmpty(rpplPhone)) { oj.put("rpplPhone", rpplPhone); } - if(!rpplAddr.equals("") && !rpplAddr.equals(" ")) { + if(StringUtil.isNotEmpty(rpplAddr) && " ".equals(rpplAddr)) { oj.put("rpplAddr", rpplAddr); } - if(!rpplEmail.equals("")) { + if(StringUtil.isNotEmpty(rpplEmail)) { oj.put("rpplEmail", rpplEmail); } - if(!reqCn1.equals("")) { + if(StringUtil.isNotEmpty(reqCn1)) { oj.put("reqCn1", reqCn1); } - if(!reqCn2.equals("")) { + if(StringUtil.isNotEmpty(reqCn2)) { oj.put("reqCn2", reqCn2); @@ -1770,7 +1770,7 @@ public class AdjstReqWebController { } - if(!appDeDate.equals("")) { + if(StringUtil.isNotEmpty(appDeDate)) { oj.put("apprDe", appDeDate); diff --git a/src/main/java/kcc/kccadr/ojct/web/OjctWebController.java b/src/main/java/kcc/kccadr/ojct/web/OjctWebController.java index a16bd19c..5413c8a3 100644 --- a/src/main/java/kcc/kccadr/ojct/web/OjctWebController.java +++ b/src/main/java/kcc/kccadr/ojct/web/OjctWebController.java @@ -482,37 +482,37 @@ public class OjctWebController { rplyEndDeDay = dateArr[0] + "년 " + dateArr[1] + "월 " + dateArr[2] + "일자 "; - if(!adrNo.equals("")) { + if(StringUtil.isNotEmpty(adrNo)) { oj.put("adrNo", adrNo); } - if(!adrSn.equals("")) { + if(StringUtil.isNotEmpty(adrSn)) { oj.put("adrSn", adrSn); } - if(!memDeptNm.equals("")) { + if(StringUtil.isNotEmpty(memDeptNm)) { oj.put("memDeptNm", memDeptNm); } - if(!memDeptNm.equals("")) { + if(StringUtil.isNotEmpty(memDeptNm)) { oj.put("memDeptNm", memDeptNm); } - if(!rpplNm.equals("")) { + if(StringUtil.isNotEmpty(rpplNm)) { oj.put("rpplNm", rpplNm); } - if(!rpplTy.equals("")) { + if(StringUtil.isNotEmpty(rpplTy)) { String rpplTyTx = ""; if(rpplTy.equals("10")) { @@ -532,25 +532,25 @@ public class OjctWebController { } - if(!resPonDentNm.equals("")) { + if(StringUtil.isNotEmpty(resPonDentNm)) { oj.put("resPonDentNm", resPonDentNm); } - if(!applicantNm.equals("")) { + if(StringUtil.isNotEmpty(applicantNm)) { oj.put("applicantNm", applicantNm); } - if(!rplyEndDeDay.equals("")) { + if(StringUtil.isNotEmpty(rplyEndDeDay)) { oj.put("rplyEndDeDay", rplyEndDeDay); } - if(!ojctCn.equals("")) { + if(StringUtil.isNotEmpty(ojctCn)) { oj.put("ojctCn", ojctCn); diff --git a/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java b/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java index 4641ac51..7dbef105 100644 --- a/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java +++ b/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java @@ -482,43 +482,43 @@ public class OzSchdExportUtil { String reqCn2 = adjReqVO.getReqCn2().replaceAll("\r\n", "\\\\r\\\\n"); //신청원인 - if(!rpplNm.equals("")) { + if(StringUtil.isNotEmpty(rpplNm)) { oj.put("rpplNm", rpplNm); } - if(!rpplPost.equals("")) { + if(StringUtil.isNotEmpty(rpplPost)) { oj.put("rpplPost", rpplPost); } - if(!rpplPhone.equals("")) { + if(StringUtil.isNotEmpty(rpplPhone)) { oj.put("rpplPhone", rpplPhone); } - if(!rpplAddr.equals("") && !rpplAddr.equals(" ")) { + if(StringUtil.isNotEmpty(rpplAddr) && " ".equals(rpplAddr)) { oj.put("rpplAddr", rpplAddr); } - if(!rpplEmail.equals("")) { + if(StringUtil.isNotEmpty(rpplEmail)) { oj.put("rpplEmail", rpplEmail); } - if(!reqCn1.equals("")) { + if(StringUtil.isNotEmpty(reqCn1)) { oj.put("reqCn1", reqCn1); } - if(!reqCn2.equals("")) { + if(StringUtil.isNotEmpty(reqCn2)) { oj.put("reqCn2", reqCn2); 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 0f47dd3d..137b78bc 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 @@ -21,7 +21,8 @@ DATE_FORMAT(FRST_REGIST_PNTTM, '%Y-%m-%d') AS frstRegistPnttm, FRST_REGISTER_ID AS frstRegisterId, DATE_FORMAT(LAST_UPDT_PNTTM, '%Y-%m-%d') AS lastUpdtPnttm, - LAST_UPDUSR_ID AS lastUpdusrId + LAST_UPDUSR_ID AS lastUpdusrId, + MEM_TEAM as memTeam FROM ADR_MEM_MGR WHERE 1=1 AND MEM_SEQ = #memSeq# @@ -140,6 +141,9 @@ ATCH_FILE_ID = #atchFileId# , + + + MEM_TEAM = #memTeam# , LAST_UPDT_PNTTM = NOW(), LAST_UPDUSR_ID = #lastUpdusrId# diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp index 42134f72..978d6c30 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp @@ -491,7 +491,7 @@ $(document).ready(function(){ }); if(!entCloseDocYn){ - var confirmYn = confirm("등록된 취하신청 문서가 없습니다. 취하신청문서가 있다면 사건문서->문서등록을 통해 등록해주세요. 계속 진행하시겠습니까?"); + var confirmYn = confirm("등록된 취하신청 문서가 없습니다. \n취하신청문서가 있다면 사건문서->문서등록을 통해 등록해주세요.\n취하신청문서를 등록하지 않고 진행하시겠습니까?"); if(confirmYn){ fncEntBeforeDtb(); @@ -511,6 +511,12 @@ $(document).ready(function(){ 입금완료, 조정접수, 접수결재요청, 접수결재완료, 조정부지정 일 경우 처리 결재 요청(접수결재요청, 배당결재요청 상태)에서 버튼 클릭 시 요청된 결재는 삭제 */ + var confirmYn = confirm("배당 전 취하종결을 하시겠습니까?"); + + if(confirmYn){ + }else{ + return false; + } $.ajax({ type : "POST", url : "/kccadr/adjPgrMgr/apm/entBeforeDtbAjax.do", 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 dae518b9..4d8fc603 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 @@ -59,23 +59,24 @@ function fncConciliatorManageIncert() { - if($("#memTermSt").val() == ''){ - alert("위원임기 시작일을 입력해주세요."); - return false; - } +// if($("#memTermSt").val() == ''){ +// alert("위원임기 시작일을 입력해주세요."); +// return false; +// } - if($("#memTermEn").val() == ''){ - alert("위원임기 종료일을 입력해주세요."); - return false; - } +// if($("#memTermEn").val() == ''){ +// alert("위원임기 종료일을 입력해주세요."); +// return false; +// } - - var memTermSt = $("#memTermSt").val().replace(/-/gi,'-',''); - var memTermEn = $("#memTermEn").val().replace(/-/gi,'-',''); - if(memTermSt > memTermEn){ - alert("위원임기 시작일이 종료일보다 클 수 없습니다."); - return false; + if($("#memTermSt").val() != '' || $("#memTermEn").val() != ''){ + var memTermSt = $("#memTermSt").val().replace(/-/gi,'-',''); + var memTermEn = $("#memTermEn").val().replace(/-/gi,'-',''); + if(memTermSt > memTermEn){ + alert("위원임기 시작일이 종료일보다 클 수 없습니다."); + return false; + } } if($(".uploaded_obj").length == 0){ @@ -192,30 +193,35 @@
- - + + + + - + + + + - + - + - - - - - +
아이디
성명 소속
연락처
이메일
서명이미지 +
@@ -288,13 +294,13 @@
차량번호 +
조정부 + @@ -302,7 +308,7 @@
위원임기 +
@@ -326,7 +332,7 @@
승인여부
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmReg.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmReg.jsp index b36d7f3f..a0ac42a9 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmReg.jsp @@ -88,10 +88,11 @@ fncGoList(); //상세 }else{ - alert(returnData.message); +// alert(returnData.message); + console.log("ERROR : ", returnData.message); } }, - error: function (e) { alert("Export 요청에 실패하였습니다."); console.log("ERROR : ", e); } + error: function (e) { console.log("ERROR : ", e); } }); }