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 36b6c34f..90519ce5 100644 --- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java +++ b/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java @@ -16,21 +16,21 @@ import cokr.xit.foundation.data.DataObject; public interface Crdn01Mapper extends AbstractMapper { /**민원자료 목록을 조회한다.
- * {@link cokr.xit.fims.crdn.service.Crdn01Service#getCrackdownList(CrdnQuery)} 참고 + * {@link cokr.xit.fims.crdn.service.bean.Crdn01ServiceBean#getCrackdownList(CrdnQuery)} 참고 * @param req 민원자료 목록 조회 조건 * @return 민원자료 목록 */ List selectCivilComplaintList(CrdnQuery req); /**민원접수자료 목록을 조회한다.
- * {@link cokr.xit.fims.crdn.service.Crdn01Service#getCrackdownList(CrdnQuery)} 참고 + * {@link cokr.xit.fims.crdn.service.bean.Crdn01ServiceBean#getCrackdownList(CrdnQuery)} 참고 * @param req 민원접수자료 목록 조회 조건 * @return 민원접수자료 목록 */ List selectCivilComplaintReceiptDataList(CrdnQuery req); /**민원답변대상자료 목록을 조회한다.
- * {@link cokr.xit.fims.crdn.service.Crdn01Service#getCrackdownList(CrdnQuery)} 참고 + * {@link cokr.xit.fims.crdn.service.bean.Crdn01ServiceBean#getCrackdownList(CrdnQuery)} 참고 * @param req 민원답변대상자료 목록 조회 조건 * @return 민원답변대상자료 목록 */ diff --git a/src/main/java/cokr/xit/fims/crdn/dao/Crdn05Mapper.java b/src/main/java/cokr/xit/fims/crdn/dao/Crdn05Mapper.java index ab1e2259..9f396174 100644 --- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn05Mapper.java +++ b/src/main/java/cokr/xit/fims/crdn/dao/Crdn05Mapper.java @@ -17,7 +17,7 @@ import cokr.xit.foundation.data.DataObject; public interface Crdn05Mapper extends AbstractMapper { /**단속자료 목록을 조회한다.
- * {@link cokr.xit.fims.crdn.service.Crdn05Service#getCrackdownList(CrdnQuery)} 참고 + * {@link cokr.xit.fims.crdn.service.bean.Crdn05ServiceBean#getCrackdownList(CrdnQuery)} 참고 * @param req 단속자료 목록 조회 조건 * @return 단속자료 목록 */ @@ -44,7 +44,7 @@ public interface Crdn05Mapper extends AbstractMapper { } /**기본금액을 조회한다.
- * {@link cokr.xit.fims.crdn.service.Crdn05Service#getBasicAmt(CrdnQuery)} 참고 + * {@link cokr.xit.fims.crdn.service.bean.Crdn05Bean#getBasicAmt(CrdnQuery)} 참고 * @param query 단속자료 정보 * @return 기본금액 */ diff --git a/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java b/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java index 18777815..1021e58a 100644 --- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java +++ b/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java @@ -18,35 +18,35 @@ import cokr.xit.foundation.data.DataObject; public interface Crdn06Mapper extends AbstractMapper { /**단속자료 목록을 조회한다.
- * {@link cokr.xit.fims.crdn.service.Crdn06Service#getCrackdownList(CrdnQuery)} 참고 + * {@link cokr.xit.fims.crdn.service.bean.Crdn06ServiceBean#getCrackdownList(CrdnQuery)} 참고 * @param req 단속자료 목록 조회 조건 * @return 단속자료 목록 */ List selectCrackdownList(CrdnQuery req); /**단속사진 검사 자료 목록을 조회한다.
- * {@link cokr.xit.fims.crdn.service.Crdn06Service#getCrackdownList(CrdnQuery)} 참고 + * {@link cokr.xit.fims.crdn.service.bean.Crdn06ServiceBean#getCrackdownList(CrdnQuery)} 참고 * @param req 단속사진 검사 자료 목록 조회 조건 * @return 단속사진 검사 자료 목록 */ List selectPhotoInspectionDataList(CrdnQuery setOrderBy); /**동일 차량 단속 그룹 목록을 조회한다.
- * {@link cokr.xit.fims.crdn.service.Crdn06Service#getCrackdownList(CrdnQuery)} 참고 + * {@link cokr.xit.fims.crdn.service.bean.Crdn06ServiceBean#getCrackdownList(CrdnQuery)} 참고 * @param req 동일 차량 단속 그룹 목록 조회 조건 * @return 동일 차량 단속 그룹 목록 */ List selectSameVehicleMainList(CrdnQuery setOrderBy); /**동일 차량 단속 자료 목록을 조회한다.
- * {@link cokr.xit.fims.crdn.service.Crdn06Service#getCrackdownList(CrdnQuery)} 참고 + * {@link cokr.xit.fims.crdn.service.bean.Crdn06ServiceBean#getCrackdownList(CrdnQuery)} 참고 * @param req 동일 차량 단속 자료 목록 조회 조건 * @return 동일 차량 단속 자료 목록 */ List selectSameVehicleSubList(CrdnQuery setOrderBy); /**표지정보 미확인 자료 목록을 조회한다.
- * {@link cokr.xit.fims.crdn.service.Crdn06Service#getCrackdownList(CrdnQuery)} 참고 + * {@link cokr.xit.fims.crdn.service.bean.Crdn06ServiceBean#getCrackdownList(CrdnQuery)} 참고 * @param req 표지정보 미확인 자료 목록 조회 조건 * @return 표지정보 미확인 자료 목록 */ @@ -73,7 +73,7 @@ public interface Crdn06Mapper extends AbstractMapper { } /**과태료 감경 자료 목록을 조회한다.
- * {@link cokr.xit.fims.crdn.service.Crdn06Service#getCrackdownList(CrdnQuery)} 참고 + * {@link cokr.xit.fims.crdn.service.bean.Crdn06ServiceBean#getCrackdownList(CrdnQuery)} 참고 * @param req 과태료 감경 자료 목록 조회 조건 * @return 과태료 감경 자료 목록 */ diff --git a/src/main/java/cokr/xit/fims/crdn/service/Crdn01Service.java b/src/main/java/cokr/xit/fims/crdn/service/Crdn01Service.java deleted file mode 100644 index 7228e5f3..00000000 --- a/src/main/java/cokr/xit/fims/crdn/service/Crdn01Service.java +++ /dev/null @@ -1,19 +0,0 @@ -package cokr.xit.fims.crdn.service; - -/**민원 관리 서비스를 제공한다. - *
    - *
- * @author leebj - */ -public interface Crdn01Service extends CrdnService { - - /**민원자료를 삭제한다. - * @param crdn 단속정보 - * @return 저장 여부 - *
  • 저장됐으면 true
  • - *
  • 그렇지 않으면 false
  • - *
- */ - boolean removeCivilComplaint(String... crdnIDs); - -} diff --git a/src/main/java/cokr/xit/fims/crdn/service/Crdn02Service.java b/src/main/java/cokr/xit/fims/crdn/service/Crdn02Service.java deleted file mode 100644 index 62458c5a..00000000 --- a/src/main/java/cokr/xit/fims/crdn/service/Crdn02Service.java +++ /dev/null @@ -1,10 +0,0 @@ -package cokr.xit.fims.crdn.service; - -/**민원 개별 등록 서비스를 제공한다. - *
    - *
- * @author leebj - */ -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 deleted file mode 100644 index 0ade79bd..00000000 --- a/src/main/java/cokr/xit/fims/crdn/service/Crdn05Service.java +++ /dev/null @@ -1,26 +0,0 @@ -package cokr.xit.fims.crdn.service; - -import java.util.List; - -import cokr.xit.base.file.FileInfo; -import cokr.xit.fims.crdn.Crdn; - -/**단속 자료 등록 서비스를 제공한다. - *
    - *
- * @author leebj - */ -public interface Crdn05Service extends CrdnService { - - /**단속 대장 정보를 등록한다. - * @param crdn05 단속 대장 - * @return 저장 여부 - *
  • 저장됐으면 true
  • - *
  • 그렇지 않으면 false
  • - *
- */ - boolean create(Crdn crdn, List fileInfoList); - - boolean create(Crdn crdn); - -} diff --git a/src/main/java/cokr/xit/fims/crdn/service/Crdn06Service.java b/src/main/java/cokr/xit/fims/crdn/service/Crdn06Service.java deleted file mode 100644 index f0d1225e..00000000 --- a/src/main/java/cokr/xit/fims/crdn/service/Crdn06Service.java +++ /dev/null @@ -1,26 +0,0 @@ -package cokr.xit.fims.crdn.service; - -import java.util.List; - -import cokr.xit.fims.crdn.Crdn; -import cokr.xit.fims.crdn.CrdnQuery; -import cokr.xit.foundation.data.DataObject; - -/**단속 관리 서비스를 제공한다. - *
    - *
  • {@link #getCrackdownList(CrdnQuery) 단속자료 목록 조회}
  • - *
- * @author leebj - */ -public interface Crdn06Service extends CrdnService { - - - /**단속 대장 정보를 수정한다. - * @param crdn 단속 대장 - * @return 저장 여부 - *
  • 저장됐으면 true
  • - *
  • 그렇지 않으면 false
  • - *
- */ - boolean update(Crdn crdn); -} 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 858592b3..6adcc360 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 @@ -8,7 +8,7 @@ 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.fims.crdn.service.CrdnService; import cokr.xit.foundation.component.AbstractServiceBean; import cokr.xit.foundation.data.DataObject; @@ -16,7 +16,7 @@ import cokr.xit.foundation.data.DataObject; * @author leebj */ @Service("crdn01Service") -public class Crdn01ServiceBean extends AbstractServiceBean implements Crdn01Service { +public class Crdn01ServiceBean extends AbstractServiceBean implements CrdnService { @Resource(name="crdn01Mapper") protected Crdn01Mapper crdn01Mapper; @@ -39,9 +39,5 @@ public class Crdn01ServiceBean extends AbstractServiceBean implements Crdn01Serv } - @Override - public boolean removeCivilComplaint(String... crdnIDs) { - return crdn01Bean.removeCivilComplaint(crdnIDs); - } } 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 2ba7cd88..9ecf392f 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 @@ -7,7 +7,7 @@ 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.fims.crdn.service.CrdnService; import cokr.xit.foundation.component.AbstractServiceBean; import cokr.xit.foundation.data.DataObject; @@ -15,7 +15,7 @@ import cokr.xit.foundation.data.DataObject; * @author leebj */ @Service("crdn02Service") -public class Crdn02ServiceBean extends AbstractServiceBean implements Crdn02Service { +public class Crdn02ServiceBean extends AbstractServiceBean implements CrdnService { /** 민원 개별 등록 Bean */ @Resource(name="crdn02Bean") 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 index 694c7459..1aaa53a3 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05Bean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05Bean.java @@ -1,10 +1,14 @@ package cokr.xit.fims.crdn.service.bean; +import java.util.List; + import javax.annotation.Resource; import org.assertj.core.util.Arrays; import org.springframework.stereotype.Component; +import cokr.xit.base.file.FileInfo; +import cokr.xit.base.file.service.bean.FileBean; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.dao.Crdn05Mapper; @@ -21,9 +25,21 @@ public class Crdn05Bean extends AbstractComponent { public String[] CAR_GROUP2 = {"11","13"}; //승용자동차등 public String[] CAR_GROUP3 = {"31"}; //이륜자동차등 + @Resource(name="fileBean") + private FileBean fileBean; + @Resource(name = "crdn05Mapper") private Crdn05Mapper crdn05Mapper; + + public boolean create(Crdn crdn, List fileInfoList) { + crdn.setAtchFileCnt(fileInfoList.size()); + boolean saved = this.create(crdn); + fileInfoList.forEach(fileInfo -> fileInfo.setInfoType(Crdn.INF_TYPE).setInfoKey(crdn.getCrdnId())); + fileBean.create(fileInfoList); + return saved; + } + /**단속 대장 정보를 등록한다. * @param crdn 단속 대장 * @return 저장 여부 @@ -32,6 +48,30 @@ public class Crdn05Bean extends AbstractComponent { * */ public boolean create(Crdn crdn) { + + if(ifEmpty(crdn.getAtchFileCnt(), () -> 0) == 0) { + crdn.setAtchFileCnt(0); + } + + int basicAmt = this.getBasicAmt(crdn); + crdn.setFfnlgAmt(basicAmt); + crdn.setLevyAmt(basicAmt); + + boolean isPenaltyAmt = crdn.getTaskSeCd().equals("TPV") + && (crdn.getFfnlgCarmdlCd().equals("13") || crdn.getFfnlgCarmdlCd().equals("14")); //과징금 + + if(crdn.getTaskSeCd().equals("BPV") || isPenaltyAmt) { + crdn.setAdvntceLevyAmt(basicAmt); + } else { + crdn.setAdvntceLevyAmt((int)(basicAmt * 0.8)); + } + + if(ifEmpty(crdn.getDoGuidance(), () -> "").equals("on")) { + crdn.setCrdnSttsCd("83"); + } else { + crdn.setCrdnSttsCd("01"); + } + return crdn05Mapper.insert(crdn); } 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 23383fc8..28739dab 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 @@ -6,12 +6,10 @@ import javax.annotation.Resource; import org.springframework.stereotype.Service; -import cokr.xit.base.file.FileInfo; import cokr.xit.base.file.service.bean.FileBean; -import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.dao.Crdn05Mapper; -import cokr.xit.fims.crdn.service.Crdn05Service; +import cokr.xit.fims.crdn.service.CrdnService; import cokr.xit.foundation.component.AbstractServiceBean; import cokr.xit.foundation.data.DataObject; @@ -19,7 +17,7 @@ import cokr.xit.foundation.data.DataObject; * @author leebj */ @Service("crdn05Service") -public class Crdn05ServiceBean extends AbstractServiceBean implements Crdn05Service { +public class Crdn05ServiceBean extends AbstractServiceBean implements CrdnService { @Resource(name="crdn05Mapper") protected Crdn05Mapper crdn05Mapper; @@ -38,41 +36,5 @@ public class Crdn05ServiceBean extends AbstractServiceBean implements Crdn05Serv return crdn05Mapper.selectCrackdownList(req); } - @Override - public boolean create(Crdn crdn, List fileInfoList) { - crdn.setAtchFileCnt(fileInfoList.size()); - boolean saved = this.create(crdn); - fileInfoList.forEach(fileInfo -> fileInfo.setInfoType(Crdn.INF_TYPE).setInfoKey(crdn.getCrdnId())); - fileBean.create(fileInfoList); - return saved; - } - - @Override - public boolean create(Crdn crdn) { - if(ifEmpty(crdn.getAtchFileCnt(), () -> 0) == 0) { - crdn.setAtchFileCnt(0); - } - - int basicAmt = crdn05Bean.getBasicAmt(crdn); - crdn.setFfnlgAmt(basicAmt); - crdn.setLevyAmt(basicAmt); - boolean isPenaltyAmt = crdn.getTaskSeCd().equals("TPV") - && (crdn.getFfnlgCarmdlCd().equals("13") || crdn.getFfnlgCarmdlCd().equals("14")); //과징금 - - if(crdn.getTaskSeCd().equals("BPV") || isPenaltyAmt) { - crdn.setAdvntceLevyAmt(basicAmt); - } else { - crdn.setAdvntceLevyAmt((int)(basicAmt * 0.8)); - } - - if(ifEmpty(crdn.getDoGuidance(), () -> "").equals("on")) { - crdn.setCrdnSttsCd("83"); - } else { - crdn.setCrdnSttsCd("01"); - } - - boolean saved = crdn05Bean.create(crdn); - return saved; - } } 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 d4f1b8d5..3a8f70f5 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,10 +8,9 @@ import javax.annotation.Resource; 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.fims.crdn.service.CrdnService; import cokr.xit.foundation.component.AbstractServiceBean; import cokr.xit.foundation.data.DataObject; @@ -19,7 +18,7 @@ import cokr.xit.foundation.data.DataObject; * @author leebj */ @Service("crdn06Service") -public class Crdn06ServiceBean extends AbstractServiceBean implements Crdn06Service { +public class Crdn06ServiceBean extends AbstractServiceBean implements CrdnService { @Resource(name="crdn06Mapper") protected Crdn06Mapper crdn06Mapper; @@ -28,11 +27,6 @@ public class Crdn06ServiceBean extends AbstractServiceBean implements Crdn06Serv @Resource(name="crdn06Bean") protected Crdn06Bean crdn06Bean; - @Override - public boolean update(Crdn crdn) { - return crdn06Bean.update(crdn); - } - @Override public List getCrackdownList(CrdnQuery req) { List dataObjectList = new ArrayList(); 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 1d5c7eda..40472b80 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java @@ -12,7 +12,9 @@ import cokr.xit.base.code.CommonCode; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnQuery; -import cokr.xit.fims.crdn.service.Crdn01Service; +import cokr.xit.fims.crdn.service.CrdnService; +import cokr.xit.fims.crdn.service.bean.Crdn01Bean; +import cokr.xit.fims.crdn.service.bean.Crdn01ServiceBean; import cokr.xit.foundation.UserInfo; /**민원 관리 서비스 웹 컨트롤러.
@@ -21,8 +23,11 @@ import cokr.xit.foundation.UserInfo; */ public class Crdn01Controller extends ApplicationController { + @Resource(name="crdn01Bean") + private Crdn01Bean crdn01Bean; + @Resource(name="crdn01Service") - private Crdn01Service crdn01Service; + private CrdnService crdn01Service; /** 민원 접수 자료 메인화면을 연다. * @return fims/crdn/crdn01010-main @@ -71,7 +76,7 @@ public class Crdn01Controller extends ApplicationController { } /**민원접수자료 목록을 조회한다.
- * {@link Crdn01Service#getCrackdownList(CrdnQuery)} 참고 + * {@link Crdn01ServiceBean#getCrackdownList(CrdnQuery)} 참고 * @param req 민원접수자료 목록 조회 조건 * @return jsonView *
 {
@@ -93,7 +98,7 @@ public class Crdn01Controller extends ApplicationController {
 	}
 
 	/**민원답변대상자료 목록을 조회한다.
- * {@link Crdn01Service#getCrackdownList(CrdnQuery)} 참고 + * {@link Crdn01ServiceBean#getCrackdownList(CrdnQuery)} 참고 * @param req 민원답변대상자료 목록 조회 조건 * @return jsonView *
 {
@@ -115,7 +120,7 @@ public class Crdn01Controller extends ApplicationController {
 	}
 
 	/**민원자료 목록을 조회한다.
- * {@link Crdn01Service#getCrackdownList(CrdnQuery)} 참고 + * {@link Crdn01ServiceBean#getCrackdownList(CrdnQuery)} 참고 * @param req 민원자료 목록 조회 조건 * @return jsonView *
 {
@@ -145,7 +150,7 @@ public class Crdn01Controller extends ApplicationController {
 	 */
 	@RequestMapping(name="민원자료 제거", value="/010/remove.do")
 	public ModelAndView removeCivilComplaint(Crdn crdn) {
-		boolean saved = crdn01Service.removeCivilComplaint(crdn.getCrdnIDs());
+		boolean saved = crdn01Bean.removeCivilComplaint(crdn.getCrdnIDs());
 
 		return new ModelAndView("jsonView")
 			.addObject("saved", saved);
diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java
index 8a2d5adb..c79225d5 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java
@@ -2,11 +2,10 @@ package cokr.xit.fims.crdn.web;
 
 import javax.annotation.Resource;
 
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 
 import cokr.xit.base.web.ApplicationController;
-import cokr.xit.fims.crdn.service.Crdn02Service;
+import cokr.xit.fims.crdn.service.CrdnService;
 
 /**민원 개별 등록 서비스 웹 컨트롤러.
* {웹 컨텍스트}/crdn/crdn02 로 접근할 수 있다. @@ -15,7 +14,7 @@ import cokr.xit.fims.crdn.service.Crdn02Service; public class Crdn02Controller extends ApplicationController { @Resource(name="crdn02Service") - private Crdn02Service crdn02Service; + private CrdnService crdn02Service; /** 민원 개별 등록 메인화면을 연다. * @return fims/crdn/crdn02010-main 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 fd9600be..488fd621 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java @@ -17,7 +17,9 @@ 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.service.Crdn05Service; +import cokr.xit.fims.crdn.service.CrdnService; +import cokr.xit.fims.crdn.service.bean.Crdn05Bean; +import cokr.xit.fims.crdn.service.bean.Crdn05ServiceBean; /**단속 자료 등록 서비스 웹 컨트롤러.
* {웹 컨텍스트}/crdn/crdn05 로 접근할 수 있다. @@ -25,8 +27,11 @@ import cokr.xit.fims.crdn.service.Crdn05Service; */ public class Crdn05Controller extends ApplicationController { + @Resource(name="crdn05Bean") + private Crdn05Bean crdn05Bean; + @Resource(name="crdn05Service") - private Crdn05Service crdn05Service; + private CrdnService crdn05Service; /** 단속 자료 등록 메인화면을 연다. * @return fims/crdn/crdn05010-main @@ -52,7 +57,7 @@ public class Crdn05Controller extends ApplicationController { } /**당일 등록한 단속자료 목록을 조회한다. - * {@link Crdn05Service#getCrackdownList(CrdnQuery)} 참고 + * {@link Crdn05ServiceBean#getCrackdownList(CrdnQuery)} 참고 * @param req 단속자료 목록 조회 조건 * @return jsonView *
 {
@@ -133,9 +138,9 @@ public class Crdn05Controller extends ApplicationController {
 
 		if(uploadFileList != null) {
 			List fileInfoList = new FileInfoFactory().makeFileInfos(null, uploadFileList);
-			saved = crdn05Service.create(crdn, fileInfoList);
+			saved = crdn05Bean.create(crdn, fileInfoList);
 		} else {
-			saved = crdn05Service.create(crdn);
+			saved = crdn05Bean.create(crdn);
 		}
 
 		return new ModelAndView("jsonView")
diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java
index e12ca148..b6d225aa 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java
@@ -11,7 +11,8 @@ import org.springframework.web.servlet.ModelAndView;
 import cokr.xit.base.code.CommonCode;
 import cokr.xit.base.web.ApplicationController;
 import cokr.xit.fims.crdn.CrdnQuery;
-import cokr.xit.fims.crdn.service.Crdn06Service;
+import cokr.xit.fims.crdn.service.CrdnService;
+import cokr.xit.fims.crdn.service.bean.Crdn06ServiceBean;
 
 /**단속 관리 서비스 웹 컨트롤러.
* {웹 컨텍스트}/crdn/crdn06 로 접근할 수 있다. @@ -20,7 +21,7 @@ import cokr.xit.fims.crdn.service.Crdn06Service; public class Crdn06Controller extends ApplicationController { @Resource(name="crdn06Service") - private Crdn06Service crdn06Service; + private CrdnService crdn06Service; /** 단속 관리 메인화면을 연다. * @return fims/crdn/crdn06010-main @@ -86,7 +87,7 @@ public class Crdn06Controller extends ApplicationController { } /**단속자료 목록을 조회한다.
- * {@link Crdn06Service#getCrackdownList(CrdnQuery)} 참고 + * {@link Crdn06ServiceBean#getCrackdownList(CrdnQuery)} 참고 * @param req 단속자료 목록 조회 조건 * @return jsonView *
 {
@@ -107,7 +108,7 @@ public class Crdn06Controller extends ApplicationController {
 	}
 
 	/**검사자료 목록을 조회한다.
- * {@link Crdn06Service#getCrackdownList(CrdnQuery)} 참고 + * {@link Crdn06ServiceBean#getCrackdownList(CrdnQuery)} 참고 * @param req 검사자료 목록 조회 조건 * @return jsonView *
 {
@@ -133,7 +134,7 @@ public class Crdn06Controller extends ApplicationController {
 	}
 
 	/**감경자료 목록을 조회한다.
- * {@link Crdn06Service#getCrackdownList(CrdnQuery)} 참고 + * {@link Crdn06ServiceBean#getCrackdownList(CrdnQuery)} 참고 * @param req 감경자료 목록 조회 조건 * @return jsonView *
 {
diff --git a/src/main/java/cokr/xit/fims/task/DpvController.java b/src/main/java/cokr/xit/fims/task/DpvController.java
index 3bdbf279..7cd473fb 100644
--- a/src/main/java/cokr/xit/fims/task/DpvController.java
+++ b/src/main/java/cokr/xit/fims/task/DpvController.java
@@ -1,13 +1,16 @@
 package cokr.xit.fims.task;
 
 import javax.annotation.Resource;
+
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
+
 import cokr.xit.fims.crdn.Crdn;
 import cokr.xit.fims.crdn.CrdnQuery;
-import cokr.xit.fims.crdn.service.Crdn06Service;
+import cokr.xit.fims.crdn.service.CrdnService;
+import cokr.xit.fims.crdn.service.bean.Crdn06Bean;
 
 @Controller
 public class DpvController {
@@ -28,7 +31,10 @@ public class DpvController {
 	@RequestMapping(name="장애인과태료업무 단속업무", value="/DPV/crdn/crdn06")
 	class Crdn06Controller extends cokr.xit.fims.crdn.web.Crdn06Controller {
 		@Resource(name="crdn06Service")
-		private Crdn06Service crdn06Service;
+		private CrdnService crdn06Service;
+
+		@Resource(name="crdn06Bean")
+		private Crdn06Bean crdn06Bean;
 
 		/**표지정보미확인자료 목록을 조회한다.
* {@link Crdn06Service#getCrackdownList(CrdnQuery)} 참고 @@ -62,7 +68,7 @@ public class DpvController { @PostMapping(name = "단속 대장 수정", value = "/030/update.do") public ModelAndView update(Crdn crdn) { crdn.setUpdateInfomation("tagInformationUndefinedData"); - boolean saved = crdn06Service.update(crdn); + boolean saved = crdn06Bean.update(crdn); return new ModelAndView("jsonView") .addObject("saved", saved); }