diff --git a/src/main/java/cokr/xit/fims/crdn/dao/Crdn02Mapper.java b/src/main/java/cokr/xit/fims/crdn/dao/Crdn02Mapper.java deleted file mode 100644 index 5ee174ec..00000000 --- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn02Mapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package cokr.xit.fims.crdn.dao; - -import org.egovframe.rte.psl.dataaccess.mapper.Mapper; - -import cokr.xit.foundation.component.AbstractMapper; - -/**민원 개별 등록 DAO - * @author leebj - */ -@Mapper("crdn02Mapper") -public interface Crdn02Mapper extends AbstractMapper { - -} diff --git a/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java b/src/main/java/cokr/xit/fims/crdn/dao/CrdnCvlcptMapper.java similarity index 96% rename from src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java rename to src/main/java/cokr/xit/fims/crdn/dao/CrdnCvlcptMapper.java index 304d6850..1045ccc2 100644 --- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java +++ b/src/main/java/cokr/xit/fims/crdn/dao/CrdnCvlcptMapper.java @@ -13,8 +13,8 @@ import cokr.xit.foundation.data.DataObject; /**민원 관리 DAO * @author leebj */ -@Mapper("crdn01Mapper") -public interface Crdn01Mapper extends AbstractMapper { +@Mapper("crdnCvlcptMapper") +public interface CrdnCvlcptMapper extends AbstractMapper { /**민원자료 목록을 조회한다.
* {@link cokr.xit.fims.crdn.service.bean.CrdnService#getCrackdownList(CrdnQuery)} 참고 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 ba0908b8..ea29c025 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 org.springframework.stereotype.Component; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnCvlcpt; import cokr.xit.fims.crdn.CrdnQuery; -import cokr.xit.fims.crdn.dao.Crdn01Mapper; import cokr.xit.fims.crdn.dao.Crdn05Mapper; +import cokr.xit.fims.crdn.dao.CrdnCvlcptMapper; import cokr.xit.foundation.AbstractComponent; import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.data.DataObject; @@ -24,8 +24,8 @@ import cokr.xit.foundation.data.DataObject; @Component("crdn01Bean") public class Crdn01Bean extends AbstractComponent { - @Resource(name = "crdn01Mapper") - private Crdn01Mapper crdn01Mapper; + @Resource(name = "crdnCvlcptMapper") + private CrdnCvlcptMapper crdnCvlcptMapper; @Resource(name = "crdn05Mapper") private Crdn05Mapper crdn05Mapper; @@ -43,17 +43,17 @@ public class Crdn01Bean extends AbstractComponent { public DataObject getCivilComplaintOriginalInfo(CrdnQuery crdnQuery) { if(ifEmpty(crdnQuery.getViewType(), () -> "").equals("hwp")) { - return crdn01Mapper.selectCivilComplaintOriginalInfoHwp(crdnQuery); + return crdnCvlcptMapper.selectCivilComplaintOriginalInfoHwp(crdnQuery); } - return crdn01Mapper.selectCivilComplaintOriginalInfo(crdnQuery); + return crdnCvlcptMapper.selectCivilComplaintOriginalInfo(crdnQuery); } public boolean accept(CrdnCvlcpt cvlcpt) { - return crdn01Mapper.acceptCvlcpt(cvlcpt) == 1 ? true : false; + return crdnCvlcptMapper.acceptCvlcpt(cvlcpt) == 1 ? true : false; } public boolean update(Crdn crdn) { - return crdn01Mapper.updateCrdn(crdn) == 1 ? true : false; + return crdnCvlcptMapper.updateCrdn(crdn) == 1 ? true : false; } } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn02Bean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn02Bean.java index 6dd0e6f3..b2418580 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn02Bean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn02Bean.java @@ -1,10 +1,7 @@ package cokr.xit.fims.crdn.service.bean; -import javax.annotation.Resource; - import org.springframework.stereotype.Component; -import cokr.xit.fims.crdn.dao.Crdn02Mapper; import cokr.xit.foundation.AbstractComponent; /** 민원 개별 등록 Bean @@ -12,8 +9,7 @@ import cokr.xit.foundation.AbstractComponent; */ @Component("crdn02Bean") public class Crdn02Bean extends AbstractComponent { - - @Resource(name = "crdn02Mapper") - private Crdn02Mapper crdn02Mapper; - + + + } 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 a27ee67c..c49d0826 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 @@ -26,9 +26,9 @@ import cokr.xit.fims.cmmn.service.bean.CrdnSttsHstryBean; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnCvlcpt; import cokr.xit.fims.crdn.CrdnQuery; -import cokr.xit.fims.crdn.dao.Crdn01Mapper; import cokr.xit.fims.crdn.dao.Crdn05Mapper; import cokr.xit.fims.crdn.dao.Crdn06Mapper; +import cokr.xit.fims.crdn.dao.CrdnCvlcptMapper; import cokr.xit.fims.crdn.service.CrdnService; import cokr.xit.fims.excl.Excl01; import cokr.xit.fims.excl.service.bean.Excl01Bean; @@ -44,8 +44,8 @@ import kr.dogfoot.hwplib.writer.HWPWriter; @Service("crdnService") public class CrdnServiceBean extends AbstractServiceBean implements CrdnService { - @Resource(name="crdn01Mapper") - protected Crdn01Mapper crdn01Mapper; + @Resource(name="crdnCvlcptMapper") + protected CrdnCvlcptMapper crdnCvlcptMapper; @Resource(name="crdn05Mapper") protected Crdn05Mapper crdn05Mapper; @@ -95,10 +95,10 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService dataObjectList = crdn06Mapper.selectSameVehicleSubList(req.setOrderBy("CRDN_ID")); break; case "receiptData": - dataObjectList = crdn01Mapper.selectCivilComplaintReceiptDataList(req.setOrderBy("CVLCPT_RCPT_YMD")); + dataObjectList = crdnCvlcptMapper.selectCivilComplaintReceiptDataList(req.setOrderBy("CVLCPT_RCPT_YMD")); break; case "answerTargetData": - dataObjectList = crdn01Mapper.selectCivilComplaintAnswerTargetDataList(req.setOrderBy("CRDN_ID")); + dataObjectList = crdnCvlcptMapper.selectCivilComplaintAnswerTargetDataList(req.setOrderBy("CRDN_ID")); break; case "todayInsert": req.setCurrentUserId(currentUser().getId()); @@ -273,13 +273,13 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService @Override public DataObject getAnswerPreview(CrdnQuery req) { - return crdn01Mapper.selectAnswerPreview(req); + return crdnCvlcptMapper.selectAnswerPreview(req); } @Override public DataObject getCivilComplaintReceiptInitialDataInfo(CrdnQuery req) { //민원조회 - DataObject dataObject = crdn01Mapper.selectCivilComplaintReceiptInitialDataInfo(req); + DataObject dataObject = crdnCvlcptMapper.selectCivilComplaintReceiptInitialDataInfo(req); //첨부파일 조회 FileQuery fileQuery = new FileQuery(); diff --git a/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt03ServiceBean.java b/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt03ServiceBean.java index 6893be86..e4998bc0 100644 --- a/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt03ServiceBean.java +++ b/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt03ServiceBean.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; import cokr.xit.base.file.service.FileQuery; import cokr.xit.base.file.service.FileService; import cokr.xit.fims.crdn.CrdnQuery; -import cokr.xit.fims.crdn.dao.Crdn01Mapper; +import cokr.xit.fims.crdn.dao.CrdnCvlcptMapper; import cokr.xit.fims.sprt.Sprt; import cokr.xit.fims.sprt.service.Sprt03Service; import cokr.xit.foundation.component.AbstractServiceBean; @@ -22,8 +22,8 @@ import cokr.xit.foundation.data.DataObject; @Service("sprt03Service") public class Sprt03ServiceBean extends AbstractServiceBean implements Sprt03Service { - @Resource(name = "crdn01Mapper") - private Crdn01Mapper crdn01Mapper; + @Resource(name = "crdnCvlcptMapper") + private CrdnCvlcptMapper crdnCvlcptMapper; @Resource(name="fileService") FileService fileService; @@ -34,7 +34,7 @@ public class Sprt03ServiceBean extends AbstractServiceBean implements Sprt03Serv CrdnQuery crdnQuery = new CrdnQuery(); crdnQuery.setCrdnId(crdnId); - DataObject cvlcptInfo = crdn01Mapper.selectCivilComplaintReceiptInitialDataInfo(crdnQuery); + DataObject cvlcptInfo = crdnCvlcptMapper.selectCivilComplaintReceiptInitialDataInfo(crdnQuery); String linkNm = cvlcptInfo.string("LINK_TBL_NM"); if(!linkNm.equals("")) { FileQuery fileQuery = new FileQuery(); diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn02-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn02-mapper.xml deleted file mode 100644 index 46a005c8..00000000 --- a/src/main/resources/sql/mapper/fims/crdn/crdn02-mapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdnCvlcpt-mapper.xml similarity index 95% rename from src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml rename to src/main/resources/sql/mapper/fims/crdn/crdnCvlcpt-mapper.xml index a932ec7f..419f6b4a 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdnCvlcpt-mapper.xml @@ -1,13 +1,13 @@ - + -/* 단속 민원 대장 등록(crdn01Mapper.insertCvlcpt) */ +/* 단속 민원 대장 등록(crdnCvlcptMapper.insertCvlcpt) */ INSERT INTO TB_CRDN_CVLCPT ( CVLCPT_LINK_ID , CVLCPT_INPT_SE_CD @@ -400,7 +400,7 @@ INSERT INTO TB_CRDN_CVLCPT ( ) - /* 단속민원 수용(crdn01Mapper.acceptCvlcpt) */ + /* 단속민원 수용(crdnCvlcptMapper.acceptCvlcpt) */ UPDATE TB_CRDN_CVLCPT SET CVLCPT_PRCS_CMPTN_DT = , CVLCPT_PRCS_CD = '01' @@ -414,21 +414,18 @@ INSERT INTO TB_CRDN_CVLCPT ( - /* 단속정보 수정(crdn01Mapper.updateCrdn) */ + /* 단속정보 수정(crdnCvlcptMapper.updateCrdn) */ UPDATE TB_CRDN - SET MDFCN_DT = /* 수정일시 */ - , MDFR = #{modifiedBy} /* 수정자 */ + SET MDFCN_DT = /* 수정일시 */ + , MDFR = #{modifiedBy} /* 수정자 */ , ATCH_FILE_CNT = ATCH_FILE_CNT + (#{fileChgCnt}) , RTPYR_ID = #{rtpyrId} , CRDN_YMD = #{crdnYmd} , CRDN_TM = #{crdnTm} , VHRNO = #{vhrno} , CRDN_STDG_NM = #{crdnStdgNm} - , CRDN_ROAD_NM = #{crdnRoadNm} , CRDN_PLC = #{crdnPlc} , VLTN_ID = #{vltnId} - , GPS_X = #{gpsX} - , GPS_Y = #{gpsY} , VIN = #{vin} , VHCL_NM = #{vhclNm} , VHCL_COLOR = #{vhclColor}