diff --git a/src/main/java/cokr/xit/fims/sndb/SndbQuery.java b/src/main/java/cokr/xit/fims/sndb/SndbQuery.java index c9e19ff7..a147f0b6 100644 --- a/src/main/java/cokr/xit/fims/sndb/SndbQuery.java +++ b/src/main/java/cokr/xit/fims/sndb/SndbQuery.java @@ -59,6 +59,7 @@ public class SndbQuery extends CmmnQuery { private String rcpnRelNm2; private String rcpnRelNm3; private String rcpnRelNm4; + private String tnocs; // 총건수 // ETC private String callPurpose; // infoDialog 호출 용도(view 조회(편집불가), create 등록, update 수정, refresh 재조회). private String delRsn; // 삭제 사유 @@ -414,6 +415,15 @@ public class SndbQuery extends CmmnQuery { this.rcpnRelNm4 = rcpnRelNm4; return self(); } + + public String getTnocs() { + return ifEmpty(tnocs, () -> null); + } + + public T setTnocs(String tnocs) { + this.tnocs = tnocs; + return self(); + } // 동적 검색 조건 /////////////////////////////////////////////////////////////// // ETC ///////////////////////////////////////////////////////////////////// diff --git a/src/main/java/cokr/xit/fims/sndb/service/bean/SvbtcBean.java b/src/main/java/cokr/xit/fims/sndb/service/bean/SvbtcBean.java index 3e9e30fd..0992ab64 100644 --- a/src/main/java/cokr/xit/fims/sndb/service/bean/SvbtcBean.java +++ b/src/main/java/cokr/xit/fims/sndb/service/bean/SvbtcBean.java @@ -85,6 +85,8 @@ public class SvbtcBean extends AbstractComponent { svbtcInfo.set("SGG_CD", req.getSggCd()); // 시군구 코드 svbtcInfo.set("TASK_SE_CD", req.getTaskSeCd()); // 업무 구분 코드 svbtcInfo.set("SNDNG_SE_CD", req.getSndngSeCd()); // 발송 구분 코드 + svbtcInfo.set("TNOCS", req.getTnocs()); // 총건수 + } else { svbtcInfo = svbtcMapper.selectSvbtcInfo(req); } diff --git a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java index f88aa755..e21126ac 100644 --- a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java +++ b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java @@ -1459,9 +1459,16 @@ public class Sndb01Controller extends ApplicationController { ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sndb/sndb01260-info"); + // View(jsp)에서 사용할 공통코드를 조회 + Map> commonCodes = getCodesOf("FIM047", "FIM054"); + + addCodes(commonCodes, mav, "FIM047", "FIM054"); + return mav .addObject("pageName", "sndb01260") .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 + .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) + .addObject("sndbkQuery", json ? req : toJson(req)) // Query .addObject("svbtcInfo", json ? svbtcInfo : toJson(svbtcInfo)) // 공시송달 정보 ; } @@ -1474,7 +1481,7 @@ public class Sndb01Controller extends ApplicationController { * "saved": 수정되었으면 true, 그렇지 않으면 false * } */ - public ModelAndView createServiceByPublicNotice(Svbtc svbtc) { + public ModelAndView createServiceByPublicNotice(SndbQuery req, Svbtc svbtc) { boolean saved = false; String rtnMsg = sndngDtlService.createSvbtc(svbtc); diff --git a/src/main/java/cokr/xit/fims/task/web/DpvController.java b/src/main/java/cokr/xit/fims/task/web/DpvController.java index 22f1316d..64385c7f 100644 --- a/src/main/java/cokr/xit/fims/task/web/DpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/DpvController.java @@ -687,8 +687,8 @@ public class DpvController { @Override @RequestMapping(name="공시송달 등록", value=METHOD_URL.createServiceByPublicNotice) - public ModelAndView createServiceByPublicNotice(Svbtc svbtc) { - return super.createServiceByPublicNotice(svbtc); + public ModelAndView createServiceByPublicNotice(SndbQuery req, Svbtc svbtc) { + return super.createServiceByPublicNotice(req, svbtc); } @Override diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01100-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01100-info.jsp index cd4c8e1d..932b748b 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01100-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01100-info.jsp @@ -151,6 +151,7 @@ var ${pageName}Fields = new FimsFormFields("#frmEdit--${pageName}"); // main 의 검색 조건을 그대로 유지 var ${pageName}Query = ${query}; + /************************************************************************** * DatasetControl **************************************************************************/ 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 ccb86288..3294a4c3 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 @@ -159,7 +159,7 @@ - @@ -182,7 +182,6 @@