diff --git a/src/main/java/cokr/xit/fims/sprt/dao/OtptStngMapper.java b/src/main/java/cokr/xit/fims/sprt/dao/OtptStngMapper.java index 9154c6f5..9c6de632 100644 --- a/src/main/java/cokr/xit/fims/sprt/dao/OtptStngMapper.java +++ b/src/main/java/cokr/xit/fims/sprt/dao/OtptStngMapper.java @@ -13,16 +13,16 @@ import cokr.xit.foundation.data.DataObject; @Mapper("otptStngMapper") public interface OtptStngMapper extends AbstractMapper { - /**지정한 조건에 따라 출력물 설정을 조회한다..
+ /**지정한 조건에 따라 출력 항목 설정을 조회한다..
* @param query 출력물 설정 조회 조건 * @return 출력물 설정 항목 */ - List selectOtptStngList(OtptStngQuery query); + List selectOtptArtclStngList(OtptStngQuery query); - int updateStng(OtptStng update); + int updateArtclStng(OtptStng update); - int deleteStng(OtptForm otptForm); + int deleteArtclStng(OtptForm otptForm); - int insertStng(OtptStng insert); + int insertArtclStng(OtptStng insert); } diff --git a/src/main/java/cokr/xit/fims/sprt/service/bean/OtptStngBean.java b/src/main/java/cokr/xit/fims/sprt/service/bean/OtptStngBean.java index 99b0de08..d0fa5fb0 100644 --- a/src/main/java/cokr/xit/fims/sprt/service/bean/OtptStngBean.java +++ b/src/main/java/cokr/xit/fims/sprt/service/bean/OtptStngBean.java @@ -25,7 +25,7 @@ public class OtptStngBean extends AbstractComponent { @Resource(name = "otptStngMapper") private OtptStngMapper otptStngMapper; - public Map getOtptStngMap(OtptStngQuery query){ + public Map getOtptArtclStngMap(OtptStngQuery query){ Map otptStngMap = new HashMap(); PDFFormat pdfFormat = null; @@ -35,7 +35,7 @@ public class OtptStngBean extends AbstractComponent { break; } - List otptStngList = otptStngMapper.selectOtptStngList(query); + List otptStngList = otptStngMapper.selectOtptArtclStngList(query); if(otptStngList == null) { otptStngList = new ArrayList(); } @@ -77,7 +77,7 @@ public class OtptStngBean extends AbstractComponent { if(!updateList.isEmpty()) { for(OtptStng update : updateList) { update.setModifiedBy(userId); - int u = otptStngMapper.updateStng(update); + int u = otptStngMapper.updateArtclStng(update); updateKeyList.add(update.getOtptFormId()); } } @@ -88,12 +88,12 @@ public class OtptStngBean extends AbstractComponent { otptForm.setOtptFormIDs(updateKeyList.toArray(new String[updateKeyList.size()])); } otptForm.setModifiedBy(userId); - int d = otptStngMapper.deleteStng(otptForm); + int d = otptStngMapper.deleteArtclStng(otptForm); if(!insertList.isEmpty()) { for(OtptStng insert : insertList) { insert.setCreatedBy(userId); - int i = otptStngMapper.insertStng(insert); + int i = otptStngMapper.insertArtclStng(insert); } } } catch (Exception e) { diff --git a/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt01ServiceBean.java b/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt01ServiceBean.java index 4efa70c5..86e5b209 100644 --- a/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt01ServiceBean.java +++ b/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt01ServiceBean.java @@ -348,7 +348,7 @@ public class Sprt01ServiceBean extends AbstractServiceBean implements Sprt01Serv otptStngQuery.setSndngSeCd(sndngSeCd); otptStngQuery.setPaperSeCd(paperSeCd); - List otptStng = otptStngMapper.selectOtptStngList(otptStngQuery); + List otptStng = otptStngMapper.selectOtptArtclStngList(otptStngQuery); for(DataObject dataObject : dataObjectList) { //페이지생성(건별) diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java index 726f7acc..e4efd17a 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java @@ -445,9 +445,9 @@ public class Sprt01Controller extends ApplicationController { ModelAndView mav = new ModelAndView("jsonView"); - Map otptStngMap = otptStngBean.getOtptStngMap(otptStngQuery); + Map otptArtclStngMap = otptStngBean.getOtptArtclStngMap(otptStngQuery); - mav.addObject("otptStngMap", otptStngMap); + mav.addObject("otptArtclStngMap", otptArtclStngMap); String institute = currentUser().getInstitute(); String account = currentUser().getAccount(); diff --git a/src/main/resources/sql/mapper/fims/sprt/otptStng-mapper.xml b/src/main/resources/sql/mapper/fims/sprt/otptStng-mapper.xml index de137f5f..22431517 100644 --- a/src/main/resources/sql/mapper/fims/sprt/otptStng-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sprt/otptStng-mapper.xml @@ -2,8 +2,8 @@ - +/* 출력 항목 설정 조회(otptStngMapper.selectOtptArtclStngList) */ SELECT OTPT_FORM_ID , SGG_CD , TASK_SE_CD @@ -25,10 +25,11 @@ SELECT OTPT_FORM_ID AND TASK_SE_CD = #{taskSeCd} AND SNDNG_SE_CD = #{sndngSeCd} AND PAPER_SE_CD = #{paperSeCd} + ORDER BY OTPT_ARTCL_ORDR - -/* 출력 설정 등록(otptStngMapper.insertStng) */ + +/* 출력 설정 등록(otptStngMapper.insertArtclStng) */ SELECT LPAD(CAST(IFNULL(MAX(OTPT_FORM_ID) + 1, 1) AS INT), 10, '0') @@ -79,8 +80,8 @@ INSERT ) - -/* 출력 설정 수정(otptStngMapper.updateStng) */ + +/* 출력 설정 수정(otptStngMapper.updateArtclStng) */ UPDATE TB_OTPT_FORM_STNG SET OTPT_ARTCL_NM = #{otptArtclNm} , LEFT_PSTN = #{leftPstn} @@ -99,8 +100,8 @@ UPDATE TB_OTPT_FORM_STNG AND USE_YN = 'Y' - -/* 출력 설정 삭제(otptStngMapper.deleteStng) */ + +/* 출력 설정 삭제(otptStngMapper.deleteArtclStng) */ UPDATE TB_OTPT_FORM_STNG SET USE_YN = 'N' , MDFCN_DT = diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01200-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01200-main.jsp index 379c4fc6..39912a84 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01200-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01200-main.jsp @@ -225,7 +225,7 @@ $(document).ready(function(){ var $P = pageObject["${pageName}"]; - $P.otptStngMap = {}; + $P.otptArtclStngMap = {}; $("#btnSave--${pageName}").attr("disabled","disabled"); $("#btnUniqueAdd--${pageName}").attr("disabled","disabled"); @@ -255,14 +255,14 @@ $(document).ready(function(){ $("#frmEdit--${pageName}").find("[name='paperSeCd']").val(query.paperSeCd); $("#currentOtpt--${pageName}").text(resp.otptStngTitle); - $P.otptStngMap = resp.otptStngMap; + $P.otptArtclStngMap = resp.otptArtclStngMap; $P.renderOtptStngGrid("tbodyUnique--${pageName}", - $P.otptStngMap.unique.prototypeList, - $P.otptStngMap.unique.dataList); + $P.otptArtclStngMap.unique.prototypeList, + $P.otptArtclStngMap.unique.dataList); $P.renderOtptStngGrid("tbodyMultiple--${pageName}", - $P.otptStngMap.multiple.prototypeList, - $P.otptStngMap.multiple.dataList); + $P.otptArtclStngMap.multiple.prototypeList, + $P.otptArtclStngMap.multiple.dataList); } }); @@ -371,7 +371,7 @@ $(document).ready(function(){ $P.choiceOtptArtclNm = () => { $("#dropdownUniqueAdd--${pageName}").html(""); - var prototypeList = $P.otptStngMap.unique.prototypeList; + var prototypeList = $P.otptArtclStngMap.unique.prototypeList; var existArr = []; $("#tbodyUnique--sprt01200-main tr").each(function(){ @@ -405,10 +405,10 @@ $(document).ready(function(){ var tbodyId; if(otptArtclNm == null || otptArtclNm == ""){ - prototypeList = $P.otptStngMap.multiple.prototypeList; + prototypeList = $P.otptArtclStngMap.multiple.prototypeList; tbodyId = "tbodyMultiple--${pageName}"; } else { - prototypeList = $P.otptStngMap.unique.prototypeList; + prototypeList = $P.otptArtclStngMap.unique.prototypeList; tbodyId = "tbodyUnique--${pageName}"; } @@ -512,7 +512,7 @@ $(document).ready(function(){ var otptArtclNm = $(selectElement).val(); var tr = $(selectElement).parent().parent()[0]; - var prototypeList = $P.otptStngMap.multiple.prototypeList; + var prototypeList = $P.otptArtclStngMap.multiple.prototypeList; $($P.fnGetElement(tr,"componentType")) .val($P.fnGetProto(prototypeList, otptArtclNm, "componentType"));