From 0a7aee478415c734b89c9978ea5fa2d3cfbe67cc Mon Sep 17 00:00:00 2001 From: jjh Date: Tue, 24 Oct 2023 14:39:24 +0900 Subject: [PATCH] =?UTF-8?q?1.=20=EB=B6=80=EA=B3=BC=EC=A0=9C=EC=99=B8,=20?= =?UTF-8?q?=EC=9D=98=EA=B2=AC=EC=A0=9C=EC=B6=9C,=20=EB=8B=A8=EC=86=8D?= =?UTF-8?q?=EC=9E=AC=EB=93=B1=EB=A1=9D=20=EC=84=9C=EB=B9=84=EC=8A=A4,=20?= =?UTF-8?q?=EC=84=9C=EB=B9=84=EC=8A=A4=EB=B9=88,=20=EB=B9=88=20=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=20=EC=88=98=EC=A0=95.=202.=20=EC=8B=9C=EA=B5=B0?= =?UTF-8?q?=EA=B5=AC=EC=BD=94=EB=93=9C=20jsp=EC=97=90=20=EC=A0=84=EC=86=A1?= =?UTF-8?q?.=203.=20=EA=B8=B0=ED=83=80=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/crdn/service/bean/CrdnBean.java | 8 +- .../crdn/service/bean/CrdnServiceBean.java | 6 +- .../service/bean/CrdnCvlcptServiceBean.java | 6 +- .../{ExclQuery.java => LevyExclQuery.java} | 80 ++++++------ .../xit/fims/excl/dao/CrdnReRegMapper.java | 10 +- .../xit/fims/excl/dao/LevyExclMapper.java | 20 +-- .../xit/fims/excl/dao/OpnnSbmsnMapper.java | 12 +- ...cl03Service.java => CrdnReRegService.java} | 8 +- ...xcl01Service.java => LevyExclService.java} | 12 +- ...cl02Service.java => OpnnSbmsnService.java} | 12 +- .../{Excl03Bean.java => CrdnReRegBean.java} | 14 +- ...iceBean.java => CrdnReRegServiceBean.java} | 24 ++-- .../{Excl01Bean.java => LevyExclBean.java} | 26 ++-- ...viceBean.java => LevyExclServiceBean.java} | 36 +++--- .../{Excl02Bean.java => OpnnSbmsnBean.java} | 18 +-- ...iceBean.java => OpnnSbmsnServiceBean.java} | 38 +++--- .../xit/fims/excl/web/Excl01Controller.java | 36 +++--- .../xit/fims/excl/web/Excl02Controller.java | 42 +++--- .../xit/fims/excl/web/Excl03Controller.java | 24 ++-- .../xit/fims/sprt/web/Sprt02Controller.java | 22 ++-- .../cokr/xit/fims/task/web/BpvController.java | 18 +-- .../cokr/xit/fims/task/web/DpvController.java | 18 +-- .../cokr/xit/fims/task/web/EcaController.java | 18 +-- .../cokr/xit/fims/task/web/PvsController.java | 18 +-- .../sql/mapper/fims/excl/crdnReReg-mapper.xml | 10 +- .../sql/mapper/fims/excl/levyExcl-mapper.xml | 2 + .../sql/mapper/fims/excl/opnnSbmsn-mapper.xml | 2 + .../sql/mapper/fims/levy/levy-mapper.xml | 1 + .../WEB-INF/jsp/fims/excl/excl01010-main.jsp | 120 ++++++++++-------- .../WEB-INF/jsp/fims/excl/excl02010-main.jsp | 116 +++++++++-------- .../WEB-INF/jsp/fims/excl/excl03010-main.jsp | 109 +++++++++------- .../WEB-INF/jsp/fims/levy/levy01010-main.jsp | 22 ++-- 32 files changed, 484 insertions(+), 424 deletions(-) rename src/main/java/cokr/xit/fims/excl/{ExclQuery.java => LevyExclQuery.java} (75%) rename src/main/java/cokr/xit/fims/excl/service/{Excl03Service.java => CrdnReRegService.java} (86%) rename src/main/java/cokr/xit/fims/excl/service/{Excl01Service.java => LevyExclService.java} (87%) rename src/main/java/cokr/xit/fims/excl/service/{Excl02Service.java => OpnnSbmsnService.java} (88%) rename src/main/java/cokr/xit/fims/excl/service/bean/{Excl03Bean.java => CrdnReRegBean.java} (96%) rename src/main/java/cokr/xit/fims/excl/service/bean/{Excl03ServiceBean.java => CrdnReRegServiceBean.java} (56%) rename src/main/java/cokr/xit/fims/excl/service/bean/{Excl01Bean.java => LevyExclBean.java} (98%) rename src/main/java/cokr/xit/fims/excl/service/bean/{Excl01ServiceBean.java => LevyExclServiceBean.java} (66%) rename src/main/java/cokr/xit/fims/excl/service/bean/{Excl02Bean.java => OpnnSbmsnBean.java} (97%) rename src/main/java/cokr/xit/fims/excl/service/bean/{Excl02ServiceBean.java => OpnnSbmsnServiceBean.java} (65%) diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnBean.java index 80474217..6afacd9f 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnBean.java @@ -32,7 +32,7 @@ import cokr.xit.fims.crdn.dao.CrdnInstMapper; import cokr.xit.fims.crdn.dao.CrdnTeamMapper; import cokr.xit.fims.crdn.dao.CrdnUpdtMapper; import cokr.xit.fims.excl.LevyExcl; -import cokr.xit.fims.excl.service.bean.Excl01Bean; +import cokr.xit.fims.excl.service.bean.LevyExclBean; import cokr.xit.foundation.AbstractComponent; import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.data.DataObject; @@ -46,8 +46,8 @@ public class CrdnBean extends AbstractComponent { @Resource(name = "crdnStngBean") private CrdnStngBean crdnStngBean; - @Resource(name = "excl01Bean") - private Excl01Bean excl01Bean; + @Resource(name = "levyExclBean") + protected LevyExclBean levyExclBean; @Resource(name = "crdnSttsHstryBean") private CrdnSttsHstryBean crdnSttsHstryBean; @@ -137,7 +137,7 @@ public class CrdnBean extends AbstractComponent { excl01.setLevyExclRsnCd("192"); excl01.setEtcCn(""); - String retMessage = excl01Bean.createLevyExcl(excl01); + String retMessage = levyExclBean.createLevyExcl(excl01); if (retMessage.contains("[F]")) { throw new RuntimeException("단속자료 등록 중 부과제외 자료 등록에 실패하였습니다."); } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java index e5c1332f..e1827e74 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java @@ -24,7 +24,7 @@ import cokr.xit.fims.crdn.dao.ImportMapper; import cokr.xit.fims.crdn.service.CrdnService; import cokr.xit.fims.cvlc.dao.CrdnCvlcptMapper; import cokr.xit.fims.cvlc.service.bean.CrdnCvlcptMainBean; -import cokr.xit.fims.excl.service.bean.Excl01Bean; +import cokr.xit.fims.excl.service.bean.LevyExclBean; import cokr.xit.foundation.component.AbstractServiceBean; import cokr.xit.foundation.data.DataObject; @@ -67,8 +67,8 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService @Resource(name="crdnBean") protected CrdnBean crdnBean; - @Resource(name="excl01Bean") - protected Excl01Bean excl01Bean; + @Resource(name = "levyExclBean") + protected LevyExclBean levyExclBean; @Resource(name="crdnSttsHstryBean") protected CrdnSttsHstryBean crdnSttsHstryBean; diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java index 20b2f9a8..c12c0970 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java @@ -38,7 +38,7 @@ import cokr.xit.fims.cvlc.dao.AnswerWordsMapper; import cokr.xit.fims.cvlc.dao.CrdnCvlcptMapper; import cokr.xit.fims.cvlc.service.CrdnCvlcptService; import cokr.xit.fims.excl.dao.LevyExclMapper; -import cokr.xit.fims.excl.service.bean.Excl01Bean; +import cokr.xit.fims.excl.service.bean.LevyExclBean; import cokr.xit.fims.sprt.Sprt; import cokr.xit.foundation.component.AbstractServiceBean; import cokr.xit.foundation.data.DataObject; @@ -66,8 +66,8 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv @Resource(name="crdnStngBean") private CrdnStngBean crdnStngBean; - @Resource(name="excl01Bean") - private Excl01Bean excl01Bean; + @Resource(name = "levyExclBean") + protected LevyExclBean levyExclBean; @Resource(name="levyExclMapper") private LevyExclMapper levyExclMapper; diff --git a/src/main/java/cokr/xit/fims/excl/ExclQuery.java b/src/main/java/cokr/xit/fims/excl/LevyExclQuery.java similarity index 75% rename from src/main/java/cokr/xit/fims/excl/ExclQuery.java rename to src/main/java/cokr/xit/fims/excl/LevyExclQuery.java index 84912f20..9120e07c 100644 --- a/src/main/java/cokr/xit/fims/excl/ExclQuery.java +++ b/src/main/java/cokr/xit/fims/excl/LevyExclQuery.java @@ -12,7 +12,7 @@ import cokr.xit.fims.cmmn.CmmnQuery; * ================================ * */ -public class ExclQuery extends CmmnQuery { +public class LevyExclQuery extends CmmnQuery { private static final long serialVersionUID = 1L; @@ -65,7 +65,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(crdnId, () -> null); } - public T setCrdnId(String crdnId) { + public T setCrdnId(String crdnId) { this.crdnId = crdnId; return self(); @@ -75,7 +75,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(levyExclIDs, () -> null); } - public T setLevyExclIDs(String... levyExclIDs) { + public T setLevyExclIDs(String... levyExclIDs) { this.levyExclIDs = levyExclIDs; return self(); @@ -85,7 +85,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(levyExclId, () -> null); } - public T setLevyExclId(String levyExclId) { + public T setLevyExclId(String levyExclId) { this.levyExclId = levyExclId; return self(); @@ -95,7 +95,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(opnnIDs, () -> null); } - public T setOpnnIDs(String... opnnIDs) { + public T setOpnnIDs(String... opnnIDs) { this.opnnIDs = opnnIDs; return self(); @@ -105,7 +105,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(opnnId, () -> null); } - public T setOpnnId(String opnnId) { + public T setOpnnId(String opnnId) { this.opnnId = opnnId; return self(); @@ -115,7 +115,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(reRegIDs, () -> null); } - public T setReRegIDs(String... reRegIDs) { + public T setReRegIDs(String... reRegIDs) { this.reRegIDs = reRegIDs; return self(); @@ -125,7 +125,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(reRegId, () -> null); } - public T setReRegId(String reRegId) { + public T setReRegId(String reRegId) { this.reRegId = reRegId; return self(); @@ -135,7 +135,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(schTaskSeCd, () -> null); } - public T setSchTaskSeCd(String schTaskSeCd) { + public T setSchTaskSeCd(String schTaskSeCd) { this.schTaskSeCd = schTaskSeCd; return self(); @@ -145,7 +145,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(schLevyExclYmdFrom, () -> null); } - public T setSchLevyExclYmdFrom(String schLevyExclYmdFrom) { + public T setSchLevyExclYmdFrom(String schLevyExclYmdFrom) { this.schLevyExclYmdFrom = schLevyExclYmdFrom; return self(); @@ -155,7 +155,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(schLevyExclYmdTo, () -> null); } - public T setSchLevyExclYmdTo(String schLevyExclYmdTo) { + public T setSchLevyExclYmdTo(String schLevyExclYmdTo) { this.schLevyExclYmdTo = schLevyExclYmdTo; return self(); @@ -165,7 +165,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(schLevyExclSeCd, () -> null); } - public T setSchLevyExclSeCd(String schLevyExclSeCd) { + public T setSchLevyExclSeCd(String schLevyExclSeCd) { this.schLevyExclSeCd = schLevyExclSeCd; return self(); @@ -175,7 +175,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(schRcptYmdFrom, () -> null); } - public T setSchRcptYmdFrom(String schRcptYmdFrom) { + public T setSchRcptYmdFrom(String schRcptYmdFrom) { this.schRcptYmdFrom = schRcptYmdFrom; return self(); @@ -185,7 +185,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(schRcptYmdTo, () -> null); } - public T setSchRcptYmdTo(String schRcptYmdTo) { + public T setSchRcptYmdTo(String schRcptYmdTo) { this.schRcptYmdTo = schRcptYmdTo; return self(); @@ -195,7 +195,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(schAnsYmdFrom, () -> null); } - public T setSchAnsYmdFrom(String schAnsYmdFrom) { + public T setSchAnsYmdFrom(String schAnsYmdFrom) { this.schAnsYmdFrom = schAnsYmdFrom; return self(); @@ -205,7 +205,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(schAnsYmdTo, () -> null); } - public T setSchAnsYmdTo(String schAnsYmdTo) { + public T setSchAnsYmdTo(String schAnsYmdTo) { this.schAnsYmdTo = schAnsYmdTo; return self(); @@ -215,7 +215,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(schOpnnSbmsnSttsCd, () -> null); } - public T setSchOpnnSbmsnSttsCd(String schOpnnSbmsnSttsCd) { + public T setSchOpnnSbmsnSttsCd(String schOpnnSbmsnSttsCd) { this.schOpnnSbmsnSttsCd = schOpnnSbmsnSttsCd; return self(); @@ -225,7 +225,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(schSttrNm, () -> null); } - public T setSchSttrNm(String schSttrNm) { + public T setSchSttrNm(String schSttrNm) { this.schSttrNm = schSttrNm; return self(); @@ -235,7 +235,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(schReRegYmdFrom, () -> null); } - public T setSchReRegYmdFrom(String schReRegYmdFrom) { + public T setSchReRegYmdFrom(String schReRegYmdFrom) { this.schReRegYmdFrom = schReRegYmdFrom; return self(); @@ -245,7 +245,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(schReRegYmdTo, () -> null); } - public T setSchReRegYmdTo(String schReRegYmdTo) { + public T setSchReRegYmdTo(String schReRegYmdTo) { this.schReRegYmdTo = schReRegYmdTo; return self(); @@ -255,7 +255,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(schVhrno, () -> null); } - public T setSchVhrno(String schVhrno) { + public T setSchVhrno(String schVhrno) { this.schVhrno = schVhrno; return self(); @@ -265,7 +265,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(schRtpyrNm, () -> null); } - public T setSchRtpyrNm(String schRtpyrNm) { + public T setSchRtpyrNm(String schRtpyrNm) { this.schRtpyrNm = schRtpyrNm; return self(); @@ -275,7 +275,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(schCrdnYmdFrom, () -> null); } - public T setSchCrdnYmdFrom(String schCrdnYmdFrom) { + public T setSchCrdnYmdFrom(String schCrdnYmdFrom) { this.schCrdnYmdFrom = schCrdnYmdFrom; return self(); @@ -285,7 +285,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(schCrdnYmdTo, () -> null); } - public T setSchCrdnYmdTo(String schCrdnYmdTo) { + public T setSchCrdnYmdTo(String schCrdnYmdTo) { this.schCrdnYmdTo = schCrdnYmdTo; return self(); @@ -296,7 +296,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(schDetailRegDtOpt, () -> null); } - public T setSchDetailRegDtOpt(String schDetailRegDtOpt) { + public T setSchDetailRegDtOpt(String schDetailRegDtOpt) { this.schDetailRegDtOpt = schDetailRegDtOpt; return self(); } @@ -305,7 +305,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(schDetailRegDtFrom, () -> null); } - public T setSchDetailRegDtFrom(String schDetailRegDtFrom) { + public T setSchDetailRegDtFrom(String schDetailRegDtFrom) { this.schDetailRegDtFrom = schDetailRegDtFrom; return self(); } @@ -314,7 +314,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(schDetailRegDtTo, () -> null); } - public T setSchDetailRegDtTo(String schDetailRegDtTo) { + public T setSchDetailRegDtTo(String schDetailRegDtTo) { this.schDetailRegDtTo = schDetailRegDtTo; return self(); } @@ -323,7 +323,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(schDetailRgtrOpt, () -> null); } - public T setSchDetailRgtrOpt(String schDetailRgtrOpt) { + public T setSchDetailRgtrOpt(String schDetailRgtrOpt) { this.schDetailRgtrOpt = schDetailRgtrOpt; return self(); } @@ -332,7 +332,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(schDetailRgtrNm, () -> null); } - public T setSchDetailRgtrNm(String schDetailRgtrNm) { + public T setSchDetailRgtrNm(String schDetailRgtrNm) { this.schDetailRgtrNm = schDetailRgtrNm; return self(); } @@ -341,7 +341,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(schDetailRgtrCd, () -> null); } - public T setSchDetailRgtr(String schDetailRgtrCd) { + public T setSchDetailRgtr(String schDetailRgtrCd) { this.schDetailRgtrCd = schDetailRgtrCd; return self(); } @@ -352,7 +352,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(levyExclSeNm, () -> null); } - public T setLevyExclSeNm(String levyExclSeNm) { + public T setLevyExclSeNm(String levyExclSeNm) { this.levyExclSeNm = levyExclSeNm; return self(); @@ -362,7 +362,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(vhrno, () -> null); } - public T setVhrno(String vhrno) { + public T setVhrno(String vhrno) { this.vhrno = vhrno; return self(); @@ -372,7 +372,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(rtpyrNm, () -> null); } - public T setRtpyrNm(String rtpyrNm) { + public T setRtpyrNm(String rtpyrNm) { this.rtpyrNm = rtpyrNm; return self(); @@ -382,7 +382,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(levyExclSeCd, () -> null); } - public T setLevyExclSeCd(String levyExclSeCd) { + public T setLevyExclSeCd(String levyExclSeCd) { this.levyExclSeCd = levyExclSeCd; return self(); @@ -394,7 +394,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(callPurpose, () -> null); } - public T setCallPurpose(String callPurpose) { + public T setCallPurpose(String callPurpose) { this.callPurpose = callPurpose; return self(); @@ -404,7 +404,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(delYn, () -> null); } - public T setDelYn(String delYn) { + public T setDelYn(String delYn) { this.delYn = delYn; return self(); @@ -414,7 +414,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(delRsn, () -> null); } - public T setDelRsn(String delRsn) { + public T setDelRsn(String delRsn) { this.delRsn = delRsn; return self(); @@ -424,7 +424,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(crdnDelYn, () -> null); } - public T setCrdnDelYn(String crdnDelYn) { + public T setCrdnDelYn(String crdnDelYn) { this.crdnDelYn = crdnDelYn; return self(); @@ -434,7 +434,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(ansRsnCd, () -> null); } - public T setAnsRsnCd(String ansRsnCd) { + public T setAnsRsnCd(String ansRsnCd) { this.ansRsnCd = ansRsnCd; return self(); @@ -444,7 +444,7 @@ public class ExclQuery extends CmmnQuery { return ifEmpty(sndngRcvmtCd, () -> null); } - public T setSndngRcvmtCd(String sndngRcvmtCd) { + public T setSndngRcvmtCd(String sndngRcvmtCd) { this.sndngRcvmtCd = sndngRcvmtCd; return self(); diff --git a/src/main/java/cokr/xit/fims/excl/dao/CrdnReRegMapper.java b/src/main/java/cokr/xit/fims/excl/dao/CrdnReRegMapper.java index 7bb525b1..5998e337 100644 --- a/src/main/java/cokr/xit/fims/excl/dao/CrdnReRegMapper.java +++ b/src/main/java/cokr/xit/fims/excl/dao/CrdnReRegMapper.java @@ -6,7 +6,7 @@ import java.util.Map; import org.egovframe.rte.psl.dataaccess.mapper.Mapper; import cokr.xit.fims.excl.CrdnReReg; -import cokr.xit.fims.excl.ExclQuery; +import cokr.xit.fims.excl.LevyExclQuery; import cokr.xit.foundation.component.AbstractMapper; import cokr.xit.foundation.data.DataObject; @@ -27,13 +27,13 @@ public interface CrdnReRegMapper extends AbstractMapper { * @param req 단속 재등록 조회 조건 * @return 단속 재등록 목록 */ - List selectCrdnReRegList(ExclQuery req); + List selectCrdnReRegList(LevyExclQuery req); /**지정한 조건에 따라 단속 재등록 객체들을 반환한다. * @param req 단속 재등록 조회 조건 * @return 단속 재등록 객체 목록 */ - List selectCrdnReRegs(ExclQuery req); + List selectCrdnReRegs(LevyExclQuery req); /**단속 재등록 정보를 등록한다. * @param params 파라미터 @@ -79,10 +79,10 @@ public interface CrdnReRegMapper extends AbstractMapper { * @param crdnId 단속ID * @return 단속 대장 정보 */ - DataObject selectCrdn(ExclQuery req); + DataObject selectCrdn(LevyExclQuery req); default DataObject selectCrdnInfo(String crdnId) { - return selectCrdn(new ExclQuery().setCrdnId(crdnId)); + return selectCrdn(new LevyExclQuery().setCrdnId(crdnId)); } } diff --git a/src/main/java/cokr/xit/fims/excl/dao/LevyExclMapper.java b/src/main/java/cokr/xit/fims/excl/dao/LevyExclMapper.java index 37bfe3aa..9be7178f 100644 --- a/src/main/java/cokr/xit/fims/excl/dao/LevyExclMapper.java +++ b/src/main/java/cokr/xit/fims/excl/dao/LevyExclMapper.java @@ -9,7 +9,7 @@ import cokr.xit.fims.excl.LevyExcl; import cokr.xit.fims.sndb.SndngDtl; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.cvlc.CrdnCvlcpt; -import cokr.xit.fims.excl.ExclQuery; +import cokr.xit.fims.excl.LevyExclQuery; import cokr.xit.foundation.component.AbstractMapper; import cokr.xit.foundation.data.DataObject; @@ -30,19 +30,19 @@ public interface LevyExclMapper extends AbstractMapper { * @param req 부과제외 대장 조회 조건 * @return 부과제외 대장 목록 */ - List selectLevyExclList(ExclQuery req); + List selectLevyExclList(LevyExclQuery req); /**지정한 조건에 따라 부과제외 대장 객체들을 반환한다. * @param req 부과제외 조회 조건 * @return 부과제외 대장 객체 목록 */ - List selectLevyExcls(ExclQuery req); + List selectLevyExcls(LevyExclQuery req); /**지정한 조건에 따라 부과제외 대장 객체의 마지막 1개를 반환한다. * @param levyExclId 부과제외 ID * @return 부과제외 대장 객체 */ - default DataObject selectLevyExclInfo(ExclQuery req) { + default DataObject selectLevyExclInfo(LevyExclQuery req) { // 기본 정렬 if (req.getOrderBy() == null) { req.setOrderBy("LE.LEVY_EXCL_ID DESC"); @@ -100,10 +100,10 @@ public interface LevyExclMapper extends AbstractMapper { * @param crdnId 단속 ID * @return 단속, 부과제외 정보 */ - DataObject selectCrdn(ExclQuery req); + DataObject selectCrdn(LevyExclQuery req); default DataObject selectCrdnInfo(String crdnId) { - DataObject crdnInfo = selectCrdn(new ExclQuery().setCrdnId(crdnId)); + DataObject crdnInfo = selectCrdn(new LevyExclQuery().setCrdnId(crdnId)); return crdnInfo; } @@ -112,10 +112,10 @@ public interface LevyExclMapper extends AbstractMapper { * @param crdnId 단속 ID * @return 단속, 부과제외 정보 */ - DataObject selectCvlcptAnsWords(ExclQuery req); + DataObject selectCvlcptAnsWords(LevyExclQuery req); default DataObject selectCvlcptAnsWordsInfo(String ansRsnCd) { - DataObject cvlcptAnsWordsInfo = selectCvlcptAnsWords(new ExclQuery().setAnsRsnCd(ansRsnCd)); + DataObject cvlcptAnsWordsInfo = selectCvlcptAnsWords(new LevyExclQuery().setAnsRsnCd(ansRsnCd)); return cvlcptAnsWordsInfo; } @@ -154,10 +154,10 @@ public interface LevyExclMapper extends AbstractMapper { * @param crdnId 단속 ID * @return 단속, 부과제외 정보 */ - DataObject selectSndngDtl(ExclQuery req); + DataObject selectSndngDtl(LevyExclQuery req); default DataObject selectSndngDtlInfo(String crdnId, String sndngRcvmtCd) { - DataObject sndngDtlInfo = selectSndngDtl(new ExclQuery().setCrdnId(crdnId) + DataObject sndngDtlInfo = selectSndngDtl(new LevyExclQuery().setCrdnId(crdnId) .setSndngRcvmtCd(sndngRcvmtCd)); return sndngDtlInfo; diff --git a/src/main/java/cokr/xit/fims/excl/dao/OpnnSbmsnMapper.java b/src/main/java/cokr/xit/fims/excl/dao/OpnnSbmsnMapper.java index 5b8b259e..9d2e255b 100644 --- a/src/main/java/cokr/xit/fims/excl/dao/OpnnSbmsnMapper.java +++ b/src/main/java/cokr/xit/fims/excl/dao/OpnnSbmsnMapper.java @@ -7,7 +7,7 @@ import org.egovframe.rte.psl.dataaccess.mapper.Mapper; import cokr.xit.fims.excl.OpnnSbmsn; import cokr.xit.fims.crdn.Crdn; -import cokr.xit.fims.excl.ExclQuery; +import cokr.xit.fims.excl.LevyExclQuery; import cokr.xit.foundation.component.AbstractMapper; import cokr.xit.foundation.data.DataObject; @@ -28,19 +28,19 @@ public interface OpnnSbmsnMapper extends AbstractMapper { * @param req 의견제출 대장 조회 조건 * @return 의견제출 대장 목록 */ - List selectOpnnSbmsnList(ExclQuery req); + List selectOpnnSbmsnList(LevyExclQuery req); /**지정한 조건에 따라 의견제출 대장 객체들을 반환한다. * @param req 의견제출 대장 조회 조건 * @return 의견제출 대장 객체 목록 */ - List selectOpnnSbmsns(ExclQuery req); + List selectOpnnSbmsns(LevyExclQuery req); /**지정한 조건에 따라 의견제출 대장 객체의 마지막 1개를 반환한다. * @param opnnId 의견제출 ID * @return 의견제출 대장 객체 */ - default DataObject selectOpnnSbmsnInfo(ExclQuery req) { + default DataObject selectOpnnSbmsnInfo(LevyExclQuery req) { // 기본 정렬 if (req.getOrderBy() == null) { req.setOrderBy("OS.OPNN_ID DESC"); @@ -55,10 +55,10 @@ public interface OpnnSbmsnMapper extends AbstractMapper { * @param crdnId 단속 ID * @return 단속, 부과제외 정보 */ - DataObject selectCrdn(ExclQuery req); + DataObject selectCrdn(LevyExclQuery req); default DataObject selectCrdnInfo(String crdnId) { - DataObject crdnInfo = selectCrdn(new ExclQuery().setCrdnId(crdnId)); + DataObject crdnInfo = selectCrdn(new LevyExclQuery().setCrdnId(crdnId)); return crdnInfo; } diff --git a/src/main/java/cokr/xit/fims/excl/service/Excl03Service.java b/src/main/java/cokr/xit/fims/excl/service/CrdnReRegService.java similarity index 86% rename from src/main/java/cokr/xit/fims/excl/service/Excl03Service.java rename to src/main/java/cokr/xit/fims/excl/service/CrdnReRegService.java index 06f4eacd..412a6849 100644 --- a/src/main/java/cokr/xit/fims/excl/service/Excl03Service.java +++ b/src/main/java/cokr/xit/fims/excl/service/CrdnReRegService.java @@ -3,7 +3,7 @@ package cokr.xit.fims.excl.service; import java.util.List; import cokr.xit.fims.excl.CrdnReReg; -import cokr.xit.fims.excl.ExclQuery; +import cokr.xit.fims.excl.LevyExclQuery; import cokr.xit.foundation.data.DataObject; /**단속 재등록 관리 서비스 인터페이스. @@ -16,19 +16,19 @@ import cokr.xit.foundation.data.DataObject; * ================================ * */ -public interface Excl03Service { +public interface CrdnReRegService { /**지정한 조건에 따라 단속 재등록 목록을 조회하여 반환한다. * @param req 단속 재등록 조회 조건 * @return 단속 재등록 목록 */ - List getCrdnReRegList(ExclQuery req); + List getCrdnReRegList(LevyExclQuery req); /**지정한 조건에 따라 단속 재등록 객체들을 반환한다. * @param req 단속 재등록 조회 조건 * @return 단속 재등록 객체 목록 */ - List getCrdnReRegs(ExclQuery req); + List getCrdnReRegs(LevyExclQuery req); /**단속 재등록 정보를 등록한다. * @param excl03 단속 재등록 diff --git a/src/main/java/cokr/xit/fims/excl/service/Excl01Service.java b/src/main/java/cokr/xit/fims/excl/service/LevyExclService.java similarity index 87% rename from src/main/java/cokr/xit/fims/excl/service/Excl01Service.java rename to src/main/java/cokr/xit/fims/excl/service/LevyExclService.java index c976182f..c3b8c40c 100644 --- a/src/main/java/cokr/xit/fims/excl/service/Excl01Service.java +++ b/src/main/java/cokr/xit/fims/excl/service/LevyExclService.java @@ -3,7 +3,7 @@ package cokr.xit.fims.excl.service; import java.util.List; import cokr.xit.fims.excl.LevyExcl; -import cokr.xit.fims.excl.ExclQuery; +import cokr.xit.fims.excl.LevyExclQuery; import cokr.xit.foundation.data.DataObject; /**부과제외 대장 관리 서비스 인터페이스. @@ -16,25 +16,25 @@ import cokr.xit.foundation.data.DataObject; * ================================ * */ -public interface Excl01Service { +public interface LevyExclService { /**지정한 조건에 따라 부과제외 대장 목록을 조회하여 반환한다. * @param req 부과제외 대장 조회 조건 * @return 부과제외 대장 목록 */ - List getLevyExclList(ExclQuery req); + List getLevyExclList(LevyExclQuery req); /**지정한 조건에 따라 부과제외 대장 목록을 조회하여 반환한다. * @param req 부과제외 대장 조회 조건 * @return 부과제외 대장 목록 */ - List getLevyExcls(ExclQuery req); + List getLevyExcls(LevyExclQuery req); /**지정한 부과제외 ID의 부과제외 정보를 반환한다.
* @param levyExclId 부과 제외 ID * @return 부과제외 정보 */ - DataObject getLevyExclInfo(ExclQuery req); + DataObject getLevyExclInfo(LevyExclQuery req); /**부과제외 대장 정보를 등록한다. * @param levyExcl 부과제외 대장 @@ -70,6 +70,6 @@ public interface Excl01Service { *
  • 그렇지 않으면 false
    • * */ - String removeLevyExclList(ExclQuery req); + String removeLevyExclList(LevyExclQuery req); } diff --git a/src/main/java/cokr/xit/fims/excl/service/Excl02Service.java b/src/main/java/cokr/xit/fims/excl/service/OpnnSbmsnService.java similarity index 88% rename from src/main/java/cokr/xit/fims/excl/service/Excl02Service.java rename to src/main/java/cokr/xit/fims/excl/service/OpnnSbmsnService.java index acbf9d65..0e7258ae 100644 --- a/src/main/java/cokr/xit/fims/excl/service/Excl02Service.java +++ b/src/main/java/cokr/xit/fims/excl/service/OpnnSbmsnService.java @@ -4,7 +4,7 @@ import java.util.List; import cokr.xit.base.file.FileInfo; import cokr.xit.fims.excl.OpnnSbmsn; -import cokr.xit.fims.excl.ExclQuery; +import cokr.xit.fims.excl.LevyExclQuery; import cokr.xit.foundation.data.DataObject; /**의견제출 대장 관리 서비스 인터페이스. @@ -17,25 +17,25 @@ import cokr.xit.foundation.data.DataObject; * ================================ * */ -public interface Excl02Service { +public interface OpnnSbmsnService { /**지정한 조건에 따라 의견제출 대장 목록을 조회하여 반환한다. * @param req 의견제출 대장 조회 조건 * @return 의견제출 대장 목록 */ - List getOpnnSbmsnList(ExclQuery req); + List getOpnnSbmsnList(LevyExclQuery req); /**지정한 조건에 따라 의견제출 대장 객체들을 반환한다. * @param req 의견제출 대장 조회 조건 * @return 의견제출 대장 객체 목록 */ - List getOpnnSbmsns(ExclQuery req); + List getOpnnSbmsns(LevyExclQuery req); /**지정한 ID의 의견제출 정보를 반환한다.
    * @param opnnId 의견제출 ID * @return 의견제출 정보 */ - DataObject getOpnnSbmsnInfo(ExclQuery req); + DataObject getOpnnSbmsnInfo(LevyExclQuery req); /**의견제출 대장 정보를 등록한다. * @param opnnSbmsn 의견제출 대장 @@ -80,6 +80,6 @@ public interface Excl02Service { *
  • 그렇지 않으면 false
    • * */ - String removeOpnnSbmsnList(ExclQuery req); + String removeOpnnSbmsnList(LevyExclQuery req); } diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl03Bean.java b/src/main/java/cokr/xit/fims/excl/service/bean/CrdnReRegBean.java similarity index 96% rename from src/main/java/cokr/xit/fims/excl/service/bean/Excl03Bean.java rename to src/main/java/cokr/xit/fims/excl/service/bean/CrdnReRegBean.java index ab811957..76da118e 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl03Bean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/CrdnReRegBean.java @@ -15,7 +15,7 @@ import cokr.xit.base.file.web.FileInfoFactory; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.service.bean.CrdnBean; import cokr.xit.fims.excl.CrdnReReg; -import cokr.xit.fims.excl.ExclQuery; +import cokr.xit.fims.excl.LevyExclQuery; import cokr.xit.fims.excl.dao.CrdnReRegMapper; import cokr.xit.foundation.AbstractComponent; import cokr.xit.foundation.data.DataObject; @@ -30,8 +30,8 @@ import cokr.xit.foundation.data.DataObject; * ================================ * */ -@Component("excl03Bean") -public class Excl03Bean extends AbstractComponent { +@Component("crdnReRegBean") +public class CrdnReRegBean extends AbstractComponent { /** 단속 재등록 정보 DAO */ @Resource(name = "crdnReRegMapper") @@ -49,7 +49,7 @@ public class Excl03Bean extends AbstractComponent { * @param req 단속 재등록 조회 조건 * @return 단속 재등록 목록 */ - public List getCrdnReRegList(ExclQuery req) { + public List getCrdnReRegList(LevyExclQuery req) { if (req.getOrderBy() == null) { req.setOrderBy("REG_DT"); } @@ -61,7 +61,7 @@ public class Excl03Bean extends AbstractComponent { * @param req 단속 재등록 조회 조건 * @return 단속 재등록 객체 목록 */ - public List getCrdnReRegs(ExclQuery req) { + public List getCrdnReRegs(LevyExclQuery req) { if (req.getOrderBy() == null) { req.setOrderBy("CRR.REG_DT DESC, CRR.RE_REG_ID DESC"); } @@ -82,7 +82,7 @@ public class Excl03Bean extends AbstractComponent { String retMessage = "[F] "; // 처리 결과 메시지 // 단속 ID로 단속(TB_CRDN) 정보 조회 - ExclQuery req = new ExclQuery(); + LevyExclQuery req = new LevyExclQuery(); req.setCrdnId(crdnReReg.getBfrCrdnId()); @@ -204,7 +204,7 @@ public class Excl03Bean extends AbstractComponent { * @param req 부과제외 대장 조회 조건 * @return 부과제외 대장 목록 */ - public DataObject getCrdnInfo(ExclQuery req) { + public DataObject getCrdnInfo(LevyExclQuery req) { return crdnReRegMapper.selectCrdn(req); } diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl03ServiceBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/CrdnReRegServiceBean.java similarity index 56% rename from src/main/java/cokr/xit/fims/excl/service/bean/Excl03ServiceBean.java rename to src/main/java/cokr/xit/fims/excl/service/bean/CrdnReRegServiceBean.java index 94ce123f..92967638 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl03ServiceBean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/CrdnReRegServiceBean.java @@ -7,8 +7,8 @@ import javax.annotation.Resource; import org.springframework.stereotype.Service; import cokr.xit.fims.excl.CrdnReReg; -import cokr.xit.fims.excl.ExclQuery; -import cokr.xit.fims.excl.service.Excl03Service; +import cokr.xit.fims.excl.LevyExclQuery; +import cokr.xit.fims.excl.service.CrdnReRegService; import cokr.xit.foundation.component.AbstractServiceBean; import cokr.xit.foundation.data.DataObject; @@ -22,31 +22,31 @@ import cokr.xit.foundation.data.DataObject; * ================================ * */ -@Service("excl03Service") -public class Excl03ServiceBean extends AbstractServiceBean implements Excl03Service { +@Service("crdnReRegService") +public class CrdnReRegServiceBean extends AbstractServiceBean implements CrdnReRegService { /** 단속 재등록 정보 Bean */ - @Resource(name = "excl03Bean") - private Excl03Bean excl03Bean; + @Resource(name = "crdnReRegBean") + private CrdnReRegBean crdnReRegBean; @Override - public List getCrdnReRegList(ExclQuery req) { - return excl03Bean.getCrdnReRegList(req); + public List getCrdnReRegList(LevyExclQuery req) { + return crdnReRegBean.getCrdnReRegList(req); } @Override - public List getCrdnReRegs(ExclQuery req) { - return excl03Bean.getCrdnReRegs(req); + public List getCrdnReRegs(LevyExclQuery req) { + return crdnReRegBean.getCrdnReRegs(req); } @Override public String createCrdnReReg(CrdnReReg crdnReReg) { - return excl03Bean.createCrdnReReg(crdnReReg); + return crdnReRegBean.createCrdnReReg(crdnReReg); } @Override public boolean removeCrdnReReg(CrdnReReg crdnReReg) { - return excl03Bean.removeCrdnReReg(crdnReReg); + return crdnReRegBean.removeCrdnReReg(crdnReReg); } } diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01Bean.java b/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclBean.java similarity index 98% rename from src/main/java/cokr/xit/fims/excl/service/bean/Excl01Bean.java rename to src/main/java/cokr/xit/fims/excl/service/bean/LevyExclBean.java index be51e082..695054c9 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01Bean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclBean.java @@ -6,11 +6,11 @@ import javax.annotation.Resource; import org.springframework.stereotype.Component; -import cokr.xit.fims.excl.LevyExcl; import cokr.xit.fims.cmmn.CrdnSttsHstry; import cokr.xit.fims.cmmn.service.bean.CrdnSttsHstryBean; import cokr.xit.fims.crdn.Crdn; -import cokr.xit.fims.excl.ExclQuery; +import cokr.xit.fims.excl.LevyExclQuery; +import cokr.xit.fims.excl.LevyExcl; import cokr.xit.fims.excl.dao.LevyExclMapper; import cokr.xit.foundation.AbstractComponent; import cokr.xit.foundation.data.DataObject; @@ -25,8 +25,8 @@ import cokr.xit.foundation.data.DataObject; * ================================ * */ -@Component("excl01Bean") -public class Excl01Bean extends AbstractComponent { +@Component("levyExclBean") +public class LevyExclBean extends AbstractComponent { /** 부과제외 대장 정보 DAO */ @Resource(name = "levyExclMapper") @@ -40,11 +40,7 @@ public class Excl01Bean extends AbstractComponent { * @param req 부과제외 조회 조건 * @return 부과제외 대장 목록 */ - public List getLevyExclList(ExclQuery req) { - if (req.getOrderBy() == null) { - req.setOrderBy("REG_DT"); - } - + public List getLevyExclList(LevyExclQuery req) { return levyExclMapper.selectLevyExclList(req); } @@ -52,9 +48,9 @@ public class Excl01Bean extends AbstractComponent { * @param req 부과제외 조회 조건 * @return 부과제외 객체 목록 */ - public List getLevyExcls(ExclQuery req) { + public List getLevyExcls(LevyExclQuery req) { if (req.getOrderBy() == null) { - req.setOrderBy("LE.REG_DT DESC, LE.LEVY_EXCL_ID DESC"); + req.setOrderBy("LE.REG_DT"); } return levyExclMapper.selectLevyExcls(req); @@ -64,7 +60,7 @@ public class Excl01Bean extends AbstractComponent { * @param req 부과제외 조회 조건 * @return 부과제외 정보 */ - public DataObject getLevyExclInfo(ExclQuery req) { + public DataObject getLevyExclInfo(LevyExclQuery req) { return levyExclMapper.selectLevyExclInfo(req); } @@ -72,7 +68,7 @@ public class Excl01Bean extends AbstractComponent { * @param crndId 단속 ID * @return 단속 정보 */ - public DataObject getCrdnInfo(ExclQuery req) { + public DataObject getCrdnInfo(LevyExclQuery req) { DataObject dataCrdn = levyExclMapper.selectCrdn(req); // 단속 조회 if (req.getCallPurpose().equals("create")) { @@ -206,12 +202,12 @@ public class Excl01Bean extends AbstractComponent { String newHstrySttsCd = ""; // 신규 상태 코드 // 단속 ID로 단속, 부과제외 정보 조회 - ExclQuery req = new ExclQuery(); + LevyExclQuery req = new LevyExclQuery(); req.setLevyExclId(levyExcl.getLevyExclId()); req.setDelYn("N"); - DataObject infoCrdnLevyExcl = levyExclMapper.selectCrdn(req); + DataObject infoCrdnLevyExcl = levyExclMapper.selectLevyExclInfo(req); // 부과제외 ID가 조회되지 않았다면 종료.. if (infoCrdnLevyExcl.string("LEVY_EXCL_ID").equals("")) { diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclServiceBean.java similarity index 66% rename from src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java rename to src/main/java/cokr/xit/fims/excl/service/bean/LevyExclServiceBean.java index 841b0010..9167e4af 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclServiceBean.java @@ -7,8 +7,8 @@ import javax.annotation.Resource; import org.springframework.stereotype.Service; import cokr.xit.fims.excl.LevyExcl; -import cokr.xit.fims.excl.ExclQuery; -import cokr.xit.fims.excl.service.Excl01Service; +import cokr.xit.fims.excl.LevyExclQuery; +import cokr.xit.fims.excl.service.LevyExclService; import cokr.xit.foundation.component.AbstractServiceBean; import cokr.xit.foundation.data.DataObject; @@ -22,53 +22,53 @@ import cokr.xit.foundation.data.DataObject; * ================================ * */ -@Service("excl01Service") -public class Excl01ServiceBean extends AbstractServiceBean implements Excl01Service { +@Service("levyExclService") +public class LevyExclServiceBean extends AbstractServiceBean implements LevyExclService { /* 부과제외 대장 정보 Bean */ - @Resource(name = "excl01Bean") - protected Excl01Bean excl01Bean; + @Resource(name = "levyExclBean") + protected LevyExclBean levyExclBean; @Override - public List getLevyExclList(ExclQuery req) { - return excl01Bean.getLevyExclList(req); + public List getLevyExclList(LevyExclQuery req) { + return levyExclBean.getLevyExclList(req); } @Override - public List getLevyExcls(ExclQuery req) { - return excl01Bean.getLevyExcls(req); + public List getLevyExcls(LevyExclQuery req) { + return levyExclBean.getLevyExcls(req); } @Override - public DataObject getLevyExclInfo(ExclQuery req) { + public DataObject getLevyExclInfo(LevyExclQuery req) { if (req.getCallPurpose() == null) { req.setCallPurpose("view"); } if (req.getCallPurpose().equals("create")) { - return excl01Bean.getCrdnInfo(req); + return levyExclBean.getCrdnInfo(req); } else { - return excl01Bean.getLevyExclInfo(req); + return levyExclBean.getLevyExclInfo(req); } } @Override public String createLevyExcl(LevyExcl levyExcl) { - return excl01Bean.createLevyExcl(levyExcl); + return levyExclBean.createLevyExcl(levyExcl); } @Override public String updateLevyExcl(LevyExcl levyExcl) { - return excl01Bean.updateLevyExcl(levyExcl); + return levyExclBean.updateLevyExcl(levyExcl); } @Override public String removeLevyExcl(LevyExcl levyExcl) { - return excl01Bean.removeLevyExcl(levyExcl); + return levyExclBean.removeLevyExcl(levyExcl); } @Override - public String removeLevyExclList(ExclQuery req) { + public String removeLevyExclList(LevyExclQuery req) { // 변수 선언 String retMessage = ""; // 처리 결과 메시지 @@ -86,7 +86,7 @@ public class Excl01ServiceBean extends AbstractServiceBean implements Excl01Serv levyExcl.setDelRsn(req.getDelRsn()); // 삭제 사유 // 부과제외 삭제 호출 - retMessage = excl01Bean.removeLevyExcl(levyExcl); + retMessage = levyExclBean.removeLevyExcl(levyExcl); // 오류가 발생하였으면 종료.. if (retMessage.contains("[F]")) { return retMessage; diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl02Bean.java b/src/main/java/cokr/xit/fims/excl/service/bean/OpnnSbmsnBean.java similarity index 97% rename from src/main/java/cokr/xit/fims/excl/service/bean/Excl02Bean.java rename to src/main/java/cokr/xit/fims/excl/service/bean/OpnnSbmsnBean.java index 0bae7c09..3f9ef699 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl02Bean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/OpnnSbmsnBean.java @@ -13,7 +13,7 @@ import cokr.xit.base.file.service.bean.FileBean; import cokr.xit.fims.cmmn.CrdnSttsHstry; import cokr.xit.fims.cmmn.service.bean.CrdnSttsHstryBean; import cokr.xit.fims.crdn.Crdn; -import cokr.xit.fims.excl.ExclQuery; +import cokr.xit.fims.excl.LevyExclQuery; import cokr.xit.fims.excl.dao.OpnnSbmsnMapper; import cokr.xit.fims.levy.Rduct; import cokr.xit.fims.levy.service.bean.RductBean; @@ -30,8 +30,8 @@ import cokr.xit.foundation.data.DataObject; * ================================ * */ -@Component("excl02Bean") -public class Excl02Bean extends AbstractComponent { +@Component("opnnSbmsnBean") +public class OpnnSbmsnBean extends AbstractComponent { /** 의견제출 대장 정보 DAO */ @Resource(name = "opnnSbmsnMapper") @@ -53,7 +53,7 @@ public class Excl02Bean extends AbstractComponent { * @param req 의견제출 대장 조회 조건 * @return 의견제출 대장 목록 */ - public List getOpnnSbmsnList(ExclQuery req) { + public List getOpnnSbmsnList(LevyExclQuery req) { if (req.getOrderBy() == null) { req.setOrderBy("REG_DT"); } @@ -65,7 +65,7 @@ public class Excl02Bean extends AbstractComponent { * @param req 의견제출 대장 조회 조건 * @return 의견제출 대장 객체 목록 */ - public List getOpnnSbmsns(ExclQuery req) { + public List getOpnnSbmsns(LevyExclQuery req) { if (req.getOrderBy() == null) { req.setOrderBy("OS.REG_DT DESC, OS.OPNN_ID DESC"); } @@ -77,7 +77,7 @@ public class Excl02Bean extends AbstractComponent { * @param opnnId 의견제출 ID * @return 의견제출 정보 */ - public DataObject getOpnnSbmsnInfo(ExclQuery req) { + public DataObject getOpnnSbmsnInfo(LevyExclQuery req) { return opnnSbmsnMapper.selectOpnnSbmsnInfo(req); } @@ -85,7 +85,7 @@ public class Excl02Bean extends AbstractComponent { * @param crndId 단속 ID * @return 단속 정보 */ - public DataObject getCrdnInfo(ExclQuery req) { + public DataObject getCrdnInfo(LevyExclQuery req) { DataObject dataCrdn = opnnSbmsnMapper.selectCrdn(req); // 단속ID로 단속, 의견제출 조회 if (req.getCallPurpose().equals("create")) { @@ -237,7 +237,7 @@ public class Excl02Bean extends AbstractComponent { String newCrdnSttsCd = ""; // 신규 단속 상태 코드(CRDN_STTS_CD) // 의견제출(TB_OPNN_SBMSN) 자료 조회 - ExclQuery exclQuery = new ExclQuery(); + LevyExclQuery exclQuery = new LevyExclQuery(); exclQuery.setOpnnId(opnnSbmsn.getOpnnId()); exclQuery.setDelYn("N"); @@ -358,7 +358,7 @@ public class Excl02Bean extends AbstractComponent { String retMessage = "[F] "; // 처리 결과 메시지 // 의견제출(TB_OPNN_SBMSN) 자료 조회 - ExclQuery exclQuery = new ExclQuery(); + LevyExclQuery exclQuery = new LevyExclQuery(); exclQuery.setOpnnId(opnnSbmsn.getOpnnId()); exclQuery.setDelYn("N"); diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl02ServiceBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/OpnnSbmsnServiceBean.java similarity index 65% rename from src/main/java/cokr/xit/fims/excl/service/bean/Excl02ServiceBean.java rename to src/main/java/cokr/xit/fims/excl/service/bean/OpnnSbmsnServiceBean.java index f99be3f7..0f650578 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl02ServiceBean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/OpnnSbmsnServiceBean.java @@ -8,8 +8,8 @@ import org.springframework.stereotype.Service; import cokr.xit.base.file.FileInfo; import cokr.xit.fims.excl.OpnnSbmsn; -import cokr.xit.fims.excl.ExclQuery; -import cokr.xit.fims.excl.service.Excl02Service; +import cokr.xit.fims.excl.LevyExclQuery; +import cokr.xit.fims.excl.service.OpnnSbmsnService; import cokr.xit.foundation.component.AbstractServiceBean; import cokr.xit.foundation.data.DataObject; @@ -23,58 +23,58 @@ import cokr.xit.foundation.data.DataObject; * ================================ * */ -@Service("excl02Service") -public class Excl02ServiceBean extends AbstractServiceBean implements Excl02Service { +@Service("opnnSbmsnService") +public class OpnnSbmsnServiceBean extends AbstractServiceBean implements OpnnSbmsnService { /* 의견제출 대장 정보 Bean */ - @Resource(name = "excl02Bean") - protected Excl02Bean excl02Bean; + @Resource(name = "opnnSbmsnBean") + protected OpnnSbmsnBean opnnSbmsnBean; @Override - public List getOpnnSbmsnList(ExclQuery req) { - return excl02Bean.getOpnnSbmsnList(req); + public List getOpnnSbmsnList(LevyExclQuery req) { + return opnnSbmsnBean.getOpnnSbmsnList(req); } @Override - public List getOpnnSbmsns(ExclQuery req) { - return excl02Bean.getOpnnSbmsns(req); + public List getOpnnSbmsns(LevyExclQuery req) { + return opnnSbmsnBean.getOpnnSbmsns(req); } @Override - public DataObject getOpnnSbmsnInfo(ExclQuery req) { + public DataObject getOpnnSbmsnInfo(LevyExclQuery req) { if (req.getCallPurpose() == null) { req.setCallPurpose("view"); } if (req.getCallPurpose().equals("create")) { - return excl02Bean.getCrdnInfo(req); + return opnnSbmsnBean.getCrdnInfo(req); } else { - return excl02Bean.getOpnnSbmsnInfo(req); + return opnnSbmsnBean.getOpnnSbmsnInfo(req); } } @Override public String createOpnnSbmsn(OpnnSbmsn opnnSbmsn, List fileInfoList) { - return excl02Bean.createOpnnSbmsn(opnnSbmsn, fileInfoList); + return opnnSbmsnBean.createOpnnSbmsn(opnnSbmsn, fileInfoList); } @Override public String updateOpnnSbmsn(OpnnSbmsn opnnSbmsn, List fileInfoList) { - return excl02Bean.updateOpnnSbmsn(opnnSbmsn, fileInfoList); + return opnnSbmsnBean.updateOpnnSbmsn(opnnSbmsn, fileInfoList); } @Override public String updateOpnnSbmsnAnswer(OpnnSbmsn opnnSbmsn) { - return excl02Bean.updateOpnnSbmsnAnswer(opnnSbmsn); + return opnnSbmsnBean.updateOpnnSbmsnAnswer(opnnSbmsn); } @Override public String removeOpnnSbmsn(OpnnSbmsn opnnSbmsn) { - return excl02Bean.removeOpnnSbmsn(opnnSbmsn); + return opnnSbmsnBean.removeOpnnSbmsn(opnnSbmsn); } @Override - public String removeOpnnSbmsnList(ExclQuery req) { + public String removeOpnnSbmsnList(LevyExclQuery req) { // 변수 선언 String retMessage = ""; // 처리 결과 메시지 @@ -92,7 +92,7 @@ public class Excl02ServiceBean extends AbstractServiceBean implements Excl02Serv opnnSbmsn.setDelRsn(req.getDelRsn()); // 삭제 사유 // 부과제외 삭제 호출 - retMessage = excl02Bean.removeOpnnSbmsn(opnnSbmsn); + retMessage = opnnSbmsnBean.removeOpnnSbmsn(opnnSbmsn); // 오류가 발생하였으면 종료.. if (retMessage.contains("[F]")) { return retMessage; diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java index 725e155e..26ca61d4 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java @@ -8,10 +8,11 @@ import javax.annotation.Resource; import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.CommonCode; +import cokr.xit.base.user.ManagedUser; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.excl.LevyExcl; -import cokr.xit.fims.excl.ExclQuery; -import cokr.xit.fims.excl.service.Excl01Service; +import cokr.xit.fims.excl.LevyExclQuery; +import cokr.xit.fims.excl.service.LevyExclService; import cokr.xit.foundation.data.DataObject; /**부과제외 대장 서비스의 웹 컨트롤러 @@ -41,8 +42,8 @@ public class Excl01Controller extends ApplicationController { } /** 부과제외 대장 서비스 */ - @Resource(name = "excl01Service") - protected Excl01Service excl01Service; + @Resource(name = "levyExclService") + protected LevyExclService levyExclService; /**부과제외 관리 메인화면(fims/excl/excl01/010-main)을 연다. * @@ -51,6 +52,9 @@ public class Excl01Controller extends ApplicationController { public ModelAndView levyExclusionMain() { ModelAndView mav = new ModelAndView("fims/excl/excl01010-main"); + // 사용자 정보 + ManagedUser managedUser = (ManagedUser)currentUser().getUser(); + // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM021", "FIM022", "FIM054"); @@ -58,13 +62,15 @@ public class Excl01Controller extends ApplicationController { return mav.addObject("pageName", "excl01010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "levyExcl") // prefix - .addObject("FIM021List", commonCodes.get("FIM021")) // + .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("FIM021List", commonCodes.get("FIM021")) // 부과 제외 구분 코드(LEVY_EXCL_SE_CD) + .addObject("FIM022List", commonCodes.get("FIM022")) // 부과 제외 사유 코드(LEVY_EXCL_RSN_CD) .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) ; } /**부과제외 관리 목록을 조회하여 반환한다.
    - * {@link LevyExclService#getLevyExclList(ExclQuery)} 참고 + * {@link LevyExclService#getLevyExclList(LevyExclQuery)} 참고 * @param req 부과제외 대장 조회 조건 * @return jsonView * 
     {
@@ -74,8 +80,8 @@ public class Excl01Controller extends ApplicationController {
 	 *     "levyExclTotal": 조회 결과 찾은 전체 부과제외 대장 수
 	 * }
    */ - public ModelAndView getLevyExclList(ExclQuery req) { - List result = excl01Service.getLevyExclList(setFetchSize(req)); + public ModelAndView getLevyExclList(LevyExclQuery req) { + List result = levyExclService.getLevyExclList(setFetchSize(req)); return setCollectionInfo(new ModelAndView("jsonView"), result, "levyExcl"); } @@ -90,7 +96,7 @@ public class Excl01Controller extends ApplicationController { */ public ModelAndView removeLevyExcl(LevyExcl levyExcl) { boolean saved = false; - String retMessage = excl01Service.removeLevyExcl(levyExcl); + String retMessage = levyExclService.removeLevyExcl(levyExcl); if (retMessage.contains("[S]")) { saved = true; @@ -111,9 +117,9 @@ public class Excl01Controller extends ApplicationController { * "saved": 저장되었으면 true, 그렇지 않으면 false * } */ - public ModelAndView removeLevyExclList(ExclQuery req) { + public ModelAndView removeLevyExclList(LevyExclQuery req) { boolean saved = false; - String retMessage = excl01Service.removeLevyExclList(req); + String retMessage = levyExclService.removeLevyExclList(req); if (retMessage.contains("[S]")) { saved = true; @@ -133,8 +139,8 @@ public class Excl01Controller extends ApplicationController { * "levyExclInfo": 부과제외 정보 * } */ - public ModelAndView getLevyExclInfo(String saveCallbackFuncName, String savedCallbackFuncName, ExclQuery req) { - DataObject levyExclInfo = excl01Service.getLevyExclInfo(req); + public ModelAndView getLevyExclInfo(String saveCallbackFuncName, String savedCallbackFuncName, LevyExclQuery req) { + DataObject levyExclInfo = levyExclService.getLevyExclInfo(req); // 등록을 호출하였지만 등록된 부과제외 ID가 있는지 확인. if (req.getCallPurpose().equals("create") && !levyExclInfo.string("LEVY_EXCL_ID").equals("")) { @@ -175,7 +181,7 @@ public class Excl01Controller extends ApplicationController { */ public ModelAndView createLevyExcl(LevyExcl levyExcl) { boolean saved = false; - String retMessage = excl01Service.createLevyExcl(levyExcl); + String retMessage = levyExclService.createLevyExcl(levyExcl); if (retMessage.contains("[S]")) { saved = true; @@ -197,7 +203,7 @@ public class Excl01Controller extends ApplicationController { */ public ModelAndView updateLevyExcl(LevyExcl levyExcl) { boolean saved = false; - String retMessage = excl01Service.updateLevyExcl(levyExcl); + String retMessage = levyExclService.updateLevyExcl(levyExcl); if (retMessage.contains("[S]")) { saved = true; diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java index 086cfd3d..ad7b49eb 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java @@ -13,10 +13,11 @@ import cokr.xit.base.code.CommonCode; import cokr.xit.base.file.FileInfo; import cokr.xit.base.file.service.FileService; import cokr.xit.base.file.web.FileInfoFactory; +import cokr.xit.base.user.ManagedUser; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.excl.OpnnSbmsn; -import cokr.xit.fims.excl.ExclQuery; -import cokr.xit.fims.excl.service.Excl02Service; +import cokr.xit.fims.excl.LevyExclQuery; +import cokr.xit.fims.excl.service.OpnnSbmsnService; import cokr.xit.foundation.data.DataObject; /**의견제출 대장 서비스의 웹 컨트롤러 @@ -48,8 +49,8 @@ public class Excl02Controller extends ApplicationController { } /** 의견제출 대장 서비스 */ - @Resource(name = "excl02Service") - protected Excl02Service excl02Service; + @Resource(name = "opnnSbmsnService") + protected OpnnSbmsnService opnnSbmsnService; /** 파일 정보 서비스 서비스 */ @Resource(name="fileService") @@ -62,21 +63,24 @@ public class Excl02Controller extends ApplicationController { public ModelAndView opinionSubmissionMain() { ModelAndView mav = new ModelAndView("fims/excl/excl02010-main"); + // 사용자 정보 + ManagedUser managedUser = (ManagedUser)currentUser().getUser(); + // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM031", "FIM054"); addCodes(commonCodes, mav, "FIM021", "FIM022"); return mav.addObject("pageName", "excl02010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("urlPrefix", "/excl/excl02") // URL로 사용할 prefix .addObject("infoPrefix", "opnnSbmsn") // prefix - .addObject("FIM031List", commonCodes.get("FIM031")) // 부과 제외 구분 코드(LEVY_EXCL_SE_CD) + .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("FIM031List", commonCodes.get("FIM031")) // 의견 제출 답변 결과(OPNN_SBMSN_STTS_CD) .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) ; } /**의견제출 대장 목록을 조회하여 반환한다.
    - * {@link Excl02Service#getOpnnSbmsnList(Excl02Query)} 참고 + * {@link OpnnSbmsnService#getOpnnSbmsnList(Excl02Query)} 참고 * @param req 의견제출 대장 조회 조건 * @return jsonView * 
     {
@@ -86,8 +90,8 @@ public class Excl02Controller extends ApplicationController {
 	 *     "opnnSbmsnTotal": 조회 결과 찾은 전체 의견제출 대장 수
 	 * }
    */ - public ModelAndView getOpnnSbmsnList(ExclQuery req) { - List result = excl02Service.getOpnnSbmsnList(setFetchSize(req)); + public ModelAndView getOpnnSbmsnList(LevyExclQuery req) { + List result = opnnSbmsnService.getOpnnSbmsnList(setFetchSize(req)); return setCollectionInfo(new ModelAndView("jsonView"), result, "opnnSbmsn"); } @@ -102,7 +106,7 @@ public class Excl02Controller extends ApplicationController { */ public ModelAndView removeOpnnSbmsn(OpnnSbmsn opnnSbmsn) { boolean saved = false; - String retMessage = excl02Service.removeOpnnSbmsn(opnnSbmsn); + String retMessage = opnnSbmsnService.removeOpnnSbmsn(opnnSbmsn); if (retMessage.contains("[S]")) { saved = true; @@ -123,9 +127,9 @@ public class Excl02Controller extends ApplicationController { * "saved": 저장되었으면 true, 그렇지 않으면 false * } */ - public ModelAndView removeOpnnSbmsnList(ExclQuery req) { + public ModelAndView removeOpnnSbmsnList(LevyExclQuery req) { boolean saved = false; - String retMessage = excl02Service.removeOpnnSbmsnList(req); + String retMessage = opnnSbmsnService.removeOpnnSbmsnList(req); if (retMessage.contains("[S]")) { saved = true; @@ -145,8 +149,8 @@ public class Excl02Controller extends ApplicationController { * "opnnSbmsnInfo": 의견제출 정보 * } */ - public ModelAndView getOpnnSbmsnInfo(ExclQuery req) { - DataObject opnnSbmsnInfo = excl02Service.getOpnnSbmsnInfo(req); + public ModelAndView getOpnnSbmsnInfo(LevyExclQuery req) { + DataObject opnnSbmsnInfo = opnnSbmsnService.getOpnnSbmsnInfo(req); // 등록을 호출하였지만 등록된 의견제출 ID가 있는지 확인. if (req.getCallPurpose().equals("create") && !opnnSbmsnInfo.string("OPNN_ID").equals("")) { @@ -191,7 +195,7 @@ public class Excl02Controller extends ApplicationController { } boolean saved = false; - String retMessage = excl02Service.createOpnnSbmsn(opnnSbmsn, fileInfoList); + String retMessage = opnnSbmsnService.createOpnnSbmsn(opnnSbmsn, fileInfoList); if (retMessage.contains("[S]")) { saved = true; @@ -220,7 +224,7 @@ public class Excl02Controller extends ApplicationController { } boolean saved = false; - String retMessage = excl02Service.updateOpnnSbmsn(opnnSbmsn, fileInfoList); + String retMessage = opnnSbmsnService.updateOpnnSbmsn(opnnSbmsn, fileInfoList); if (retMessage.contains("[S]")) { saved = true; @@ -240,8 +244,8 @@ public class Excl02Controller extends ApplicationController { * "opnnSbmsnSttsInfo": 의견제출 정보 * } */ - public ModelAndView getOpnnSbmsnAnswerInfo(ExclQuery req) { - DataObject opnnSbmsnInfo = excl02Service.getOpnnSbmsnInfo(req); + public ModelAndView getOpnnSbmsnAnswerInfo(LevyExclQuery req) { + DataObject opnnSbmsnInfo = opnnSbmsnService.getOpnnSbmsnInfo(req); boolean json = jsonResponse(); @@ -270,7 +274,7 @@ public class Excl02Controller extends ApplicationController { */ public ModelAndView updateOpnnSbmsnAnswer(OpnnSbmsn opnnSbmsn) { boolean saved = false; - String retMessage = excl02Service.updateOpnnSbmsnAnswer(opnnSbmsn); + String retMessage = opnnSbmsnService.updateOpnnSbmsnAnswer(opnnSbmsn); if (retMessage.contains("[S]")) { saved = true; diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java index 5d0173a8..c5a41e0f 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java @@ -10,10 +10,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.CommonCode; +import cokr.xit.base.user.ManagedUser; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.excl.CrdnReReg; -import cokr.xit.fims.excl.ExclQuery; -import cokr.xit.fims.excl.service.Excl03Service; +import cokr.xit.fims.excl.LevyExclQuery; +import cokr.xit.fims.excl.service.CrdnReRegService; /**단속 재등록 서비스의 웹 컨트롤러 * @@ -39,8 +40,8 @@ public class Excl03Controller extends ApplicationController { } /**단속 재등록 서비스*/ - @Resource(name = "excl03Service") - private Excl03Service excl03Service; + @Resource(name = "crdnReRegService") + private CrdnReRegService crdnReRegService; /**단속 재등록 관리 메인화면(excl03/excl03-main)을 연다. * @@ -49,18 +50,21 @@ public class Excl03Controller extends ApplicationController { public ModelAndView crackdownReRegistrationMain() { ModelAndView mav = new ModelAndView("fims/excl/excl03010-main"); + // 사용자 정보 + ManagedUser managedUser = (ManagedUser)currentUser().getUser(); + // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM054"); return mav.addObject("pageName", "excl03010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix - .addObject("urlPrefix", "/excl/excl03") // URL로 사용할 prefix .addObject("infoPrefix", "crdnReReg") // prefix + .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) ; } /**단속 재등록 목록을 조회하여 반환한다.
    - * {@link Excl03Service#getExcl03List(Excl03Query)} 참고 + * {@link CrdnReRegService#getExcl03List(Excl03Query)} 참고 * @param req 단속 재등록 조회 조건 * @return jsonView * 
     {
@@ -71,8 +75,8 @@ public class Excl03Controller extends ApplicationController {
 	 * }
    */ @RequestMapping(name = "단속 재등록 리스트 조회", value = "/010/list.do") - public ModelAndView getCrdnReRegList(ExclQuery req) { - List result = excl03Service.getCrdnReRegList(setFetchSize(req)); + public ModelAndView getCrdnReRegList(LevyExclQuery req) { + List result = crdnReRegService.getCrdnReRegList(setFetchSize(req)); return setCollectionInfo(new ModelAndView("jsonView"), result, "crdnReReg"); } @@ -87,7 +91,7 @@ public class Excl03Controller extends ApplicationController { @PostMapping(name = "단속 재등록 등록", value = "/010/create.do") public ModelAndView createCrdnReReg(CrdnReReg crdnReReg) { boolean saved = false; - String retMessage = excl03Service.createCrdnReReg(crdnReReg); + String retMessage = crdnReRegService.createCrdnReReg(crdnReReg); if (retMessage.contains("[S]")) { saved = true; @@ -110,7 +114,7 @@ public class Excl03Controller extends ApplicationController { */ @PostMapping(name = "단속 재등록 제거", value = "/010/remove.do") public ModelAndView removeCrdnReReg(CrdnReReg crdnReReg) { - boolean saved = excl03Service.removeCrdnReReg(crdnReReg); + boolean saved = crdnReRegService.removeCrdnReReg(crdnReReg); return new ModelAndView("jsonView") .addObject("saved", saved); diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java index 6bffd662..ba055188 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java @@ -15,9 +15,9 @@ import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.cmmn.CrdnSttsHstryQuery; import cokr.xit.fims.cmmn.service.CrdnSttsHstryService; import cokr.xit.fims.crdn.Crdn; -import cokr.xit.fims.excl.ExclQuery; -import cokr.xit.fims.excl.service.Excl01Service; -import cokr.xit.fims.excl.service.Excl02Service; +import cokr.xit.fims.excl.LevyExclQuery; +import cokr.xit.fims.excl.service.LevyExclService; +import cokr.xit.fims.excl.service.OpnnSbmsnService; import cokr.xit.fims.levy.LevyQuery; import cokr.xit.fims.levy.service.LevyService; import cokr.xit.fims.levy.service.RductService; @@ -66,12 +66,12 @@ public class Sprt02Controller extends ApplicationController { private Sprt02Service sprt02Service; /** 부과제외 대장 서비스 */ - @Resource(name = "excl01Service") - protected Excl01Service excl01Service; + @Resource(name = "levyExclService") + protected LevyExclService levyExclService; /** 의견제출 대장 서비스 */ - @Resource(name = "excl02Service") - protected Excl02Service excl02Service; + @Resource(name = "opnnSbmsnService") + protected OpnnSbmsnService opnnSbmsnService; /** 발송 대장 서비스*/ @Resource(name = "sndngService") @@ -238,7 +238,7 @@ public class Sprt02Controller extends ApplicationController { */ public ModelAndView getOpnnSbmsnInfo(SprtQuery req) { // 의견제출(TB_OPNN_SBMSN) 대장 조회 - ExclQuery exclQuery = new ExclQuery(); + LevyExclQuery exclQuery = new LevyExclQuery(); if (req.getCallPurpose() == null) { exclQuery.setCallPurpose("view"); @@ -249,7 +249,7 @@ public class Sprt02Controller extends ApplicationController { exclQuery.setDelYn(req.getDelYn()); // 의견 제출(TB_OPNN_SBMSN) 대장 조회 - DataObject opnnSbmsn = excl02Service.getOpnnSbmsnInfo(exclQuery); + DataObject opnnSbmsn = opnnSbmsnService.getOpnnSbmsnInfo(exclQuery); boolean json = jsonResponse(); @@ -342,7 +342,7 @@ public class Sprt02Controller extends ApplicationController { DataObject rduct = rductService.getRductInfo(levyQuery); // 부과 제외(TB_LEVY_EXCL) 대장 조회 - ExclQuery exclQuery = new ExclQuery(); + LevyExclQuery exclQuery = new LevyExclQuery(); if (req.getCallPurpose() == null) { exclQuery.setCallPurpose("view"); @@ -353,7 +353,7 @@ public class Sprt02Controller extends ApplicationController { exclQuery.setDelYn(req.getDelYn()); exclQuery.setOrderBy("LEVY_EXCL_ID DESC"); // 정렬 - DataObject levyExcl = excl01Service.getLevyExclInfo(exclQuery); + DataObject levyExcl = levyExclService.getLevyExclInfo(exclQuery); // 단속 상태 이력(TB_CRDN_STTS_HSTRY) 조회 CrdnSttsHstryQuery crdnSttsHstryQuery = new CrdnSttsHstryQuery(); diff --git a/src/main/java/cokr/xit/fims/task/web/BpvController.java b/src/main/java/cokr/xit/fims/task/web/BpvController.java index 73bb8d64..232f380e 100644 --- a/src/main/java/cokr/xit/fims/task/web/BpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/BpvController.java @@ -13,7 +13,7 @@ import cokr.xit.fims.crdn.ExmptnVhcl; import cokr.xit.fims.crdn.Team; import cokr.xit.fims.cvlc.CrdnCvlcpt; import cokr.xit.fims.excl.CrdnReReg; -import cokr.xit.fims.excl.ExclQuery; +import cokr.xit.fims.excl.LevyExclQuery; import cokr.xit.fims.excl.LevyExcl; import cokr.xit.fims.excl.OpnnSbmsn; import cokr.xit.fims.levy.LevyQuery; @@ -382,7 +382,7 @@ public class BpvController { @Override @RequestMapping(name="전용차로과태료업무 부과제외 대장 목록 조회", value=METHOD_URL.getLevyExclList) - public ModelAndView getLevyExclList(ExclQuery req) { + public ModelAndView getLevyExclList(LevyExclQuery req) { return super.getLevyExclList(req); } @@ -394,13 +394,13 @@ public class BpvController { @Override @RequestMapping(name="전용차로과태료업무 부과제외 대장 목록 삭제", value=METHOD_URL.removeLevyExclList) - public ModelAndView removeLevyExclList(ExclQuery req) { + public ModelAndView removeLevyExclList(LevyExclQuery req) { return super.removeLevyExclList(req); } @Override @RequestMapping(name="전용차로과태료업무 부과제외 정보 조회", value=METHOD_URL.getLevyExclInfo) - public ModelAndView getLevyExclInfo(String saveCallbackFuncName, String savedCallbackFuncName, ExclQuery req) { + public ModelAndView getLevyExclInfo(String saveCallbackFuncName, String savedCallbackFuncName, LevyExclQuery req) { return super.getLevyExclInfo(saveCallbackFuncName, savedCallbackFuncName, req); } @@ -424,7 +424,7 @@ public class BpvController { @Override @RequestMapping(name="전용차로과태료업무 의견제출 대장 목록 조회", value=METHOD_URL.getOpnnSbmsnList) - public ModelAndView getOpnnSbmsnList(ExclQuery req) { + public ModelAndView getOpnnSbmsnList(LevyExclQuery req) { return super.getOpnnSbmsnList(req); } @@ -436,13 +436,13 @@ public class BpvController { @Override @RequestMapping(name="전용차로과태료업무 의견제출 대장 목록 삭제", value=METHOD_URL.removeOpnnSbmsnList) - public ModelAndView removeOpnnSbmsnList(ExclQuery req) { + public ModelAndView removeOpnnSbmsnList(LevyExclQuery req) { return super.removeOpnnSbmsnList(req); } @Override @RequestMapping(name="전용차로과태료업무 의견제출 정보 조회", value=METHOD_URL.getOpnnSbmsnInfo) - public ModelAndView getOpnnSbmsnInfo(ExclQuery req) { + public ModelAndView getOpnnSbmsnInfo(LevyExclQuery req) { return super.getOpnnSbmsnInfo(req); } @@ -460,7 +460,7 @@ public class BpvController { @Override @RequestMapping(name="전용차로과태료업무 의견제출 대장 심의 조회", value=METHOD_URL.getOpnnSbmsnAnswerInfo) - public ModelAndView getOpnnSbmsnAnswerInfo(ExclQuery req) { + public ModelAndView getOpnnSbmsnAnswerInfo(LevyExclQuery req) { return super.getOpnnSbmsnAnswerInfo(req); } @@ -478,7 +478,7 @@ public class BpvController { @Override @RequestMapping(name="전용차로과태료업무 단속재등록 대장 목록 조회", value=METHOD_URL.getCrdnReRegList) - public ModelAndView getCrdnReRegList(ExclQuery req) { + public ModelAndView getCrdnReRegList(LevyExclQuery req) { return super.getCrdnReRegList(req); } 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 ca89b867..a87ea896 100644 --- a/src/main/java/cokr/xit/fims/task/web/DpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/DpvController.java @@ -11,7 +11,7 @@ import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.cvlc.CrdnCvlcpt; import cokr.xit.fims.excl.CrdnReReg; -import cokr.xit.fims.excl.ExclQuery; +import cokr.xit.fims.excl.LevyExclQuery; import cokr.xit.fims.excl.LevyExcl; import cokr.xit.fims.excl.OpnnSbmsn; import cokr.xit.fims.levy.LevyQuery; @@ -334,7 +334,7 @@ public class DpvController { @Override @RequestMapping(name="장애인과태료업무 부과제외 대장 목록 조회", value=METHOD_URL.getLevyExclList) - public ModelAndView getLevyExclList(ExclQuery req) { + public ModelAndView getLevyExclList(LevyExclQuery req) { return super.getLevyExclList(req); } @@ -346,13 +346,13 @@ public class DpvController { @Override @RequestMapping(name="장애인과태료업무 부과제외 대장 목록 삭제", value=METHOD_URL.removeLevyExclList) - public ModelAndView removeLevyExclList(ExclQuery req) { + public ModelAndView removeLevyExclList(LevyExclQuery req) { return super.removeLevyExclList(req); } @Override @RequestMapping(name="장애인과태료업무 부과제외 정보 조회", value=METHOD_URL.getLevyExclInfo) - public ModelAndView getLevyExclInfo(String saveCallbackFuncName, String savedCallbackFuncName, ExclQuery req) { + public ModelAndView getLevyExclInfo(String saveCallbackFuncName, String savedCallbackFuncName, LevyExclQuery req) { return super.getLevyExclInfo(saveCallbackFuncName, savedCallbackFuncName, req); } @@ -376,7 +376,7 @@ public class DpvController { @Override @RequestMapping(name="장애인과태료업무 의견제출 대장 목록 조회", value=METHOD_URL.getOpnnSbmsnList) - public ModelAndView getOpnnSbmsnList(ExclQuery req) { + public ModelAndView getOpnnSbmsnList(LevyExclQuery req) { return super.getOpnnSbmsnList(req); } @@ -388,13 +388,13 @@ public class DpvController { @Override @RequestMapping(name="장애인과태료업무 의견제출 대장 목록 삭제", value=METHOD_URL.removeOpnnSbmsnList) - public ModelAndView removeOpnnSbmsnList(ExclQuery req) { + public ModelAndView removeOpnnSbmsnList(LevyExclQuery req) { return super.removeOpnnSbmsnList(req); } @Override @RequestMapping(name="장애인과태료업무 의견제출 정보 조회", value=METHOD_URL.getOpnnSbmsnInfo) - public ModelAndView getOpnnSbmsnInfo(ExclQuery req) { + public ModelAndView getOpnnSbmsnInfo(LevyExclQuery req) { return super.getOpnnSbmsnInfo(req); } @@ -412,7 +412,7 @@ public class DpvController { @Override @RequestMapping(name="장애인과태료업무 의견제출 대장 심의 조회", value=METHOD_URL.getOpnnSbmsnAnswerInfo) - public ModelAndView getOpnnSbmsnAnswerInfo(ExclQuery req) { + public ModelAndView getOpnnSbmsnAnswerInfo(LevyExclQuery req) { return super.getOpnnSbmsnAnswerInfo(req); } @@ -430,7 +430,7 @@ public class DpvController { @Override @RequestMapping(name="장애인과태료업무 단속재등록 대장 목록 조회", value=METHOD_URL.getCrdnReRegList) - public ModelAndView getCrdnReRegList(ExclQuery req) { + public ModelAndView getCrdnReRegList(LevyExclQuery req) { return super.getCrdnReRegList(req); } diff --git a/src/main/java/cokr/xit/fims/task/web/EcaController.java b/src/main/java/cokr/xit/fims/task/web/EcaController.java index 34318b23..ddf2b5b8 100644 --- a/src/main/java/cokr/xit/fims/task/web/EcaController.java +++ b/src/main/java/cokr/xit/fims/task/web/EcaController.java @@ -11,7 +11,7 @@ import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.cvlc.CrdnCvlcpt; import cokr.xit.fims.excl.CrdnReReg; -import cokr.xit.fims.excl.ExclQuery; +import cokr.xit.fims.excl.LevyExclQuery; import cokr.xit.fims.excl.LevyExcl; import cokr.xit.fims.excl.OpnnSbmsn; import cokr.xit.fims.levy.LevyQuery; @@ -303,7 +303,7 @@ public class EcaController { @Override @RequestMapping(name="전기차과태료업무 부과제외 대장 목록 조회", value=METHOD_URL.getLevyExclList) - public ModelAndView getLevyExclList(ExclQuery req) { + public ModelAndView getLevyExclList(LevyExclQuery req) { return super.getLevyExclList(req); } @@ -315,13 +315,13 @@ public class EcaController { @Override @RequestMapping(name="전기차과태료업무 부과제외 대장 목록 삭제", value=METHOD_URL.removeLevyExclList) - public ModelAndView removeLevyExclList(ExclQuery req) { + public ModelAndView removeLevyExclList(LevyExclQuery req) { return super.removeLevyExclList(req); } @Override @RequestMapping(name="전기차과태료업무 부과제외 정보 조회", value=METHOD_URL.getLevyExclInfo) - public ModelAndView getLevyExclInfo(String saveCallbackFuncName, String savedCallbackFuncName, ExclQuery req) { + public ModelAndView getLevyExclInfo(String saveCallbackFuncName, String savedCallbackFuncName, LevyExclQuery req) { return super.getLevyExclInfo(saveCallbackFuncName, savedCallbackFuncName, req); } @@ -345,7 +345,7 @@ public class EcaController { @Override @RequestMapping(name="전기차과태료업무 의견제출 대장 목록 조회", value=METHOD_URL.getOpnnSbmsnList) - public ModelAndView getOpnnSbmsnList(ExclQuery req) { + public ModelAndView getOpnnSbmsnList(LevyExclQuery req) { return super.getOpnnSbmsnList(req); } @@ -357,13 +357,13 @@ public class EcaController { @Override @RequestMapping(name="전기차과태료업무 의견제출 대장 목록 삭제", value=METHOD_URL.removeOpnnSbmsnList) - public ModelAndView removeOpnnSbmsnList(ExclQuery req) { + public ModelAndView removeOpnnSbmsnList(LevyExclQuery req) { return super.removeOpnnSbmsnList(req); } @Override @RequestMapping(name="전기차과태료업무 의견제출 정보 조회", value=METHOD_URL.getOpnnSbmsnInfo) - public ModelAndView getOpnnSbmsnInfo(ExclQuery req) { + public ModelAndView getOpnnSbmsnInfo(LevyExclQuery req) { return super.getOpnnSbmsnInfo(req); } @@ -381,7 +381,7 @@ public class EcaController { @Override @RequestMapping(name="전기차과태료업무 의견제출 대장 심의 조회", value=METHOD_URL.getOpnnSbmsnAnswerInfo) - public ModelAndView getOpnnSbmsnAnswerInfo(ExclQuery req) { + public ModelAndView getOpnnSbmsnAnswerInfo(LevyExclQuery req) { return super.getOpnnSbmsnAnswerInfo(req); } @@ -399,7 +399,7 @@ public class EcaController { @Override @RequestMapping(name="전기차과태료업무 단속재등록 대장 목록 조회", value=METHOD_URL.getCrdnReRegList) - public ModelAndView getCrdnReRegList(ExclQuery req) { + public ModelAndView getCrdnReRegList(LevyExclQuery req) { return super.getCrdnReRegList(req); } diff --git a/src/main/java/cokr/xit/fims/task/web/PvsController.java b/src/main/java/cokr/xit/fims/task/web/PvsController.java index 25a4005e..9571ded3 100644 --- a/src/main/java/cokr/xit/fims/task/web/PvsController.java +++ b/src/main/java/cokr/xit/fims/task/web/PvsController.java @@ -12,7 +12,7 @@ import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.Team; import cokr.xit.fims.cvlc.CrdnCvlcpt; import cokr.xit.fims.excl.CrdnReReg; -import cokr.xit.fims.excl.ExclQuery; +import cokr.xit.fims.excl.LevyExclQuery; import cokr.xit.fims.excl.LevyExcl; import cokr.xit.fims.excl.OpnnSbmsn; import cokr.xit.fims.levy.LevyQuery; @@ -352,7 +352,7 @@ public class PvsController { @Override @RequestMapping(name="주정차과태료업무 부과제외 대장 목록 조회", value=METHOD_URL.getLevyExclList) - public ModelAndView getLevyExclList(ExclQuery req) { + public ModelAndView getLevyExclList(LevyExclQuery req) { return super.getLevyExclList(req); } @@ -364,13 +364,13 @@ public class PvsController { @Override @RequestMapping(name="주정차과태료업무 부과제외 대장 목록 삭제", value=METHOD_URL.removeLevyExclList) - public ModelAndView removeLevyExclList(ExclQuery req) { + public ModelAndView removeLevyExclList(LevyExclQuery req) { return super.removeLevyExclList(req); } @Override @RequestMapping(name="주정차과태료업무 부과제외 정보 조회", value=METHOD_URL.getLevyExclInfo) - public ModelAndView getLevyExclInfo(String saveCallbackFuncName, String savedCallbackFuncName, ExclQuery req) { + public ModelAndView getLevyExclInfo(String saveCallbackFuncName, String savedCallbackFuncName, LevyExclQuery req) { return super.getLevyExclInfo(saveCallbackFuncName, savedCallbackFuncName, req); } @@ -394,7 +394,7 @@ public class PvsController { @Override @RequestMapping(name="주정차과태료업무 의견제출 대장 목록 조회", value=METHOD_URL.getOpnnSbmsnList) - public ModelAndView getOpnnSbmsnList(ExclQuery req) { + public ModelAndView getOpnnSbmsnList(LevyExclQuery req) { return super.getOpnnSbmsnList(req); } @@ -406,13 +406,13 @@ public class PvsController { @Override @RequestMapping(name="주정차과태료업무 의견제출 대장 목록 삭제", value=METHOD_URL.removeOpnnSbmsnList) - public ModelAndView removeOpnnSbmsnList(ExclQuery req) { + public ModelAndView removeOpnnSbmsnList(LevyExclQuery req) { return super.removeOpnnSbmsnList(req); } @Override @RequestMapping(name="주정차과태료업무 의견제출 정보 조회", value=METHOD_URL.getOpnnSbmsnInfo) - public ModelAndView getOpnnSbmsnInfo(ExclQuery req) { + public ModelAndView getOpnnSbmsnInfo(LevyExclQuery req) { return super.getOpnnSbmsnInfo(req); } @@ -430,7 +430,7 @@ public class PvsController { @Override @RequestMapping(name="주정차과태료업무 의견제출 대장 심의 조회", value=METHOD_URL.getOpnnSbmsnAnswerInfo) - public ModelAndView getOpnnSbmsnAnswerInfo(ExclQuery req) { + public ModelAndView getOpnnSbmsnAnswerInfo(LevyExclQuery req) { return super.getOpnnSbmsnAnswerInfo(req); } @@ -448,7 +448,7 @@ public class PvsController { @Override @RequestMapping(name="주정차과태료업무 단속재등록 대장 목록 조회", value=METHOD_URL.getCrdnReRegList) - public ModelAndView getCrdnReRegList(ExclQuery req) { + public ModelAndView getCrdnReRegList(LevyExclQuery req) { return super.getCrdnReRegList(req); } diff --git a/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml b/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml index 7925ab3e..30d00e15 100644 --- a/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml @@ -63,9 +63,11 @@ +
    @@ -269,6 +272,9 @@ **************************************************************************/ // URL var ${pageName}PrefixUrl = "/excl/excl01"; + // FormFields + var ${pageName}Fields = new FormFields("#frmSearch--${pageName}"); + // 공통 코드 // var FIM021 = new CommonCodes(${FIM021}, true); // var FIM022 = new CommonCodes(${FIM022}, true); @@ -344,7 +350,7 @@ // 개별총정보 dialog ${pageName}Control.getInfo = (crdnId) => { - if (crdnId == undefined || crdnId == null || crdnId == "") { + if (typeof crdnId == "undefined" || crdnId == null || crdnId == "") { return; } @@ -424,32 +430,6 @@ fn_securityModeToggle($("#securityMode--top").is(":checked")); } - // 업무구분 변경 - fnResetAndChangeBiz${pageName} = (taskSeCd) => { - initForm${pageName}(); - - ${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.getInfo = wctx.url("/" + taskSeCd + "/sprt/sprt02/010/main.do"); // 개별총정보 - - // 업무별 그리드가 존재 한다면.. crdn06010-main.jsp 참고 -// $("#DataTables_Table_0--${pageName}").find("th").resizable( "destroy" ); -// $("#DataTables_Table_0--${pageName}").find("th").resizable( {handles : "e"} ); // style="width" 변경 조정 - } - - // 검색 조건 파라미터 가져오기 - getParams${pageName} = () => { - let formFields = new FimsFormFields("#frmSearch--${pageName}"); - let formData = formFields.get(); - - formData.fetchSize = FETCH_XS; // 한번에 조회되는 자료 건수 - - // 나중에 삭제 - formData.sggCd = "41480"; // 시군구 코드 임시 - - return formData; - } - // 수정 dialog -> callback 추가 ${pageName}Info = (params) => { ajax.get({ @@ -471,17 +451,6 @@ /************************************************************************** * 초기 셋팅 **************************************************************************/ - // 화면 초기값 셋팅 - initForm${pageName} = () => { - // 달력 초기화 - initDatepicker("frmSearch--${pageName}"); - - $("#schLevyExclYmdFrom--${pageName}").datepicker("setDate", DateUtil.getDateDay(-30).date); - $("#schLevyExclYmdTo--${pageName}").datepicker("setDate", new Date()); - - ${pageName}Control.dataset.clear(); - } - // 이벤트 setEvent${pageName} = () => { // form-date 항목에서 키보드로 입력시 날짜 포맷팅 적용 @@ -526,32 +495,78 @@ }); } + // 화면 초기값 셋팅 + setForm${pageName} = (taskSeCd) => { + // 업무 구분 코드 + $("#frmSearch--${pageName} input[name='taskSeCd'][value='" + taskSeCd + "']").prop("checked", true); + + // 최고 관리자 경우 업무구분을 선택할 수 있도록 하자. + $("#frmSearch--${pageName} input[name='taskSeCd']").each(function(i) { + $(this).prop("disabled", "true"); + }); + + // 달력 초기화 + initDatepicker("frmSearch--${pageName}"); + + $("#schLevyExclYmdFrom--${pageName}").datepicker("setDate", DateUtil.getDateDay(-30).date); + $("#schLevyExclYmdTo--${pageName}").datepicker("setDate", new Date()); + } + + // 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.getInfo = wctx.url("/" + taskSeCd + "/sprt/sprt02/010/main.do"); // 개별총정보 + } + /************************************************************************** * 버튼 clickEvent **************************************************************************/ - // 초기화 + // 초기화 버튼 이벤트 fnReset${pageName} = () => { - let taskSeCd = $("#layout-navbar input[name='taskSeCd']:checked").val(); - - fnResetAndChangeBiz${pageName}(taskSeCd); + fnResetAndChangeBiz${pageName}(); } - // 검색 + // 검색 버튼 이벤트 fnSearchList${pageName} = () => { // 검색조건 - ${pageName}Control.query = getParams${pageName}(); + ${pageName}Control.query = ${pageName}Fields.get(); + + ${pageName}Control.query.fetchSize = FETCH_XS; // 한번에 조회되는 자료 건수 FETCH_XS = 30 ${pageName}Control.query.delYn = "N"; // 삭제 여부 ${pageName}Control.query.crdnDelYn = "N"; // 단속 대장 삭제 여부 ${pageName}Control.load(); } - // 엑셀 + // 엑셀 버튼 이벤트 fnExcel${pageName} = () => { } - // 수정 + // 업무 구분 변경 + fnResetAndChangeBiz${pageName} = (taskSeCd) => { + // 화면 초기화 + $("#frmSearch--${pageName}")[0].reset(); + // dataset 초기화 + ${pageName}Control.dataset.clear(); + + // 업무 구분 코드 + if (typeof taskSeCd == "undefined" || taskSeCd == null || taskSeCd == "") { + taskSeCd = $("#layout-navbar input[name='taskSeCd']:checked").val(); + } + + // 화면 초기값 설정 + setForm${pageName}(taskSeCd); + // URL 설정 + setURL${pageName}(taskSeCd); + + // 업무별 그리드가 존재 한다면.. crdn06010-main.jsp 참고 +// $("#DataTables_Table_0--${pageName}").find("th").resizable( "destroy" ); +// $("#DataTables_Table_0--${pageName}").find("th").resizable( {handles : "e"} ); // style="width" 변경 조정 + } + + // 수정 버튼 이벤트 fnUpdate${pageName} = () => { let levyExclId = ${pageName}Control.dataset.getValue("LEVY_EXCL_ID"); let levyExclSeCd = ${pageName}Control.dataset.getValue("LEVY_EXCL_SE_CD"); @@ -571,7 +586,7 @@ ${pageName}Info(params); } - // 삭제 + // 삭제 버튼 이벤트 fnRemove${pageName} = () => { dialog.alert({ content : "선택한 부과제외 정보를 삭제하시겠습니까?" @@ -585,16 +600,19 @@ * script 진입 **************************************************************************/ $(document).ready(function() { - // 이벤트 설정 - setEvent${pageName}(); - // 보안모드 fn_securityModeToggle($("#securityMode--top").is(":checked")); - // 업무구분 및 화면 초기 설정 + // 이벤트 설정 + 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); + // 업무 구분 및 화면 초기 설정 fnResetAndChangeBiz${pageName}(defaultBizValue); // Dataset 셋팅 - 화면이 열리면서 조회하는 경우 addData 하여 자료를 추가 diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp index 84e19f06..552f75fa 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp @@ -29,6 +29,9 @@
    + + +
    @@ -284,6 +287,8 @@ **************************************************************************/ // URL var ${pageName}PrefixUrl = "/excl/excl02"; + // FormFields + var ${pageName}Fields = new FormFields("#frmSearch--${pageName}"); /************************************************************************** * DatasetControl @@ -328,7 +333,6 @@ // 현재 선택 자료 변경 이벤트 ${pageName}Control.onCurrentChange = item => { - // if (!item) return; let key = item.data.OPNN_ID; @@ -352,7 +356,7 @@ // 개별총정보 dialog ${pageName}Control.getInfo = (crdnId) => { - if (crdnId == undefined || crdnId == null || crdnId == "") { + if (typeof crdnId == "undefined" || crdnId == null || crdnId == "") { return; } @@ -370,8 +374,6 @@ , title : "개별총정보" , content : resp , size : "xxl" - , init : () => { } - , onClose : () => { } }); } }); @@ -432,28 +434,6 @@ fn_securityModeToggle($("#securityMode--top").is(":checked")); } - // 업무구분 변경 - fnResetAndChangeBiz${pageName} = (taskSeCd) => { - initForm${pageName}(); - - ${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.getInfo = wctx.url("/" + taskSeCd + "/sprt/sprt02/010/main.do"); // 개별총정보 - } - - // 검색 조건 파라미터 가져오기 - getParams${pageName} = () => { - let formFields = new FimsFormFields("#frmSearch--${pageName}"); - let formData = formFields.get(); - - formData.fetchSize = FETCH_XS; // 한번에 조회되는 자료 건수 - - // 나중에 삭제 - formData.sggCd = "41480"; // 시군구 코드 임시 - - return formData; - } - // 수정 dialog -> callback 추가 ${pageName}Info = (params) => { ajax.get({ @@ -493,17 +473,6 @@ /************************************************************************** * 초기 셋팅 **************************************************************************/ - // 화면 초기값 셋팅 - initForm${pageName} = () => { - // 달력 초기화 - initDatepicker("frmSearch--${pageName}"); - - $("#schRcptYmdFrom--${pageName}").datepicker("setDate", DateUtil.getDateDay(-30).date); - $("#schRcptYmdTo--${pageName}").datepicker("setDate", new Date()); - - ${pageName}Control.dataset.clear(); - } - // 이벤트 setEvent${pageName} = () => { // form-date 항목에서 키보드로 입력시 날짜 포맷팅 적용 @@ -548,32 +517,74 @@ }); } + // 화면 초기값 셋팅 + setForm${pageName} = (taskSeCd) => { + // 업무 구분 코드 + $("#frmSearch--${pageName} input[name='taskSeCd'][value='" + taskSeCd + "']").prop("checked", true); + + // 최고 관리자 경우 업무구분을 선택할 수 있도록 하자. + $("#frmSearch--${pageName} input[name='taskSeCd']").each(function(i) { + $(this).prop("disabled", "true"); + }); + + // 달력 초기화 + initDatepicker("frmSearch--${pageName}"); + + $("#schRcptYmdFrom--${pageName}").datepicker("setDate", DateUtil.getDateDay(-30).date); + $("#schRcptYmdTo--${pageName}").datepicker("setDate", new Date()); + } + + // 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.getInfo = wctx.url("/" + taskSeCd + "/sprt/sprt02/010/main.do"); // 개별총정보 + } + /************************************************************************** * 버튼 clickEvent **************************************************************************/ - // 초기화 + // 초기화 버튼 이벤트 fnReset${pageName} = () => { - let taskSeCd = $("#layout-navbar input[name='taskSeCd']:checked").val(); - - fnResetAndChangeBiz${pageName}(taskSeCd); + fnResetAndChangeBiz${pageName}(); } - // 검색 + // 검색 버튼 이벤트 fnSearchList${pageName} = () => { // 검색조건 - ${pageName}Control.query = getParams${pageName}(); + ${pageName}Control.query = ${pageName}Fields.get(); + + ${pageName}Control.query.fetchSize = FETCH_XS; // 한번에 조회되는 자료 건수 FETCH_XS = 30 ${pageName}Control.query.delYn = "N"; // 삭제 여부 ${pageName}Control.query.crdnDelYn = "N"; // 단속 대장 삭제 여부 ${pageName}Control.load(); } - // 엑셀 + // 엑셀 버튼 이벤트 fnExcel${pageName} = () => { } - // 수정 + // 업무 구분 변경 + fnResetAndChangeBiz${pageName} = (taskSeCd) => { + // 화면 초기화 + $("#frmSearch--${pageName}")[0].reset(); + // dataset 초기화 + ${pageName}Control.dataset.clear(); + + // 업무 구분 코드 + if (typeof taskSeCd == "undefined" || taskSeCd == null || taskSeCd == "") { + taskSeCd = $("#layout-navbar input[name='taskSeCd']:checked").val(); + } + + // 화면 초기값 설정 + setForm${pageName}(taskSeCd); + // URL 설정 + setURL${pageName}(taskSeCd); + } + + // 수정 버튼 이벤트 fnUpdate${pageName} = () => { let opnnId = ${pageName}Control.dataset.getValue("OPNN_ID"); @@ -592,7 +603,7 @@ ${pageName}Info(params); } - // 심의 + // 심의 버튼 이벤트 fnOpnnSbmsnDlbrt${pageName} = () => { let opnnId = ${pageName}Control.dataset.getValue("OPNN_ID"); @@ -611,7 +622,7 @@ ${pageName}OpnnSbmsnDlbrtInfo(params); } - // 삭제 + // 삭제 버튼 이벤트 fnRemove${pageName} = () => { dialog.alert({ content : "선택한 의견제출 정보를 삭제하시겠습니까?" @@ -625,16 +636,19 @@ * script 진입 **************************************************************************/ $(document).ready(function() { - // 이벤트 설정 - setEvent${pageName}(); - // 보안모드 fn_securityModeToggle($("#securityMode--top").is(":checked")); - // 업무구분 및 화면 초기 설정 + // 이벤트 설정 + 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); + // 업무 구분 및 화면 초기 설정 fnResetAndChangeBiz${pageName}(defaultBizValue); }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp index 27cea4f3..0677f260 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp @@ -29,6 +29,9 @@ + + +
    @@ -223,6 +226,8 @@ **************************************************************************/ // URL var ${pageName}PrefixUrl = "/excl/excl03"; + // FormFields + var ${pageName}Fields = new FormFields("#frmSearch--${pageName}"); /************************************************************************** * DatasetControl @@ -317,8 +322,6 @@ , title : "개별총정보" , content : resp , size : "xxl" - , init : () => { } - , onClose : () => { } }); } }); @@ -348,42 +351,9 @@ fn_securityModeToggle($("#securityMode--top").is(":checked")); } - // 업무구분 변경 - fnResetAndChangeBiz${pageName} = (taskSeCd) => { - initForm${pageName}(); - - ${pageName}Control.urls.load = wctx.url("/" + taskSeCd + ${pageName}PrefixUrl + "/010/list.do"); // 조회 - ${pageName}Control.urls.create = wctx.url("/" + taskSeCd + ${pageName}PrefixUrl + "/010/create.do"); // 등록 - ${pageName}Control.urls.getInfo = wctx.url("/" + taskSeCd + "/sprt/sprt02/010/main.do"); // 개별총정보 - } - - // 검색 조건 파라미터 가져오기 - getParams${pageName} = () => { - let formFields = new FimsFormFields("#frmSearch--${pageName}"); - let formData = formFields.get(); - - formData.fetchSize = FETCH_XS; // 한번에 조회되는 자료 건수 - - // 나중에 삭제 - formData.sggCd = "41480"; // 시군구 코드 임시 - - return formData; - } - /************************************************************************** * 초기 셋팅 **************************************************************************/ - // 화면 초기값 셋팅 - initForm${pageName} = () => { - // 달력 초기화 - initDatepicker("frmSearch--${pageName}"); - - $("#schReRegYmdFrom--${pageName}").datepicker("setDate", new Date()); - $("#schReRegYmdTo--${pageName}").datepicker("setDate", new Date()); - - ${pageName}Control.dataset.clear(); - } - // 이벤트 setEvent${pageName} = () => { // form-date 항목에서 키보드로 입력시 날짜 포맷팅 적용 @@ -428,32 +398,74 @@ }); } + // 화면 초기값 셋팅 + setForm${pageName} = (taskSeCd) => { + // 업무 구분 코드 + $("#frmSearch--${pageName} input[name='taskSeCd'][value='" + taskSeCd + "']").prop("checked", true); + + // 최고 관리자 경우 업무구분을 선택할 수 있도록 하자. + $("#frmSearch--${pageName} input[name='taskSeCd']").each(function(i) { + $(this).prop("disabled", "true"); + }); + + // 달력 초기화 + initDatepicker("frmSearch--${pageName}"); + + $("#schReRegYmdFrom--${pageName}").datepicker("setDate", new Date()); + $("#schReRegYmdTo--${pageName}").datepicker("setDate", new Date()); + } + + // URL 설정 + setURL${pageName} = (taskSeCd) => { + ${pageName}Control.urls.load = wctx.url("/" + taskSeCd + ${pageName}PrefixUrl + "/010/list.do"); // 조회 + ${pageName}Control.urls.create = wctx.url("/" + taskSeCd + ${pageName}PrefixUrl + "/010/create.do"); // 등록 + ${pageName}Control.urls.getInfo = wctx.url("/" + taskSeCd + "/sprt/sprt02/010/main.do"); // 개별총정보 + } + /************************************************************************** * 버튼 clickEvent **************************************************************************/ - // 초기화 + // 초기화 버튼 이벤트 fnReset${pageName} = () => { - let taskSeCd = $("#layout-navbar input[name='taskSeCd']:checked").val(); - - fnResetAndChangeBiz${pageName}(taskSeCd); + fnResetAndChangeBiz${pageName}(); } - // 검색 + // 검색 버튼 이벤트 fnSearchList${pageName} = () => { // 검색조건 - ${pageName}Control.query = getParams${pageName}(); + ${pageName}Control.query = ${pageName}Fields.get(); + + ${pageName}Control.query.fetchSize = FETCH_XS; // 한번에 조회되는 자료 건수 FETCH_XS = 30 ${pageName}Control.query.delYn = "N"; // 삭제 여부 ${pageName}Control.query.crdnDelYn = "N"; // 단속 대장 삭제 여부 ${pageName}Control.load(); } - // 엑셀 + // 엑셀 버튼 이벤트 fnExcel${pageName} = () => { } - // 이전 단속정보 보기 + // 업무 구분 변경 + fnResetAndChangeBiz${pageName} = (taskSeCd) => { + // 화면 초기화 + $("#frmSearch--${pageName}")[0].reset(); + // dataset 초기화 + ${pageName}Control.dataset.clear(); + + // 업무 구분 코드 + if (typeof taskSeCd == "undefined" || taskSeCd == null || taskSeCd == "") { + taskSeCd = $("#layout-navbar input[name='taskSeCd']:checked").val(); + } + + // 화면 초기값 설정 + setForm${pageName}(taskSeCd); + // URL 설정 + setURL${pageName}(taskSeCd); + } + + // 이전 단속정보 보기 버튼 이벤트 fnBfrCrdnTotalInfo${pageName} = () => { let bfrCrdnId = ${pageName}Control.dataset.getValue("BFR_CRDN_ID"); @@ -465,16 +477,19 @@ * script 진입 **************************************************************************/ $(document).ready(function() { - // 이벤트 설정 - setEvent${pageName}(); - // 보안모드 fn_securityModeToggle($("#securityMode--top").is(":checked")); - // 업무구분 및 화면 초기 설정 + // 이벤트 설정 + 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); + // 업무 구분 및 화면 초기 설정 fnResetAndChangeBiz${pageName}(defaultBizValue); }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp index 52fe179a..20ba8927 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp @@ -157,7 +157,9 @@ 법정동 단속장소 위반항목 + 단속금액 과태료금액 + 사전통지금액 처리상태 민원신청번호 민원접수번호 @@ -188,7 +190,9 @@ {CRDN_STDG_NM} {CRDN_PLC} {VLTN_ARTCL} + {FFNLG_CRDN_AMT} {FFNLG_AMT} + {ADVNTCE_AMT} {CRDN_STTS_NM} {CVLCPT_APLY_NO} {CVLCPT_RCPT_NO} @@ -208,7 +212,7 @@ @@ -248,11 +252,11 @@ , appendData : true , tableRenderComplete : false // dataTables 에 자료 추가 완료 여부 , formats : { - LEVY_EXCL_YMD : dateFormat - , CRDN_YMD_TM : datetimeFormat + CRDN_YMD_TM : datetimeFormat , CVLCPT_RCPT_YMD : dateFormat , FFNLG_CRDN_AMT : numberFormat , FFNLG_AMT : numberFormat + , ADVNTCE_AMT : numberFormat , REG_DT : datetimeFormat , MDFCN_DT : datetimeFormat } @@ -300,7 +304,7 @@ // 개별총정보 dialog ${pageName}Control.getInfo = (crdnId) => { - if (crdnId == undefined || crdnId == null || crdnId == "") { + if (typeof crdnId == "undefined" || crdnId == null || crdnId == "") { return; } @@ -318,8 +322,6 @@ , title : "개별총정보" , content : resp , size : "xxl" - , init : () => { } - , onClose : () => { } }); } }); @@ -415,7 +417,7 @@ // 달력 초기화 initDatepicker("frmSearch--${pageName}"); - $("#schCrdnYmdFrom--${pageName}").datepicker("setDate", DateUtil.getDateDay(-30).date); + $("#schCrdnYmdFrom--${pageName}").datepicker("setDate", DateUtil.getDateDay(-90).date); $("#schCrdnYmdTo--${pageName}").datepicker("setDate", new Date()); } @@ -454,6 +456,8 @@ fnResetAndChangeBiz${pageName} = (taskSeCd) => { // 화면 초기화 $("#frmSearch--${pageName}")[0].reset(); + // dataset 초기화 + ${pageName}Control.dataset.clear(); // 업무 구분 코드 if (typeof taskSeCd == "undefined" || taskSeCd == null || taskSeCd == "") { @@ -462,12 +466,8 @@ // 화면 초기값 설정 setForm${pageName}(taskSeCd); - // URL 설정 setURL${pageName}(taskSeCd); - - // dataset 초기화 - ${pageName}Control.dataset.clear(); } // 감경부과등록 버튼 이벤트