From 50b83d20abdcfea65258d43f3e7f4e08b5532f72 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Tue, 4 Jul 2023 18:04:51 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AF=BC=EC=9B=90=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EB=A9=94=EC=86=8C=EB=93=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cokr/xit/fims/crdn/dao/Crdn01Mapper.java | 24 ++ .../xit/fims/crdn/service/Crdn01Service.java | 3 +- .../xit/fims/crdn/service/Crdn02Service.java | 2 +- .../xit/fims/crdn/service/Crdn05Service.java | 2 +- .../xit/fims/crdn/service/Crdn06Service.java | 10 +- .../xit/fims/crdn/service/CrdnService.java | 19 ++ .../fims/crdn/service/bean/Crdn01Bean.java | 4 +- .../crdn/service/bean/Crdn01ServiceBean.java | 26 +- .../crdn/service/bean/Crdn02ServiceBean.java | 12 +- .../crdn/service/bean/Crdn05ServiceBean.java | 13 +- .../fims/crdn/service/bean/Crdn06Bean.java | 33 --- .../crdn/service/bean/Crdn06ServiceBean.java | 27 +- .../xit/fims/crdn/web/Crdn01Controller.java | 28 +- .../sql/mapper/fims/crdn/crdn01-mapper.xml | 210 +++++++++++++- .../sql/mapper/fims/crdn/crdn06-mapper.xml | 2 + .../WEB-INF/jsp/fims/crdn/crdn01010-main.jsp | 259 ++++++++++++++++- .../WEB-INF/jsp/fims/crdn/crdn01030-main.jsp | 261 +++++++++++++++++- .../WEB-INF/jsp/fims/crdn/crdn06010-main.jsp | 2 +- 18 files changed, 868 insertions(+), 69 deletions(-) create mode 100644 src/main/java/cokr/xit/fims/crdn/service/CrdnService.java diff --git a/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java b/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java index 50d37ec8..aa4d2a7e 100644 --- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java +++ b/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java @@ -1,8 +1,12 @@ package cokr.xit.fims.crdn.dao; +import java.util.List; + import org.egovframe.rte.psl.dataaccess.mapper.Mapper; +import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.foundation.component.AbstractMapper; +import cokr.xit.foundation.data.DataObject; /**민원 관리 DAO * @author leebj @@ -10,4 +14,24 @@ import cokr.xit.foundation.component.AbstractMapper; @Mapper("crdn01Mapper") public interface Crdn01Mapper extends AbstractMapper { + /**민원자료 목록을 조회한다.
+ * {@link cokr.xit.fims.crdn.service.Crdn01Service#getCrackdownList(CrdnQuery)} 참고 + * @param req 민원자료 목록 조회 조건 + * @return 민원자료 목록 + */ + List selectCivilComplaintList(CrdnQuery req); + + /**민원접수자료 목록을 조회한다.
+ * {@link cokr.xit.fims.crdn.service.Crdn01Service#getCrackdownList(CrdnQuery)} 참고 + * @param req 민원접수자료 목록 조회 조건 + * @return 민원접수자료 목록 + */ + List selectCivilComplaintReceiptDataList(CrdnQuery req); + + /**민원답변대상자료 목록을 조회한다.
+ * {@link cokr.xit.fims.crdn.service.Crdn01Service#getCrackdownList(CrdnQuery)} 참고 + * @param req 민원답변대상자료 목록 조회 조건 + * @return 민원답변대상자료 목록 + */ + List selectCivilComplaintAnswerTargetDataList(CrdnQuery req); } diff --git a/src/main/java/cokr/xit/fims/crdn/service/Crdn01Service.java b/src/main/java/cokr/xit/fims/crdn/service/Crdn01Service.java index 08c2295a..f77b5dbb 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/Crdn01Service.java +++ b/src/main/java/cokr/xit/fims/crdn/service/Crdn01Service.java @@ -5,7 +5,6 @@ package cokr.xit.fims.crdn.service; * * @author leebj */ - -public interface Crdn01Service { +public interface Crdn01Service extends CrdnService { } diff --git a/src/main/java/cokr/xit/fims/crdn/service/Crdn02Service.java b/src/main/java/cokr/xit/fims/crdn/service/Crdn02Service.java index 202f89a5..62458c5a 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/Crdn02Service.java +++ b/src/main/java/cokr/xit/fims/crdn/service/Crdn02Service.java @@ -5,6 +5,6 @@ package cokr.xit.fims.crdn.service; * * @author leebj */ -public interface Crdn02Service { +public interface Crdn02Service extends CrdnService { } diff --git a/src/main/java/cokr/xit/fims/crdn/service/Crdn05Service.java b/src/main/java/cokr/xit/fims/crdn/service/Crdn05Service.java index 79bb074c..652fc2a3 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/Crdn05Service.java +++ b/src/main/java/cokr/xit/fims/crdn/service/Crdn05Service.java @@ -7,6 +7,6 @@ import cokr.xit.fims.crdn.CrdnQuery; * * @author leebj */ -public interface Crdn05Service { +public interface Crdn05Service extends CrdnService { } diff --git a/src/main/java/cokr/xit/fims/crdn/service/Crdn06Service.java b/src/main/java/cokr/xit/fims/crdn/service/Crdn06Service.java index 831bc5fe..f0d1225e 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/Crdn06Service.java +++ b/src/main/java/cokr/xit/fims/crdn/service/Crdn06Service.java @@ -12,16 +12,8 @@ import cokr.xit.foundation.data.DataObject; * * @author leebj */ -public interface Crdn06Service { +public interface Crdn06Service extends CrdnService { - /** 단속자료 목록을 조회한다. - * @param req 단속자료 목록 조회 조건 - *
  • pageNum: 페이지 번호
  • - *
  • fetchSize: 페이지 목록 건수
  • - *
- * @return 단속자료 목록 - */ - List getCrackdownList(CrdnQuery req); /**단속 대장 정보를 수정한다. * @param crdn 단속 대장 diff --git a/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java b/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java new file mode 100644 index 00000000..5ecaea67 --- /dev/null +++ b/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java @@ -0,0 +1,19 @@ +package cokr.xit.fims.crdn.service; + +import java.util.List; + +import cokr.xit.fims.crdn.CrdnQuery; +import cokr.xit.foundation.data.DataObject; + +public interface CrdnService { + + /** 단속자료 목록을 조회한다. + * @param req 단속자료 목록 조회 조건 + *
  • pageNum: 페이지 번호
  • + *
  • fetchSize: 페이지 목록 건수
  • + *
+ * @return 단속자료 목록 + */ + List getCrackdownList(CrdnQuery req); + +} diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01Bean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01Bean.java index bd82a6a7..3c401550 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01Bean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01Bean.java @@ -12,8 +12,8 @@ import cokr.xit.foundation.AbstractComponent; */ @Component("crdn01Bean") public class Crdn01Bean extends AbstractComponent { - + @Resource(name = "crdn01Mapper") private Crdn01Mapper crdn01Mapper; - + } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java index 0d9538dc..4da9c5b9 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java @@ -1,20 +1,42 @@ package cokr.xit.fims.crdn.service.bean; +import java.util.List; + import javax.annotation.Resource; import org.springframework.stereotype.Service; +import cokr.xit.fims.crdn.CrdnQuery; +import cokr.xit.fims.crdn.dao.Crdn01Mapper; import cokr.xit.fims.crdn.service.Crdn01Service; import cokr.xit.foundation.component.AbstractServiceBean; +import cokr.xit.foundation.data.DataObject; /**민원 관리 서비스 인터페이스의 구현체 * @author leebj */ @Service("crdn01Service") public class Crdn01ServiceBean extends AbstractServiceBean implements Crdn01Service { - + + @Resource(name="crdn01Mapper") + protected Crdn01Mapper crdn01Mapper; + /** 민원관리 Bean */ @Resource(name="crdn01Bean") protected Crdn01Bean crdn01Bean; - + + @Override + public List getCrackdownList(CrdnQuery req) { + + switch (ifEmpty(req.getGrid(), () -> "")) { + case "접수": + return crdn01Mapper.selectCivilComplaintReceiptDataList(req.setOrderBy("CRDN_ID")); + case "답변": + return crdn01Mapper.selectCivilComplaintAnswerTargetDataList(req.setOrderBy("CRDN_ID")); + default: + return crdn01Mapper.selectCivilComplaintList(req.setOrderBy("CRDN_ID")); + } + + } + } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn02ServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn02ServiceBean.java index 73a13562..2ba7cd88 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn02ServiceBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn02ServiceBean.java @@ -1,20 +1,28 @@ package cokr.xit.fims.crdn.service.bean; +import java.util.List; + import javax.annotation.Resource; import org.springframework.stereotype.Service; +import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.service.Crdn02Service; import cokr.xit.foundation.component.AbstractServiceBean; +import cokr.xit.foundation.data.DataObject; /**민원 개별 등록 서비스 인터페이스의 구현체 * @author leebj */ @Service("crdn02Service") public class Crdn02ServiceBean extends AbstractServiceBean implements Crdn02Service { - + /** 민원 개별 등록 Bean */ @Resource(name="crdn02Bean") protected Crdn02Bean crdn02Bean; - + + @Override + public List getCrackdownList(CrdnQuery req) { + return null; //crdn02Mapper. + } } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05ServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05ServiceBean.java index eb3b85a8..72c2ec91 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05ServiceBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05ServiceBean.java @@ -1,20 +1,29 @@ package cokr.xit.fims.crdn.service.bean; +import java.util.List; + import javax.annotation.Resource; import org.springframework.stereotype.Service; +import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.service.Crdn05Service; import cokr.xit.foundation.component.AbstractServiceBean; +import cokr.xit.foundation.data.DataObject; /**단속 자료 등록 서비스 인터페이스의 구현체 * @author leebj */ @Service("crdn05Service") public class Crdn05ServiceBean extends AbstractServiceBean implements Crdn05Service { - + /** 단속 자료 등록 Bean */ @Resource(name="crdn05Bean") protected Crdn05Bean crdn05Bean; - + + @Override + public List getCrackdownList(CrdnQuery req) { + return null; //crdn05Mapper. + } + } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java index eb4b33db..f90670a0 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java @@ -22,39 +22,6 @@ public class Crdn06Bean extends AbstractComponent { @Resource(name = "crdn06Mapper") private Crdn06Mapper crdn06Mapper; - /** 단속자료 목록을 조회한다.
- * {@link cokr.xit.fims.crdn.service.Crdn06Service#getCrackdownList(CrdnQuery)} 참고 - * @param req 단속자료 목록 조회 조건 - * @return 단속자료 목록 - */ - public List getCrackdownList(CrdnQuery req) { - - //if(!isEmpty(req.getBy())) { - // if(!req.getBy().startsWith("advancedOption")) { - // switch (ifEmpty(req.getBy(), () -> "")) { - // default: - // req.setBy(EgovStringUtil.convertToUnderScore(req.getBy()).toUpperCase()); - // break; - // } - // } - //} - - switch (ifEmpty(req.getGrid(), () -> "")) { - case "tagInformationUndefinedData": - return crdn06Mapper.selectTagInformationUndefinedDataList(req.setOrderBy("CRDN_ID")); - case "fineReductionData": - return crdn06Mapper.selectFineReductionDataList(req.setOrderBy("CRDN_ID")); - case "photo": - return crdn06Mapper.selectPhotoInspectionDataList(req.setOrderBy("CRDN_ID")); - case "sameVehicleMain": - return crdn06Mapper.selectSameVehicleMainList(req.setOrderBy("VHRNO")); - case "sameVehicleSub": - return crdn06Mapper.selectSameVehicleSubList(req.setOrderBy("CRDN_ID")); - default: - return crdn06Mapper.selectCrackdownList(req.setOrderBy("CRDN_ID")); - } - } - /**단속 대장 정보를 수정한다. * @param crdn 단속 대장 * @return 저장 여부 diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06ServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06ServiceBean.java index a63ca360..ed31287c 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06ServiceBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06ServiceBean.java @@ -8,6 +8,7 @@ import org.springframework.stereotype.Service; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnQuery; +import cokr.xit.fims.crdn.dao.Crdn06Mapper; import cokr.xit.fims.crdn.service.Crdn06Service; import cokr.xit.foundation.component.AbstractServiceBean; import cokr.xit.foundation.data.DataObject; @@ -18,18 +19,36 @@ import cokr.xit.foundation.data.DataObject; @Service("crdn06Service") public class Crdn06ServiceBean extends AbstractServiceBean implements Crdn06Service { + @Resource(name="crdn06Mapper") + protected Crdn06Mapper crdn06Mapper; + /** 단속관리 Bean */ @Resource(name="crdn06Bean") protected Crdn06Bean crdn06Bean; @Override - public List getCrackdownList(CrdnQuery req) { - return crdn06Bean.getCrackdownList(req); + public boolean update(Crdn crdn) { + return crdn06Bean.update(crdn); } @Override - public boolean update(Crdn crdn) { - return crdn06Bean.update(crdn); + public List getCrackdownList(CrdnQuery req) { + + switch (ifEmpty(req.getGrid(), () -> "")) { + case "tagInformationUndefinedData": + return crdn06Mapper.selectTagInformationUndefinedDataList(req.setOrderBy("CRDN_ID")); + case "fineReductionData": + return crdn06Mapper.selectFineReductionDataList(req.setOrderBy("CRDN_ID")); + case "photo": + return crdn06Mapper.selectPhotoInspectionDataList(req.setOrderBy("CRDN_ID")); + case "sameVehicleMain": + return crdn06Mapper.selectSameVehicleMainList(req.setOrderBy("VHRNO")); + case "sameVehicleSub": + return crdn06Mapper.selectSameVehicleSubList(req.setOrderBy("CRDN_ID")); + default: + return crdn06Mapper.selectCrackdownList(req.setOrderBy("CRDN_ID")); + } + } } diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java index fb970be8..ee60e7c8 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java @@ -1,19 +1,24 @@ package cokr.xit.fims.crdn.web; +import java.util.List; +import java.util.Map; + import javax.annotation.Resource; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; +import cokr.xit.base.code.CommonCode; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.crdn.service.Crdn01Service; +import cokr.xit.fims.crdn.service.bean.Crdn01ServiceBean; @RequestMapping(name="민원 관리", value="/crdn/crdn01") public class Crdn01Controller extends ApplicationController { - + @Resource(name="crdn01Service") private Crdn01Service crdn01Service; - + /** 민원 접수 자료 메인화면을 연다. * @return fims/crdn/crdn01010-main */ @@ -22,10 +27,13 @@ public class Crdn01Controller extends ApplicationController { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/crdn/crdn01010-main"); mav.addObject("pageName", "crdn01010-main"); - + + Map> commonCodes = getCodesOf("FIM026","FIM054"); + mav.addObject("FIM054List", commonCodes.get("FIM054")); + addCodes(commonCodes, mav, "FIM026"); return mav; } - + /** 민원 답변 대상 자료 메인화면을 연다. * @return fims/crdn/crdn01030-main */ @@ -34,10 +42,13 @@ public class Crdn01Controller extends ApplicationController { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/crdn/crdn01030-main"); mav.addObject("pageName", "crdn01030-main"); - + + Map> commonCodes = getCodesOf("FIM026", "FIM054"); + mav.addObject("FIM054List", commonCodes.get("FIM054")); + addCodes(commonCodes, mav, "FIM026"); return mav; } - + /** 민원 관리 메인화면을 연다. * @return fims/crdn/crdn01040-main */ @@ -46,7 +57,10 @@ public class Crdn01Controller extends ApplicationController { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/crdn/crdn01040-main"); mav.addObject("pageName", "crdn01040-main"); - + + Map> commonCodes = getCodesOf("FIM026", "FIM054"); + mav.addObject("FIM054List", commonCodes.get("FIM054")); + addCodes(commonCodes, mav, "FIM026"); return mav; } } diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml index dca481d7..5052e8dc 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml @@ -1,5 +1,213 @@ - + + + + + + + + +SELECT C.CRDN_ID + , C.SGG_CD + , C.TASK_SE_CD + , C.CRDN_REG_SE_CD + , C.CRDN_INPT_SE_CD + , C.LINK_TBL_NM + , C.LINK_ID + , C.CRDN_SE_CD + , C.RTPYR_ID + , C.CRDN_YMD + , C.CRDN_TM + , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM + , IF(CC.CVLCPT_APLCNT_NM != '', CC.CVLCPT_APLCNT_NM, + IF(TI.TEAMER_1 != '', TI.TEAMER_1, + IF(TI.TEAMER_2 != '', TI.TEAMER_2, + IF(TI.TEAMER_3 != '', TI.TEAMER_3, + TI.TEAMER_4)))) AS APLCNT_CRDN_NM + , C.VHRNO + , C.CRDN_STDG_NM + , C.CRDN_ROAD_NM + , C.CRDN_PLC + , C.DTL_CRDN_PLC + , C.TEAM_ID + , C.VLTN_ID + , C.CRDN_SPAREA_CD + , C.CRDN_BGNG_TM + , C.CRDN_END_HR + , C.CRDN_SN + , C.GPS_X + , C.GPS_Y + , C.MOSC_X + , C.MOSC_Y + , C.TOWNG_YN + , C.ATCH_FILE_CNT + , C.VIN + , C.VHCL_NM + , C.VHCL_COLOR + , C.USE_FUEL_CD + , C.USG_SE_CD + , C.MXMM_LOAD_QY + , C.TKCAR_PSNCPA_CNT + , C.CARMDL_ASORT_NM + , C.CARMDL_TYPE_NM + , C.CARMDL_CLSF_NM + , C.ERSR_YMD + , C.FFNLG_CARMDL_CD + , C.PARKNG_PSBLTY_RSLT_CD + , C.VLTN_NMTM + , C.OVTIME_YN + , C.RVW_SE_CD + , C.RVW_PRCS_SCRN_NM + , C.RVW_DT + , C.RVWR + , C.FFNLG_AMT + , C.FFNLG_RDUCT_RT + , C.LEVY_AMT + , C.ADVNTCE_BGNG_YMD + , C.ADVNTCE_DUDT_YMD + , C.ADVNTCE_LEVY_AMT + , C.OPNN_SBMSN_YN + , C.ETC_CN + , C.LEVY_ID + , C.CRDN_STTS_CD + , C.CRDN_STTS_CHG_DT + , C.ADTN_AMT + , C.MINUS_AMT + , C.RCVMT_AMT + , C.BFR_CRDN_ID + , CC.CVLCPT_LINK_ID + , CC.CVLCPT_INPT_SE_CD + , CC.CVLCPT_RCPT_YMD + , CC.CVLCPT_APLY_SE_CD + , CC.CVLCPT_APLY_NO + , CC.CVLCPT_RCPT_NO + , CC.CVLCPT_LIST_NO + , CC.CVLCPT_APLCNT_NM + , CC.CVLCPT_APLY_DT + , CC.CVLCPT_APLY_TTL_NM + , CC.CVLCPT_APLY_CN + , CC.CVLCPT_GIST + , CC.CVLCPT_PRCS_PIC_NM + , CC.CVLCPT_PRCS_PRNMNT_DT + , CC.CVLCPT_PRCS_CD + , CC.CVLCPT_PRCS_SUMRY + , CC.CVLCPT_PRCS_RSLT_CN + , CC.CVLCPT_PRCS_CMPTN_DT + , CC.CVLCPT_PRCS_PIC + , CC.CVLCPT_TRSM_DT + , CC.CVLCPT_TRSM_CD + , CC.CVLCPT_TRSM_MSG + , LE.LEVY_EXCL_RSN_CD + , LE.LEVY_EXCL_YMD + , LE.ETC_CN AS LEVY_EXCL_ETC_CN + , C.DEL_YN + , C.RGTR + , C.REG_DT + , C.MDFR + , C.MDFCN_DT + , C.DLTR + , C.DEL_DT + , C.DEL_RSN +FROM TB_CRDN C +LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.CRDN_ID = CC.CRDN_ID) +LEFT OUTER JOIN TB_TEAM_INFO TI ON (C.TEAM_ID = TI.TEAM_ID) +LEFT OUTER JOIN TB_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID) +LEFT OUTER JOIN TB_LEVY L ON (C.LEVY_ID = L.LEVY_ID) +WHERE C.DEL_YN = 'N' + + + +AND FN_GET_CODE_NM('FIM003', C.CRDN_INPT_SE_CD) LIKE CONCAT('%', #{term}, '%') + + +AND C.${by} LIKE CONCAT('%', #{term}, '%') + + + +AND C.CRDN_ID = #{crdnId} +AND C.TASK_SE_CD = #{taskSeCd} +AND C.VHRNO LIKE CONCAT('%', #{vhrno}, '%') +AND C.CRDN_INPT_SE_CD = #{crdnInptSeCd} + + AND C.CRDN_YMD = ]]> #{schCrdnYmdFrom} + AND C.CRDN_YMD #{schCrdnYmdTo} + + + + AND SUBSTR(C.REG_DT,1,8) = ]]> #{schDateFrom} + AND SUBSTR(C.REG_DT,1,8) #{schDateTo} + + + AND SUBSTR(C.MDFCN_DT,1,8) = ]]> #{schDateFrom} + AND SUBSTR(C.MDFCN_DT,1,8) #{schDateTo} + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml index d4321d0e..62ad4afe 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml @@ -302,7 +302,9 @@ SELECT GROUP_CONCAT(C.CRDN_ID) AS CRDN_ID_LIST WHERE C.DEL_YN = 'N' AND C.TASK_SE_CD = #{taskSeCd} AND C.VHRNO != '' + AND C.CRDN_STDG_NM != '' + AND C.CRDN_YMD = ]]> #{schCrdnYmdFrom} AND C.CRDN_YMD #{schCrdnYmdTo} diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp index 98c3ef66..376c047e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp @@ -1,3 +1,260 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> -민원 접수 자료 \ No newline at end of file + +
+
+ 민원접수자료 +
+
+
+
+ + + + +
+ +
+ +
+ +
+ +
+ +
    +
+
+ + 민원원본보기 + 처리 잠시 보류 + +
+
+ +
+ +
+
+
+
+ +
+ + + +
+
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp index 624538a1..060163b6 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp @@ -1,3 +1,262 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> -민원 답변 대상 자료 \ No newline at end of file + +
+
+ 민원답변대상자료 +
+
+
+
+ + + + +
+ +
+ +
+ + + +
+ +
+
+
+
+ +
+ + + +
+
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp index 9b0e4675..c00ddebe 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp @@ -257,7 +257,7 @@ {} -