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 e00b9779..73ab6987 100644 --- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java +++ b/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java @@ -66,10 +66,10 @@ public interface Crdn01Mapper extends AbstractMapper { */ int insertCvlcpt(CrdnCvlcpt cvlcpt); - /** 단속민원을 수정한다. + /** 단속민원을 수용한다. * @param crdn 민원정보 * @return 저장된 정보 수 */ - int updateCvlcpt(CrdnCvlcpt cvlcpt); + int acceptCvlcpt(CrdnCvlcpt cvlcpt); } diff --git a/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java b/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java index 346e2679..ac359d0d 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java +++ b/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java @@ -37,6 +37,12 @@ public interface CrdnService { */ boolean update(Crdn crdn, List newFileInfoList); + /** 단속민원 부과요청을 수용한다. + * @param crdn 단속정보, newFileInfoList 업로드 파일 목록 + * @return 저장여부 + */ + boolean acceptCvlcpt(Crdn crdn, List newFileInfoList); + /** 한글 서식 출력물을 생성한다. * @param crdnQuery 출력 요청 * @return map 출력 요청 결과 @@ -52,4 +58,5 @@ public interface CrdnService { DataObject getCivilComplaintReceiptInitialDataInfo(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 0cb9c607..0bce319f 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 @@ -47,8 +47,8 @@ public class Crdn01Bean extends AbstractComponent { return crdn01Mapper.selectCivilComplaintOriginalInfo(crdnQuery); } - public boolean update(CrdnCvlcpt cvlcpt) { - return crdn01Mapper.updateCvlcpt(cvlcpt) == 1 ? true : false; + public boolean accept(CrdnCvlcpt cvlcpt) { + return crdn01Mapper.acceptCvlcpt(cvlcpt) == 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 405e1684..5abb59e9 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 @@ -319,7 +319,7 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService } @Override - public boolean update(Crdn crdn, List newFileInfoList) { + public boolean acceptCvlcpt(Crdn crdn, List newFileInfoList) { boolean saved; int fileInsertEffected = 0; @@ -341,7 +341,7 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService //crdnCvlcpt.set(crdn.get); //crdnCvlcpt.set(crdn.get); //crdnCvlcpt.set(crdn.get); - //saved = crdn01Bean.update(crdnCvlcpt); + saved = crdn01Bean.accept(crdnCvlcpt); } saved = crdn06Bean.update(crdn); @@ -422,4 +422,9 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService return result; } + @Override + public boolean update(Crdn crdn, List newFileInfoList) { + return crdn06Bean.update(crdn); + } + } 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 3940e8b8..f3899537 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java @@ -225,7 +225,7 @@ public class Crdn01Controller extends ApplicationController { .addObject("saved", saved); } - /**지정한 민원자료를 저장한다. + /**지정한 민원자료의 부과요청을 수용(저장)한다. * @param crdnId 단속대장 아이디 * @return jsonView *
 {
@@ -233,8 +233,8 @@ public class Crdn01Controller extends ApplicationController {
 	 *     "saved": 저장되었으면 true, 그렇지 않으면 false
 	 * }
*/ - @RequestMapping(name="민원자료 저장", value="/020/save.do") - public ModelAndView saveCivilComplaint(Crdn crdn, MultipartFile[] newFileList, MultipartFile[] modifyFileList) { + @RequestMapping(name="민원내용 수용", value="/020/save.do") + public ModelAndView acceptCivilComplaint(Crdn crdn, MultipartFile[] newFileList, MultipartFile[] modifyFileList) { boolean saved = false; @@ -263,7 +263,7 @@ public class Crdn01Controller extends ApplicationController { } crdn.setCvlcptLinkYn("Y"); - saved = crdnService.update(crdn, newFileInfoList); + saved = crdnService.acceptCvlcpt(crdn, newFileInfoList); return new ModelAndView("jsonView") .addObject("saved", saved); 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 c279851c..32e3f4f6 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml @@ -399,10 +399,16 @@ INSERT INTO TB_CRDN_CVLCPT ( , #{delRsn} ) - - /* 민원정보 수정(crdn01Mapper.updateCvlcpt) */ - UPDATE TB_CRDN_CVLCPT - SET MDFCN_DT = /* 수정일시 */ + + /* 단속민원 수용(crdn01Mapper.acceptCvlcpt) */ + UPDATE TB_CRDN_CVLCPT + SET CVLCPT_PRCS_CMPTN_DT = + , CVLCPT_PRCS_CD = '01' + , CVLCPT_TRSM_CD = #{cvlcptTrsmCd} + , CVLCPT_PRCS_SUMRY = #{cvlcptPrcsSumry} + , CVLCPT_PRCS_RSLT_CN = #{cvlcptPrcsRsltCn} + , CVLCPT_PRCS_PIC = #{modifiedBy} + , MDFCN_DT = /* 수정일시 */ , MDFR = #{modifiedBy} /* 수정자 */ WHERE CVLCPT_LINK_ID = #{linkId} /* 연계 ID */