From 109c4dda7c857a1a4d8125633adaf9cd88a5d26a Mon Sep 17 00:00:00 2001 From: jjh Date: Wed, 20 Dec 2023 16:30:56 +0900 Subject: [PATCH] =?UTF-8?q?=EC=83=81=EC=84=B8=EA=B2=80=EC=83=89=20?= =?UTF-8?q?=EC=88=98=EC=A0=95.=20=20=20-=20=EC=82=AD=EC=A0=9C=20=20=20=20?= =?UTF-8?q?=20schDetailRegDtOpt=20=20=20=20=20schDetailRegDtFrom=20=20=20?= =?UTF-8?q?=20=20schDetailRegDtTo=20=20=20=20=20schDetailRgtrOpt=20=20=20?= =?UTF-8?q?=20=20schDetailRgtrNm=20=20=20=20=20schDetailRgtrCd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/fims/excl/CrdnReReg.java | 5 + .../java/cokr/xit/fims/excl/LevyExcl.java | 5 + .../cokr/xit/fims/excl/LevyExclQuery.java | 2 +- .../java/cokr/xit/fims/excl/OpnnSbmsn.java | 6 + .../java/cokr/xit/fims/levy/LevyQuery.java | 59 +------- .../java/cokr/xit/fims/sndb/SndbQuery.java | 61 +------- .../cokr/xit/fims/sprt/CvlcptDscsnQuery.java | 61 +------- .../xit/fims/stat/service/bean/StatBean.java | 22 +-- .../sql/mapper/fims/sndb/sndng-mapper.xml | 132 +++++++----------- .../WEB-INF/jsp/fims/excl/excl01010-main.jsp | 9 +- .../WEB-INF/jsp/fims/sndb/sndb01030-main.jsp | 15 +- .../WEB-INF/jsp/fims/sndb/sndb01070-main.jsp | 15 +- .../WEB-INF/jsp/fims/sndb/sndb01090-main.jsp | 15 +- .../WEB-INF/jsp/fims/sndb/sndb01230-main.jsp | 14 +- .../WEB-INF/jsp/fims/sndb/sndb01240-main.jsp | 14 +- .../WEB-INF/jsp/fims/sprt/sprt04010-main.jsp | 91 ++++++++---- 16 files changed, 193 insertions(+), 333 deletions(-) diff --git a/src/main/java/cokr/xit/fims/excl/CrdnReReg.java b/src/main/java/cokr/xit/fims/excl/CrdnReReg.java index 4f9ddfe0..83e36b58 100644 --- a/src/main/java/cokr/xit/fims/excl/CrdnReReg.java +++ b/src/main/java/cokr/xit/fims/excl/CrdnReReg.java @@ -54,4 +54,9 @@ public class CrdnReReg extends AbstractEntity { */ private String delRsn; + /** + * 재등록 IDs + */ + private String[] reRegIDs; + } diff --git a/src/main/java/cokr/xit/fims/excl/LevyExcl.java b/src/main/java/cokr/xit/fims/excl/LevyExcl.java index b9a2d822..fe25941c 100644 --- a/src/main/java/cokr/xit/fims/excl/LevyExcl.java +++ b/src/main/java/cokr/xit/fims/excl/LevyExcl.java @@ -62,4 +62,9 @@ public class LevyExcl extends AbstractEntity { */ private String delRsn; + /** + * 부과제외 IDs + */ + private String[] levyExclIDs; + } diff --git a/src/main/java/cokr/xit/fims/excl/LevyExclQuery.java b/src/main/java/cokr/xit/fims/excl/LevyExclQuery.java index fc3ae721..8c34b522 100644 --- a/src/main/java/cokr/xit/fims/excl/LevyExclQuery.java +++ b/src/main/java/cokr/xit/fims/excl/LevyExclQuery.java @@ -20,7 +20,7 @@ public class LevyExclQuery extends CmmnQuery { private String crdnId; // 단속 ID private String[] levyExclIDs; // 부과제외 IDs private String levyExclId; // 부과제외 ID - private String[] opnnIDs; // 의견제출 ID + private String[] opnnIDs; // 의견제출 IDs private String opnnId; // 의견제출 ID private String[] reRegIDs; // 재등록 IDs private String reRegId; // 재등록 ID diff --git a/src/main/java/cokr/xit/fims/excl/OpnnSbmsn.java b/src/main/java/cokr/xit/fims/excl/OpnnSbmsn.java index f577b8e5..71931b97 100644 --- a/src/main/java/cokr/xit/fims/excl/OpnnSbmsn.java +++ b/src/main/java/cokr/xit/fims/excl/OpnnSbmsn.java @@ -164,6 +164,11 @@ public class OpnnSbmsn extends AbstractEntity { */ private String delRsn; + /** + * 의견 IDs + */ + private String opnnIDs; + // 추가 ///////////////////////////////////////////////////////////////////// /** * 단속(TB_CRDN) - 의견 제출 여부 @@ -180,4 +185,5 @@ public class OpnnSbmsn extends AbstractEntity { */ private Integer rductAmt; + } diff --git a/src/main/java/cokr/xit/fims/levy/LevyQuery.java b/src/main/java/cokr/xit/fims/levy/LevyQuery.java index 2f9f041c..ebf34931 100644 --- a/src/main/java/cokr/xit/fims/levy/LevyQuery.java +++ b/src/main/java/cokr/xit/fims/levy/LevyQuery.java @@ -45,12 +45,7 @@ public class LevyQuery extends CmmnQuery { private String schRtpyrNo; // 납부자 번호 private String schRtpyrNm; // 납부자 명 // 상세 검색 조건 - private String schDetailRegDtOpt; // 상세 검색 등록 일자 구분 - private String schDetailRegDtFrom; // 상세 검색 등록 일자 시작 - private String schDetailRegDtTo; // 상세 검색 등록 일자 종료 - private String schDetailRgtrOpt; // 상세 검색 등록 사용자 구분 - private String schDetailRgtrNm; // 상세 검색 등록 사용자 명 - private String schDetailRgtrCd; // 상세 검색 등록 사용자 코드 + // ETC private String callPurpose; // infoDialog 호출 용도(view 조회(편집불가), create 등록, update 수정, refresh 재조회). private String delRsn; // 삭제 사유 @@ -308,59 +303,7 @@ public class LevyQuery extends CmmnQuery { // 검색 조건 ////////////////////////////////////////////////////////////////// // 상세 검색 조건 /////////////////////////////////////////////////////////////// - public String getSchDetailRegDtOpt() { - return ifEmpty(schDetailRegDtOpt, () -> null); - } - - public T setSchDetailRegDtOpt(String schDetailRegDtOpt) { - this.schDetailRegDtOpt = schDetailRegDtOpt; - return self(); - } - - public String getSchDetailRegDtFrom() { - return ifEmpty(schDetailRegDtFrom, () -> null); - } - - public T setSchDetailRegDtFrom(String schDetailRegDtFrom) { - this.schDetailRegDtFrom = schDetailRegDtFrom; - return self(); - } - - public String getSchDetailRegDtTo() { - return ifEmpty(schDetailRegDtTo, () -> null); - } - - public T setSchDetailRegDtTo(String schDetailRegDtTo) { - this.schDetailRegDtTo = schDetailRegDtTo; - return self(); - } - public String getSchDetailRgtrOpt() { - return ifEmpty(schDetailRgtrOpt, () -> null); - } - - public T setSchDetailRgtrOpt(String schDetailRgtrOpt) { - this.schDetailRgtrOpt = schDetailRgtrOpt; - return self(); - } - - public String getSchDetailRgtrNm() { - return ifEmpty(schDetailRgtrNm, () -> null); - } - - public T setSchDetailRgtrNm(String schDetailRgtrNm) { - this.schDetailRgtrNm = schDetailRgtrNm; - return self(); - } - - public String getSchDetailRgtrCd() { - return ifEmpty(schDetailRgtrCd, () -> null); - } - - public T setSchDetailRgtr(String schDetailRgtrCd) { - this.schDetailRgtrCd = schDetailRgtrCd; - return self(); - } // 상세 검색 조건 /////////////////////////////////////////////////////////////// // ETC //////////////////////////////////////////////////////////////////// diff --git a/src/main/java/cokr/xit/fims/sndb/SndbQuery.java b/src/main/java/cokr/xit/fims/sndb/SndbQuery.java index eb59e091..5bbd7c2b 100644 --- a/src/main/java/cokr/xit/fims/sndb/SndbQuery.java +++ b/src/main/java/cokr/xit/fims/sndb/SndbQuery.java @@ -43,12 +43,7 @@ public class SndbQuery extends CmmnQuery { private String schSndngSeCd; // 발송, 발송상세(TB_SNDNG_DTL)_발송 구분 코드 private String schChcRgIndct; // 선택 등기 표시 // 상세 검색 조건 - private String schDetailRegDtOpt; // 상세 검색 등록 일자 구분 - private String schDetailRegDtFrom; // 상세 검색 등록 일자 시작 - private String schDetailRegDtTo; // 상세 검색 등록 일자 종료 - private String schDetailRgtrOpt; // 상세 검색 등록 사용자 구분 - private String schDetailRgtrNm; // 상세 검색 등록 사용자 명 - private String schDetailRgtrCd; // 상세 검색 등록 사용자 코드 + // 동적 검색 조건 private String levyExclSeCd; // 부과제외_부과 제외 구분 코드 private String levyExclSeNm; // 부과제외_부과 제외 구분 명 @@ -291,60 +286,8 @@ public class SndbQuery extends CmmnQuery { } // 상세 검색 조건 /////////////////////////////////////////////////////////////// - public String getSchDetailRegDtOpt() { - return ifEmpty(schDetailRegDtOpt, () -> null); - } - - public T setSchDetailRegDtOpt(String schDetailRegDtOpt) { - this.schDetailRegDtOpt = schDetailRegDtOpt; - return self(); - } - - public String getSchDetailRegDtFrom() { - return ifEmpty(schDetailRegDtFrom, () -> null); - } - - public T setSchDetailRegDtFrom(String schDetailRegDtFrom) { - this.schDetailRegDtFrom = schDetailRegDtFrom; - return self(); - } - - public String getSchDetailRegDtTo() { - return ifEmpty(schDetailRegDtTo, () -> null); - } - - public T setSchDetailRegDtTo(String schDetailRegDtTo) { - this.schDetailRegDtTo = schDetailRegDtTo; - return self(); - } - public String getSchDetailRgtrOpt() { - return ifEmpty(schDetailRgtrOpt, () -> null); - } - - public T setSchDetailRgtrOpt(String schDetailRgtrOpt) { - this.schDetailRgtrOpt = schDetailRgtrOpt; - return self(); - } - - public String getSchDetailRgtrNm() { - return ifEmpty(schDetailRgtrNm, () -> null); - } - - public T setSchDetailRgtrNm(String schDetailRgtrNm) { - this.schDetailRgtrNm = schDetailRgtrNm; - return self(); - } - - public String getSchDetailRgtrCd() { - return ifEmpty(schDetailRgtrCd, () -> null); - } - - public T setSchDetailRgtr(String schDetailRgtrCd) { - this.schDetailRgtrCd = schDetailRgtrCd; - return self(); - } - // 상세검색 조건 /////////////////////////////////////////////////////////////// + // 상세 검색 조건 /////////////////////////////////////////////////////////////// // 동적 검색 조건 /////////////////////////////////////////////////////////////// public String getLevyExclSeNm() { diff --git a/src/main/java/cokr/xit/fims/sprt/CvlcptDscsnQuery.java b/src/main/java/cokr/xit/fims/sprt/CvlcptDscsnQuery.java index 4d523bda..80208b3b 100644 --- a/src/main/java/cokr/xit/fims/sprt/CvlcptDscsnQuery.java +++ b/src/main/java/cokr/xit/fims/sprt/CvlcptDscsnQuery.java @@ -27,14 +27,7 @@ public class CvlcptDscsnQuery extends CmmnQuery { private String schVhrno; // 차량번호 private String schCvlprNm; // 민원인 명 private String schRtpyrNo; // 납부자 번호 - // 상세 검색 조건 - private String schDetailRegDtOpt; // 상세 검색 등록 일자 구분 - private String schDetailRegDtFrom; // 상세 검색 등록 일자 시작 - private String schDetailRegDtTo; // 상세 검색 등록 일자 종료 - private String schDetailRgtrOpt; // 상세 검색 등록 사용자 구분 - private String schDetailRgtrNm; // 상세 검색 등록 사용자 명 - private String schDetailRgtrCd; // 상세 검색 등록 사용자 코드 // 동적 검색 조건 private String inquiryCondition; @@ -133,60 +126,8 @@ public class CvlcptDscsnQuery extends CmmnQuery { } // 상세 검색 조건 /////////////////////////////////////////////////////////////// - public String getSchDetailRegDtOpt() { - return ifEmpty(schDetailRegDtOpt, () -> null); - } - - public T setSchDetailRegDtOpt(String schDetailRegDtOpt) { - this.schDetailRegDtOpt = schDetailRegDtOpt; - return self(); - } - - public String getSchDetailRegDtFrom() { - return ifEmpty(schDetailRegDtFrom, () -> null); - } - - public T setSchDetailRegDtFrom(String schDetailRegDtFrom) { - this.schDetailRegDtFrom = schDetailRegDtFrom; - return self(); - } - - public String getSchDetailRegDtTo() { - return ifEmpty(schDetailRegDtTo, () -> null); - } - - public T setSchDetailRegDtTo(String schDetailRegDtTo) { - this.schDetailRegDtTo = schDetailRegDtTo; - return self(); - } - public String getSchDetailRgtrOpt() { - return ifEmpty(schDetailRgtrOpt, () -> null); - } - - public T setSchDetailRgtrOpt(String schDetailRgtrOpt) { - this.schDetailRgtrOpt = schDetailRgtrOpt; - return self(); - } - - public String getSchDetailRgtrNm() { - return ifEmpty(schDetailRgtrNm, () -> null); - } - - public T setSchDetailRgtrNm(String schDetailRgtrNm) { - this.schDetailRgtrNm = schDetailRgtrNm; - return self(); - } - - public String getSchDetailRgtrCd() { - return ifEmpty(schDetailRgtrCd, () -> null); - } - - public T setSchDetailRgtr(String schDetailRgtrCd) { - this.schDetailRgtrCd = schDetailRgtrCd; - return self(); - } - // 상세검색 조건 /////////////////////////////////////////////////////////////// + // 상세 검색 조건 /////////////////////////////////////////////////////////////// // 동적 검색 조건 /////////////////////////////////////////////////////////////// public String getInquiryCondition() { diff --git a/src/main/java/cokr/xit/fims/stat/service/bean/StatBean.java b/src/main/java/cokr/xit/fims/stat/service/bean/StatBean.java index 9eed5383..148f1cb5 100644 --- a/src/main/java/cokr/xit/fims/stat/service/bean/StatBean.java +++ b/src/main/java/cokr/xit/fims/stat/service/bean/StatBean.java @@ -48,22 +48,12 @@ public class StatBean extends AbstractComponent { try { if(dayCol.equals("REG_DT")) { - if(className.equals("SndbQuery") || className.equals("LevyExclQuery")) { - Method m0 = someQuery.getClass().getDeclaredMethod("setSchDetailRegDtOpt", String.class); - m0.invoke(someQuery, "regDt"); - Method m1 = someQuery.getClass().getDeclaredMethod("setSchDetailRegDtFrom", String.class); - m1.invoke(someQuery, from); - Method m2 = someQuery.getClass().getDeclaredMethod("setSchDetailRegDtTo", String.class); - m2.invoke(someQuery, to); - } else if(className.equals("CrdnQuery") || className.equals("CrdnSttsHstryQuery")) { - - Method m0 = CmmnQuery.class.getDeclaredMethod("setSchDateOpt", String.class); - m0.invoke(someQuery, "regDt"); - Method m1 = CmmnQuery.class.getDeclaredMethod("setSchDateFrom", String.class); - m1.invoke(someQuery, from); - Method m2 = CmmnQuery.class.getDeclaredMethod("setSchDateTo", String.class); - m2.invoke(someQuery, to); - } + Method m0 = CmmnQuery.class.getDeclaredMethod("setSchDateOpt", String.class); + m0.invoke(someQuery, "regDt"); + Method m1 = CmmnQuery.class.getDeclaredMethod("setSchDateFrom", String.class); + m1.invoke(someQuery, from); + Method m2 = CmmnQuery.class.getDeclaredMethod("setSchDateTo", String.class); + m2.invoke(someQuery, to); } else if(dayCol.equals("CRDN_YMD")) { diff --git a/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml b/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml index 7ab33be6..fdb36e72 100644 --- a/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml @@ -218,69 +218,35 @@ AND P.RTPYR_NM = #{schRtpyrNm} /* 납부자 명 */ AND C.DEL_YN = 'N' /* 삭제 여부 */ - - - - AND SUBSTR(LE.REG_DT,1,8) = ]]> #{schDetailRegDtFrom} /* 등록 일자 시작 */ + + + + AND LE.REG_DT =]]> CONCAT(#{schRegDateFrom},'000000') /* 등록 일자 시작 */ - - AND SUBSTR(LE.REG_DT,1,8) #{schDetailRegDtTo} /* 등록 일자 종료 */ + + AND LE.REG_DT CONCAT(#{schRegDateTo},'235959') /* 등록 일자 종료 */ - - - AND SUBSTR(LE.MDFCN_DT,1,8) =]]> #{schDetailRegDtFrom} /* 수정 일자 시작 */ - - - AND SUBSTR(LE.MDFCN_DT,1,8) #{schDetailRegDtTo} /* 수정 일자 종료 */ + + + AND LE.MDFCN_DT =]]> CONCAT(#{schRegDateFrom},'000000') /* 수정 일자 시작 */ - - - - - - - - AND LE.RGTR = #{schDetailRgtrCd} /* 등록자 코드 */ - - - - - AND LE.MDFR = #{schDetailRgtrCd} /* 수정자 코드 */ + + AND LE.MDFCN_DT CONCAT(#{schRegDateTo},'235959') /* 수정 일자 종료 */ - - - AND SUBSTR(C.REG_DT,1,8) =]]> #{schDetailCrdnRegDtFrom} /* 등록 일자 시작 */ - - - AND SUBSTR(C.REG_DT,1,8) #{schDetailCrdnRegDtTo} /* 등록 일자 종료 */ + + + AND LE.RGTR = #{schRgtrCd} /* 등록자 코드 */ - - - AND SUBSTR(C.MDFCN_DT,1,8) =]]> #{schDetailCrdnRegDtFrom} /* 수정 일자 시작 */ - - - AND SUBSTR(C.MDFCN_DT,1,8) #{schDetailCrdnRegDtTo} /* 수정 일자 종료 */ - - - - - - - - - AND C.RGTR = #{schDetailCrdnRgtrCd} /* 등록자 코드 */ - - - - - AND C.MDFR = #{schDetailCrdnRgtrCd} /* 수정자 코드 */ + + + AND LE.MDFR = #{schRgtrCd} /* 수정자 코드 */ @@ -408,34 +374,34 @@ AND S.SNDNG_SE_CD #{sndngSeCdTo} /* 발송 구분 코드 종료 */ - - - AND SUBSTR(S.REG_DT,1,8) = ]]> #{schDetailRegDtFrom} /* 등록 일자 시작 */ + + + AND S.REG_DT =]]> CONCAT(#{schRegDateFrom},'000000') /* 등록 일자 시작 */ - - AND SUBSTR(S.REG_DT,1,8) #{schDetailRegDtTo} /* 등록 일자 종료 */ + + AND S.REG_DT CONCAT(#{schRegDateTo},'235959') /* 등록 일자 종료 */ - - - AND SUBSTR(S.MDFCN_DT,1,8) = ]]> #{schDetailRegDtFrom} /* 수정 일자 시작 */ + + + AND S.MDFCN_DT =]]> CONCAT(#{schRegDateFrom},'000000') /* 수정 일자 시작 */ - - AND SUBSTR(S.MDFCN_DT,1,8) #{schDetailRegDtTo} /* 수정 일자 종료 */ + + AND S.MDFCN_DT CONCAT(#{schRegDateTo},'235959') /* 수정 일자 종료 */ - - - AND S.RGTR = #{schDetailRgtrCd} /* 등록자 코드 */ + + + AND S.RGTR = #{schRgtrCd} /* 등록자 코드 */ - - - AND S.MDFR = #{schDetailRgtrCd} /* 수정자 코드 */ + + + AND S.MDFR = #{schRgtrCd} /* 수정자 코드 */ @@ -1628,34 +1594,34 @@ AND C.DEL_YN = 'N' /* 단속 삭제 여부 */ - - - AND SUBSTR(SD.REG_DT,1,8) =]]> #{schDetailRegDtFrom} /* 등록 일자 시작 */ + + + AND SD.REG_DT =]]> CONCAT(#{schRegDateFrom},'000000') /* 등록 일자 시작 */ - - AND SUBSTR(SD.REG_DT,1,8) #{schDetailRegDtTo} /* 등록 일자 종료 */ + + AND SD.REG_DT CONCAT(#{schRegDateTo},'235959') /* 등록 일자 종료 */ - - - AND SUBSTR(SD.MDFCN_DT,1,8) =]]> #{schDetailRegDtFrom} /* 수정 일자 시작 */ + + + AND SD.MDFCN_DT =]]> CONCAT(#{schRegDateFrom},'000000') /* 수정 일자 시작 */ - - AND SUBSTR(SD.MDFCN_DT,1,8) #{schDetailRegDtTo} /* 수정 일자 종료 */ + + AND SD.MDFCN_DT CONCAT(#{schRegDateTo},'235959') /* 수정 일자 종료 */ - - - AND SD.RGTR = #{schDetailRgtrCd} /* 등록자 코드 */ + + + AND SD.RGTR = #{schRgtrCd} /* 등록자 코드 */ - - - AND SD.MDFR = #{schDetailRgtrCd} /* 수정자 코드 */ + + + AND SD.MDFR = #{schRgtrCd} /* 수정자 코드 */ diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp index 3412ce7c..67d25105 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp @@ -511,11 +511,10 @@ if (selected.length < 1) return; // 서버에 전송할 data(파라미터) 생성 - let params = { - callPurpose : "remove" // 호출 용도 - , delRsn : obj.reason // 삭제 사유 - }; + let params = {}; +debugger; params[${pageName}Control.prefixed("IDs")] = selected.join(","); // IDs + params.delRsn = obj.reason; // 삭제 사유 ${pageName}Control.remove(params); } @@ -683,7 +682,7 @@ // URL 설정 setURL${pageName} = (taskSeCd) => { ${pageName}Control.urls.load = wctx.url(taskSeCd + ${pageName}PrefixUrl + "/010/list.do"); // 조회 - ${pageName}Control.urls.remove = wctx.url(taskSeCd + ${pageName}PrefixUrl + "/010/removes.do"); // 삭제 + ${pageName}Control.urls.remove = wctx.url(taskSeCd + ${pageName}PrefixUrl + "/010/remove.do"); // 삭제 ${pageName}Control.urls.getInfo = wctx.url(taskSeCd + ${pageName}PrefixUrl + "/020/info.do"); // 수정 } diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01030-main.jsp index 16de10b6..0950fe42 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01030-main.jsp @@ -78,32 +78,37 @@ +
- - ~ -
- - + + +
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01070-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01070-main.jsp index 2fc37058..a682fdb4 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01070-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01070-main.jsp @@ -78,32 +78,37 @@ +
- - ~ -
- - + + +
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01090-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01090-main.jsp index 545f279e..4c747787 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01090-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01090-main.jsp @@ -78,32 +78,37 @@ +
- - ~ -
- - + + +
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01230-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01230-main.jsp index 10d02fb9..bc10d511 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01230-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01230-main.jsp @@ -114,27 +114,31 @@
- - ~ -
- - + + +
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01240-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01240-main.jsp index d03ec287..1ec85964 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01240-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01240-main.jsp @@ -100,27 +100,31 @@
- - ~ -
- - + + +
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt04010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt04010-main.jsp index 0d58f331..db3cf82d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt04010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt04010-main.jsp @@ -96,32 +96,34 @@ +
- - + ~ - +
- - + + @@ -392,7 +394,33 @@ /************************************************************************** * 사용자 함수(function) **************************************************************************/ - // 삭제 callback + // callback 사용자 검색 + callbackFindUser${pageName} = (userId, userNm) => { + $("#schRgtrCd--${pageName}").val(userId); // 사용자 ID + $("#schRgtrNm--${pageName}").val(userNm); // 사용자 명 + } + + // 사용자 검색 + getFindUser${pageName} = () => { + let params = { + callbackFuncName : "callbackFindUser${pageName}" + } + + ajax.get({ + url : wctx.url("/user/user02/010/main.do") + , data : params || {} + , success : resp => { + dialog.open({ + id : "userDialog" + , title : "사용자 검색" + , content : resp + , size : "lg" + }); + } + }); + } + + // callback 삭제 callbackRemove${pageName} = (obj) => { let selected = ${pageName}Control.dataset.getKeys("selected"); @@ -427,13 +455,13 @@ } // 초기 기본 설정 - initForm${pageName}(taskSeCd); + initForm${pageName}(); // URL 설정 setURL${pageName}(taskSeCd); // 기본 데이터 설정 - setFormData${pageName}(); + setFormData${pageName}(taskSeCd); } // 검색 버튼 이벤트 @@ -444,17 +472,30 @@ ${pageName}Control.query.fetchSize = ${pageName}Control.defaultFetchSize; // 한번에 조회되는 자료 건수 FETCH_XS = 30 ${pageName}Control.query.delYn = "N"; // 삭제 여부 - ${pageName}Control.load(); + ${pageName}Control.load(1); } // 엑셀 버튼 이벤트 fnExcel${pageName} = () => { + if (${pageName}Control.dataset.empty) { + dialog.alert({ + content : "검색된 자료가 없습니다." + , onOK : () => { } + }); + + return; + } + let headerInfo = $("#theadTr--${pageName} th").not(".dummy-th").not(":eq(0)").getHeaderInfo(); + + ${pageName}Control.query.excelTitle = headerInfo.excelTitle; + ${pageName}Control.query.excelTitleWidth = headerInfo.excelTitleWidth; + ${pageName}Control.download(); } // 사용자 조회 버튼 이벤트 fnFindUser${pageName} = () => { - + getFindUser${pageName}(); } // 수정 버튼 이벤트 @@ -531,13 +572,11 @@ fnMakeScrollableTable($("#table-responsive--${pageName}")[0], scrollDataList${pageName}); } - // 화면 초기값 셋팅 - initForm${pageName} = (taskSeCd) => { + // 화면 초기 설정 + initForm${pageName} = () => { // 화면 초기화 $("#frmSearch--${pageName}")[0].reset(); - // 업무 구분 코드 - $("#frmSearch--${pageName} input[name='taskSeCd'][value='" + taskSeCd + "']").prop("checked", true); // 최고 관리자 경우 업무구분을 선택할 수 있도록 하자. $("#frmSearch--${pageName} input[name='taskSeCd']").each(function(i) { $(this).prop("disabled", "true"); @@ -548,6 +587,9 @@ $("#schDscsnYmdFrom--${pageName}").datepicker("setDate", DateUtil.getDateDay(-1).date); $("#schDscsnYmdTo--${pageName}").datepicker("setDate", new Date()); + // 사용자 이름 + $("#schRgtrNm--${pageName}").prop("readonly", true); + // dataset 초기화 ${pageName}Control.dataset.clear(); } @@ -560,9 +602,13 @@ } // 기본 데이터 설정 - setFormData${pageName} = () => { + setFormData${pageName} = (taskSeCd) => { // ${pageName}Control 설정 - ${pageName}Control.defaultFetchSize = FETCH_XS; // 1 페이지당 조회되는 자료 건수 index.jsp에서 확인 FETCH_XS = 30 + ${pageName}Control.defaultFetchSize = FETCH_XS; // 1 페이지당 조회되는 자료 건수 index.jsp에서 확인 FETCH_XS = 30 + + // 화면 데이터 설정 + $("#sggCd--${pageName}").val("${sggCd}"); // 시군구 코드 + $("#frmSearch--${pageName} input[name='taskSeCd'][value='" + taskSeCd + "']").prop("checked", true); // 업무 구분 } /************************************************************************** @@ -572,18 +618,11 @@ // 이벤트 설정 setEvent${pageName}(); - // 시군구 코드 설정 - $("#sggCd--${pageName}").val("${sggCd}"); - - // 업무 구분 설정 - let defaultBizValue = $("#layout-navbar input[name='taskSeCd']:checked").val(); - $("#frmSearch--${pageName} input[name='taskSeCd'][value='" + defaultBizValue + "']").prop("checked", true); - // 보안모드 fn_securityModeToggle($("#securityMode--top").is(":checked")); // 화면 초기 설정 및 업무 구분 변경 - fnResetAndChangeBiz${pageName}(defaultBizValue); + fnResetAndChangeBiz${pageName}($("#layout-navbar input[name='taskSeCd']:checked").val()); });