tolag3/kcc_adr_advc_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

전자조정시스템 고도화 커밋

Browse Source 
- 수정요청 사항 export 오류 수정중
This commit is contained in:
leejunho 2023-07-10 14:06:54 +09:00
parent a110d6a9f4
commit 8c1e860376
21 changed files with 317 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java
View File

@ -1058,11 +1058,12 @@ public class AdjstReqStatusController {
List<PgrCmmVO> 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 = "";

10
src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java
View File

@ -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);

35
src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java
View File

@ -677,80 +677,81 @@ public class ArmController {
List<PgrCmmVO> 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 = "";

11
src/main/java/kcc/kccadr/adjPgrMgr/cclt/service/ConciliatorManageVO.java
View File

@ -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;
}

29
src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java
View File

@ -563,12 +563,13 @@ public class CfrmController {
cmmVO.setMemGrade("01");
List<PgrCmmVO> 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);

36
src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java
View File

@ -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 = "";

32
src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java
View File

@ -592,68 +592,68 @@ public class CrtController {
List<PgrCmmVO> 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 = "";

38
src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java
View File

@ -864,11 +864,10 @@ public class DntController {
List<PgrCmmVO> 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);

100
src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java
View File

@ -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<PgrCmmVO> 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 = "";

40
src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java
View File

@ -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 = "";

30
src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java
View File

@ -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 = "";

11
src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java
View File

@ -1186,11 +1186,12 @@ public class InternalApprovManageController {
cmmVO.setMemGrade("01");
List<PgrCmmVO> 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();
}
}
//조정조사관 직인 이미지 불러오기

36
src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java
View File

@ -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 = "";

14
src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java
View File

@ -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);

16
src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java
View File

@ -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);

20
src/main/java/kcc/kccadr/ojct/web/OjctWebController.java
View File

@ -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);

14
src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java
View File

@ -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);

6
src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml
View File

@ -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 @@
</isNotEmpty>
<isNotEmpty property="atchFileId">
ATCH_FILE_ID = #atchFileId# ,
</isNotEmpty>
<isNotEmpty property="memTeam">
MEM_TEAM = #memTeam# ,
</isNotEmpty>
LAST_UPDT_PNTTM = NOW(),
LAST_UPDUSR_ID = #lastUpdusrId#

8
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp
View File

@ -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",

54
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageDetail.jsp
View File

@ -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 @@
<div class="tbType02">
<table>
<colgroup>
<col style="width: 20%">
<col style="width: 80%">
<col style="width: 10%">
<col style="width: 40%">
<col style="width: 10%">
<col style="width: 40%">
</colgroup>
<tbody>
<tr>
<th><span class="">아이디</span></th>
<td><c:out value="${model.memId}"/></td>
<td colspan="3"><c:out value="${model.memId}"/></td>
</tr>
<tr>
<th><span class="">성명</span></th>
<td><c:out value="${model.memName}"/></td>
<th><span class="">소속</span></th>
<td><input type="text" id="memTeam" name ="memTeam" value="<c:out value='${model.memTeam}'/>"/></td>
</tr>
<tr>
<th><span class="">연락처</span></th>
<td><c:out value="${model.memCelnum}"/></td>
<td colspan="3"><c:out value="${model.memCelnum}"/></td>
</tr>
<tr>
<th><span class="">이메일</span></th>
<td><c:out value="${model.memEmail}"/></td>
<td colspan="3"><c:out value="${model.memEmail}"/></td>
</tr>
<tr>
<th><span class="">서명이미지</span></th>
<td class="upload_area">
<td class="upload_area" colspan="3">
<input type="file" id="file_temp" name="file_temp" class="uploadFile" style="display:none"/>
<button type="button" id="filebutton" class="btnType01 btn_add_file">파일 첨부하기</button>
<div class="file_wrap file_upload_box no_img_box">
@ -288,13 +294,13 @@
</tr>
<tr>
<th>차량번호</th>
<td>
<td colspan="3">
<c:out value='${empty model.memCarNo ? "-" : model.memCarNo}' />
</td>
</tr>
<tr>
<th>조정부</th>
<td>
<td colspan="3">
<c:forEach var="list" items="${list}" varStatus="status">
<button class="btnType01" onclick="fncGoDeptDetail('<c:out value='${list.memDeptSeq}' />'); return false;"><c:out value="${list.memDeptNm}"/></button>
</c:forEach>
@ -302,7 +308,7 @@
</tr>
<tr>
<th><span class="">위원임기</span></th>
<td>
<td colspan="3">
<div class="sel_date">
<input type="text" class="startDate01 inp" title="검색시작일" id="memTermSt" name="memTermSt" value="${model.memTermSt}" data-datecontrol="true" readonly>
<div class="calendar_in" id="calendarName_startDate" style="z-index: 9;">
@ -326,7 +332,7 @@
</tr>
<tr>
<th><span class="reqArea">승인여부</span></th>
<td><c:out value="${model.memApprYn eq 'Y' ? '승인' : '승인요청'}"/></td>
<td colspan="3"><c:out value="${model.memApprYn eq 'Y' ? '승인' : '승인요청'}"/></td>
</tr>
</tbody>
</table>

5
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmReg.jsp
View File

@ -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); }
});
}