diff --git a/src/main/java/cokr/xit/fims/crdn/dao/Crdn05Mapper.java b/src/main/java/cokr/xit/fims/crdn/dao/CrdnInstMapper.java similarity index 73% rename from src/main/java/cokr/xit/fims/crdn/dao/Crdn05Mapper.java rename to src/main/java/cokr/xit/fims/crdn/dao/CrdnInstMapper.java index 9230bcf8..ad0d5373 100644 --- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn05Mapper.java +++ b/src/main/java/cokr/xit/fims/crdn/dao/CrdnInstMapper.java @@ -1,7 +1,5 @@ package cokr.xit.fims.crdn.dao; -import java.util.Map; - import org.egovframe.rte.psl.dataaccess.mapper.Mapper; import cokr.xit.fims.crdn.Crdn; @@ -10,8 +8,8 @@ import cokr.xit.foundation.component.AbstractMapper; /**단속 자료 등록 DAO * @author leebj */ -@Mapper("crdn05Mapper") -public interface Crdn05Mapper extends AbstractMapper { +@Mapper("crdnInstMapper") +public interface CrdnInstMapper extends AbstractMapper { /**단속 대장 정보를 등록한다. * @param params 파라미터 @@ -31,10 +29,4 @@ public interface Crdn05Mapper extends AbstractMapper { */ int insertCrdnAddition(Crdn crdn); - /** 단속 자료를 삭제한다. - * @param params 삭제 요청 파라미터 - * @return 저장된 정보수 - */ - int removeCrdn(Map map); - } diff --git a/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java b/src/main/java/cokr/xit/fims/crdn/dao/CrdnUpdtMapper.java similarity index 60% rename from src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java rename to src/main/java/cokr/xit/fims/crdn/dao/CrdnUpdtMapper.java index 380add2c..e408e09b 100644 --- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java +++ b/src/main/java/cokr/xit/fims/crdn/dao/CrdnUpdtMapper.java @@ -1,5 +1,7 @@ package cokr.xit.fims.crdn.dao; +import java.util.Map; + import org.egovframe.rte.psl.dataaccess.mapper.Mapper; import cokr.xit.fims.crdn.Crdn; @@ -8,8 +10,8 @@ import cokr.xit.foundation.component.AbstractMapper; /**단속 관리 DAO * @author leebj */ -@Mapper("crdn06Mapper") -public interface Crdn06Mapper extends AbstractMapper { +@Mapper("crdnUpdtMapper") +public interface CrdnUpdtMapper extends AbstractMapper { /**표지정보 미확인 자료를 확인 자료로 수정한다. * @param crdn 단속 대장 @@ -18,10 +20,15 @@ public interface Crdn06Mapper extends AbstractMapper { int updateTagInformation(Crdn crdn); /**단속정보를 변경한다.
- * {@link cokr.xit.fims.crdn.service.bean.Crdn06Bean#update(Crdn)} 참고 + * {@link cokr.xit.fims.crdn.service.bean.CrdnBean#update(Crdn)} 참고 * @param crdn 단속정보 * @return 저장된 정보수 */ int updateCrdn(Crdn crdn); + /** 단속 자료를 삭제한다. + * @param params 삭제 요청 파라미터 + * @return 저장된 정보수 + */ + int removeCrdn(Map map); } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05Bean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05Bean.java deleted file mode 100644 index b98afff9..00000000 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05Bean.java +++ /dev/null @@ -1,48 +0,0 @@ -package cokr.xit.fims.crdn.service.bean; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Component; - -import cokr.xit.fims.crdn.Crdn; -import cokr.xit.fims.crdn.dao.Crdn05Mapper; -import cokr.xit.fims.crdn.dao.GlobalStngMapper; -import cokr.xit.foundation.AbstractComponent; - -/** 단속 자료 등록 Bean - * @author leebj - */ -@Component("crdn05Bean") -public class Crdn05Bean extends AbstractComponent { - - @Resource(name = "crdn05Mapper") - private Crdn05Mapper crdn05Mapper; - - @Resource(name = "globalStngMapper") - private GlobalStngMapper globalStngMapper; - - /**단속 대장 정보를 등록한다. - * @param crdn 단속 대장 - * @return 저장 여부 - * - */ - public boolean insertCrdn(Crdn crdn) { - - int effected = crdn05Mapper.insertCrdn(crdn); - if(effected != 1) { - return false; - } - - effected = crdn05Mapper.insertCrdnAddition(crdn); - if(effected != 1) { - return false; - } - - return true; - - } - - -} 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 deleted file mode 100644 index 32136ad2..00000000 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java +++ /dev/null @@ -1,73 +0,0 @@ -package cokr.xit.fims.crdn.service.bean; - -import java.util.Map; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Component; - -import cokr.xit.fims.crdn.Crdn; -import cokr.xit.fims.crdn.dao.Crdn06Mapper; -import cokr.xit.foundation.AbstractComponent; - -/** 단속 관리 Bean - * @author leebj - */ -@Component("crdn06Bean") -public class Crdn06Bean extends AbstractComponent { - - @Resource(name = "crdn06Mapper") - private Crdn06Mapper crdn06Mapper; - - /**단속 대장 정보를 수정한다. - * @param nonQueryRequest 수정 요청, crdn 단속 대장 - * @return 저장 여부 - * - */ - public boolean update(Map nonQueryRequest, Crdn crdn) { - String updateInfomation = (String)ifEmpty(nonQueryRequest.get("updateInfomation"), "") ; - - switch (ifEmpty(updateInfomation, () -> "")) { - case "tagInformationUndefinedData": - return crdn06Mapper.updateTagInformation(crdn) == 1 ? true : false; - default: - return crdn06Mapper.updateCrdn(crdn) == 1 ? true : false; - } - } - - /**잔액을 계산한다. - * @param state 대장 자료 상태 - * @param advntceLevyAmt 사전통지부과금액 - * @param levyAmt 부과금액 - * @param minusAmt 감경금액 - * @param adtnAmt 가산금액 - * @param rcvmtAmt 수납금액 - * @return 잔액 - */ - public int getBalance(String state, int advntceLevyAmt, int levyAmt, int minusAmt, int adtnAmt, int rcvmtAmt) { - int result = 0; - if(Integer.parseInt(state) < Integer.parseInt("51")) { - result = advntceLevyAmt - rcvmtAmt - minusAmt; - } else if(state.equals("71") || - state.equals("72") || - state.equals("73") || - state.equals("74") || - state.equals("75") || - state.equals("76") || - state.equals("80") || - state.equals("81") || - state.equals("82") || - state.equals("83") || - state.equals("84") || - state.equals("85")) { - - } else { - result = levyAmt - rcvmtAmt - minusAmt + adtnAmt; - } - - return result; - } - -} 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 new file mode 100644 index 00000000..f7b7c46a --- /dev/null +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnBean.java @@ -0,0 +1,67 @@ +package cokr.xit.fims.crdn.service.bean; + +import java.util.Map; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Component; + +import cokr.xit.fims.crdn.Crdn; +import cokr.xit.fims.crdn.dao.CrdnInstMapper; +import cokr.xit.fims.crdn.dao.CrdnUpdtMapper; +import cokr.xit.foundation.AbstractComponent; + +/** 단속 관리 Bean + * @author leebj + */ +@Component("crdnBean") +public class CrdnBean extends AbstractComponent { + + @Resource(name = "crdnInstMapper") + private CrdnInstMapper crdnInstMapper; + + @Resource(name = "crdnUpdtMapper") + private CrdnUpdtMapper crdnUpdtMapper; + + /**단속 대장 정보를 등록한다. + * @param crdn 단속 대장 + * @return 저장 여부 + *
  • 저장됐으면 true
    • + *
  • 그렇지 않으면 false
    • + *
+ */ + public boolean insertCrdn(Crdn crdn) { + + int effected = crdnInstMapper.insertCrdn(crdn); + if(effected != 1) { + return false; + } + + effected = crdnInstMapper.insertCrdnAddition(crdn); + if(effected != 1) { + return false; + } + + return true; + + } + + /**단속 대장 정보를 수정한다. + * @param nonQueryRequest 수정 요청, crdn 단속 대장 + * @return 저장 여부 + *
  • 저장됐으면 true
    • + *
  • 그렇지 않으면 false
    • + *
+ */ + public boolean update(Map nonQueryRequest, Crdn crdn) { + String updateInfomation = (String)ifEmpty(nonQueryRequest.get("updateInfomation"), "") ; + + switch (ifEmpty(updateInfomation, () -> "")) { + case "tagInformationUndefinedData": + return crdnUpdtMapper.updateTagInformation(crdn) == 1 ? true : false; + default: + return crdnUpdtMapper.updateCrdn(crdn) == 1 ? true : false; + } + } + +} 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 6528d8ad..e7c4468b 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 @@ -17,9 +17,9 @@ import cokr.xit.fims.cmmn.CrdnSttsHstry; import cokr.xit.fims.cmmn.service.bean.CrdnSttsHstryBean; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnQuery; -import cokr.xit.fims.crdn.dao.Crdn05Mapper; -import cokr.xit.fims.crdn.dao.Crdn06Mapper; +import cokr.xit.fims.crdn.dao.CrdnInstMapper; import cokr.xit.fims.crdn.dao.CrdnListMapper; +import cokr.xit.fims.crdn.dao.CrdnUpdtMapper; import cokr.xit.fims.crdn.dao.GlobalStngMapper; import cokr.xit.fims.crdn.service.CrdnService; import cokr.xit.fims.cvlc.dao.CrdnCvlcptMapper; @@ -38,11 +38,11 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService @Resource(name="crdnListMapper") protected CrdnListMapper crdnListMapper; - @Resource(name="crdn05Mapper") - protected Crdn05Mapper crdn05Mapper; + @Resource(name="crdnInstMapper") + protected CrdnInstMapper crdnInstMapper; - @Resource(name="crdn06Mapper") - protected Crdn06Mapper crdn06Mapper; + @Resource(name="crdnUpdtMapper") + protected CrdnUpdtMapper crdnUpdtMapper; @Resource(name="globalStngMapper") protected GlobalStngMapper globalStngMapper; @@ -56,11 +56,8 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService @Resource(name="crdnCvlcptBean") protected CrdnCvlcptBean crdnCvlcptBean; - @Resource(name="crdn05Bean") - protected Crdn05Bean crdn05Bean; - - @Resource(name="crdn06Bean") - protected Crdn06Bean crdn06Bean; + @Resource(name="crdnBean") + protected CrdnBean crdnBean; @Resource(name="excl01Bean") protected Excl01Bean excl01Bean; @@ -110,7 +107,7 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService int adtnAmt = dataObject.number("ADTN_AMT").intValue(); int rcvmtAmt = dataObject.number("RCVMT_AMT").intValue(); - dataObject.set("BLNC", crdn06Bean.getBalance(state,advntceLevyAmt,levyAmt,minusAmt,adtnAmt,rcvmtAmt)); + dataObject.set("BLNC", crdnStngBean.getBalance(state,advntceLevyAmt,levyAmt,minusAmt,adtnAmt,rcvmtAmt)); } } else if(ifEmpty(query.getGridType(), () -> "").equals("photo")) { Iterator iterator = dataObjectList.iterator(); @@ -177,7 +174,7 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService String currentSggCd = globalStngMapper.selectSggCdForCurrentUser(); crdn.setSggCd(currentSggCd); - boolean result = crdn05Bean.insertCrdn(crdn); + boolean result = crdnBean.insertCrdn(crdn); SimpleDateFormat yyyyMMdd = new SimpleDateFormat("yyyyMMdd"); Date curTime = new Date(); @@ -229,7 +226,7 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService @Override public boolean update(Map nonQueryRequest, Crdn crdn, List newFileInfoList) { - return crdn06Bean.update(nonQueryRequest, crdn); + return crdnBean.update(nonQueryRequest, crdn); } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java index a20f1f15..b35f5a93 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java @@ -36,6 +36,39 @@ public class CrdnStngBean extends AbstractComponent { @Resource(name = "exmptnVhclMapper") private ExmptnVhclMapper exmptnVhclMapper; + /**잔액을 계산한다. + * @param state 대장 자료 상태 + * @param advntceLevyAmt 사전통지부과금액 + * @param levyAmt 부과금액 + * @param minusAmt 감경금액 + * @param adtnAmt 가산금액 + * @param rcvmtAmt 수납금액 + * @return 잔액 + */ + public int getBalance(String state, int advntceLevyAmt, int levyAmt, int minusAmt, int adtnAmt, int rcvmtAmt) { + int result = 0; + if(Integer.parseInt(state) < Integer.parseInt("51")) { + result = advntceLevyAmt - rcvmtAmt - minusAmt; + } else if(state.equals("71") || + state.equals("72") || + state.equals("73") || + state.equals("74") || + state.equals("75") || + state.equals("76") || + state.equals("80") || + state.equals("81") || + state.equals("82") || + state.equals("83") || + state.equals("84") || + state.equals("85")) { + + } else { + result = levyAmt - rcvmtAmt - minusAmt + adtnAmt; + } + + return result; + } + /**기본금액을 계산한다. * @param crdn 단속 정보 * @return 최초금액, 사전통지금액 diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java index b5c11e08..82f53ee3 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java @@ -19,7 +19,7 @@ import cokr.xit.base.file.web.FileInfoFactory; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnQuery; -import cokr.xit.fims.crdn.dao.Crdn05Mapper; +import cokr.xit.fims.crdn.dao.CrdnInstMapper; import cokr.xit.fims.crdn.dao.GlobalStngMapper; import cokr.xit.fims.crdn.service.CrdnService; import cokr.xit.fims.crdn.service.CrdnStngService; @@ -37,8 +37,8 @@ public class Crdn05Controller extends ApplicationController { @Resource(name="crdnStngService") private CrdnStngService crdnStngService; - @Resource(name="crdn05Mapper") - private Crdn05Mapper crdn05Mapper; + @Resource(name="crdnInstMapper") + private CrdnInstMapper crdnInstMapper; @Resource(name="globalStngMapper") protected GlobalStngMapper globalStngMapper; diff --git a/src/main/java/cokr/xit/fims/cvlc/CrdnCvlcpt.java b/src/main/java/cokr/xit/fims/cvlc/CrdnCvlcpt.java index 08f60935..ad8e4a1c 100644 --- a/src/main/java/cokr/xit/fims/cvlc/CrdnCvlcpt.java +++ b/src/main/java/cokr/xit/fims/cvlc/CrdnCvlcpt.java @@ -17,9 +17,9 @@ public class CrdnCvlcpt extends AbstractEntity { private java.lang.String cvlcptLinkId; /** - * 민원 입력 구분 코드 + * 방해 여부 */ - private java.lang.String cvlcptInptSeCd; + private java.lang.String dstrbncYn; /** * 민원 접수 일자 diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptBean.java index de0e3a31..1f36abde 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptBean.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptBean.java @@ -11,7 +11,8 @@ import org.springframework.stereotype.Component; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnQuery; -import cokr.xit.fims.crdn.dao.Crdn05Mapper; +import cokr.xit.fims.crdn.dao.CrdnInstMapper; +import cokr.xit.fims.crdn.dao.CrdnUpdtMapper; import cokr.xit.fims.crdn.dao.GlobalStngMapper; import cokr.xit.fims.cvlc.CrdnCvlcpt; import cokr.xit.fims.cvlc.dao.CrdnCvlcptMapper; @@ -28,8 +29,11 @@ public class CrdnCvlcptBean extends AbstractComponent { @Resource(name = "crdnCvlcptMapper") private CrdnCvlcptMapper crdnCvlcptMapper; - @Resource(name = "crdn05Mapper") - private Crdn05Mapper crdn05Mapper; + @Resource(name = "crdnInstMapper") + private CrdnInstMapper crdnInstMapper; + + @Resource(name = "crdnUpdtMapper") + private CrdnUpdtMapper crdnUpdtMapper; @Resource(name="globalStngMapper") protected GlobalStngMapper globalStngMapper; @@ -49,7 +53,7 @@ public class CrdnCvlcptBean extends AbstractComponent { paramMap.put("crdnIDs", crdnIdList); paramMap.put("removedBy", UserInfo.current().getId()); - return crdn05Mapper.removeCrdn(paramMap) == 1 ? true : false; + return crdnUpdtMapper.removeCrdn(paramMap) == 1 ? true : false; } /**민원 원본 정보를 조회한다. 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 7911ed23..6eec8808 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 @@ -26,11 +26,10 @@ import cokr.xit.fims.cmmn.hwp.AddingParagraphBetweenHWPFile; import cokr.xit.fims.cmmn.hwp.InsertingImageCell; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnQuery; -import cokr.xit.fims.crdn.dao.Crdn05Mapper; -import cokr.xit.fims.crdn.dao.Crdn06Mapper; import cokr.xit.fims.crdn.dao.CrdnInfoMapper; +import cokr.xit.fims.crdn.dao.CrdnInstMapper; +import cokr.xit.fims.crdn.dao.CrdnUpdtMapper; import cokr.xit.fims.crdn.dao.GlobalStngMapper; -import cokr.xit.fims.crdn.service.bean.Crdn05Bean; import cokr.xit.fims.crdn.service.bean.CrdnStngBean; import cokr.xit.fims.cvlc.CrdnCvlcpt; import cokr.xit.fims.cvlc.dao.CrdnCvlcptMapper; @@ -58,9 +57,6 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv @Resource(name="crdnStngBean") private CrdnStngBean crdnStngBean; - @Resource(name="crdn05Bean") - private Crdn05Bean crdn05Bean; - @Resource(name="excl01Bean") private Excl01Bean excl01Bean; @@ -76,11 +72,11 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv @Resource(name="crdnInfoMapper") private CrdnInfoMapper crdnInfoMapper; - @Resource(name="crdn05Mapper") - protected Crdn05Mapper crdn05Mapper; + @Resource(name="crdnInstMapper") + protected CrdnInstMapper crdnInstMapper; - @Resource(name="crdn06Mapper") - protected Crdn06Mapper crdn06Mapper; + @Resource(name="crdnUpdtMapper") + protected CrdnUpdtMapper crdnUpdtMapper; @Resource(name="globalStngMapper") protected GlobalStngMapper globalStngMapper; diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml index f034a1f1..b091c166 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml @@ -54,7 +54,7 @@ - + diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-inst-mapper.xml similarity index 93% rename from src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml rename to src/main/resources/sql/mapper/fims/crdn/crdn-inst-mapper.xml index e60b8958..fb77279b 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-inst-mapper.xml @@ -1,11 +1,9 @@ - - - + -/* 단속 대장 등록(crdn05Mapper.insertCrdn) */ +/* 단속 대장 등록(crdnInstMapper.insertCrdn) */ SELECT CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y'), LPAD(CAST(IFNULL(MAX(SUBSTRING(CRDN_ID,5)) + 1, 1) AS INT), 16, '0')) @@ -110,7 +108,7 @@ INSERT INTO TB_CRDN ( -/* 단속 부가 정보 등록(crdn05Mapper.insertCrdnAddition) */ +/* 단속 부가 정보 등록(crdnInstMapper.insertCrdnAddition) */ INSERT INTO TB_CRDN_ADI ( CRDN_ID , CRDN_SE_CD @@ -164,15 +162,4 @@ INSERT INTO TB_CRDN_ADI ( ) - - /* 단속자료 삭제(crdn05Mapper.removeCrdn) */ - UPDATE TB_CRDN - SET DEL_YN = 'Y' - , DEL_DT = /* 삭제일시 */ - , DLTR = #{removedBy} /* 삭제자 */ - WHERE CRDN_ID IN ( - #{crdnId} - ) - - \ No newline at end of file diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml index e57b1537..19f978f3 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml @@ -4,7 +4,7 @@ -/* 단속사진 검사 자료 목록 조회(crdn06Mapper.selectPhotoInspectionDataList) */ +/* 단속사진 검사 자료 목록 조회(crdnListMapper.selectPhotoInspectionDataList) */ SELECT C.CRDN_ID , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM @@ -222,7 +222,7 @@ AND C.CRDN_STTS_CD = #{crdnSttsCd} -/* 과태료 감경 자료 목록 조회(crdn06Mapper.selectFineReductionDataList) */ +/* 과태료 감경 자료 목록 조회(crdnListMapper.selectFineReductionDataList) */ SELECT C.CRDN_ID , SUBSTR(RD.REG_DT,1,8) AS RDUCT_YMD diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-updt-mapper.xml similarity index 81% rename from src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml rename to src/main/resources/sql/mapper/fims/crdn/crdn-updt-mapper.xml index 590fdd73..c899f33d 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-updt-mapper.xml @@ -1,9 +1,9 @@ - + - /* 표지정보확인 수정(crdn06Mapper.updateTagInformation) */ + /* 표지정보확인 수정(crdnUpdtMapper.updateTagInformation) */ UPDATE TB_CRDN_ADI SET PARKNG_PSBLTY_RSLT_CD = '1' , MDFCN_DT = /* 수정일시 */ @@ -12,7 +12,7 @@ - /* 단속정보 수정(crdn06Mapper.updateCrdn) */ + /* 단속정보 수정(crdnUpdtMapper.updateCrdn) */ UPDATE TB_CRDN SET MDFCN_DT = /* 수정일시 */ , MDFR = #{modifiedBy} /* 수정자 */ @@ -46,4 +46,15 @@ WHERE CRDN_ID = #{crdnId} /* 단속 ID */ + + /* 단속자료 삭제(crdnUpdtMapper.removeCrdn) */ + UPDATE TB_CRDN + SET DEL_YN = 'Y' + , DEL_DT = /* 삭제일시 */ + , DLTR = #{removedBy} /* 삭제자 */ + WHERE CRDN_ID IN ( + #{crdnId} + ) + + \ No newline at end of file diff --git a/src/main/resources/sql/mapper/fims/crdn/global-stng-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/global-stng-mapper.xml index e7fca631..92168e30 100644 --- a/src/main/resources/sql/mapper/fims/crdn/global-stng-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/global-stng-mapper.xml @@ -3,7 +3,7 @@