From c110c779e02c4b34fd7792fce5b13e0ee5c5aed6 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 16 Feb 2024 18:17:31 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B6=80=EC=84=9C=20=EB=93=B1=EB=A1=9D,?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fims/mngt/FineIntegrationDepartment.java | 25 +++ .../cokr/xit/fims/mngt/dao/FactionMapper.java | 5 +- .../xit/fims/mngt/web/Mngt04Controller.java | 50 ++++- .../cokr/xit/fims/task/web/CmnController.java | 13 ++ .../sql/mapper/fims/mngt/faction-mapper.xml | 31 ++- .../WEB-INF/jsp/fims/mngt/mngt04010-main.jsp | 23 +- .../WEB-INF/jsp/fims/mngt/mngt04020-info.jsp | 204 ++++++++++++++++-- 7 files changed, 319 insertions(+), 32 deletions(-) diff --git a/src/main/java/cokr/xit/fims/mngt/FineIntegrationDepartment.java b/src/main/java/cokr/xit/fims/mngt/FineIntegrationDepartment.java index d1e83639..11c7607e 100644 --- a/src/main/java/cokr/xit/fims/mngt/FineIntegrationDepartment.java +++ b/src/main/java/cokr/xit/fims/mngt/FineIntegrationDepartment.java @@ -12,6 +12,11 @@ import lombok.Setter; @Setter public class FineIntegrationDepartment extends Department { + /** + * 민원 연계 구분 코드 + */ + private String cvlcptLinkSeCd; + /** * 가상계좌 연계 구분 코드 */ @@ -47,11 +52,21 @@ public class FineIntegrationDepartment extends Department { */ private String egpApvlNb; + /** + * E그린 ESB경로 + */ + private String egpEsbPath; + /** * E그린 우정정보센터 기관ID */ private String egpPostInstId; + /** + * E그린 인증서CN + */ + private String egpCertCn; + /** * 세외수입 인터페이스ID */ @@ -72,6 +87,16 @@ public class FineIntegrationDepartment extends Department { */ private String ensUrl; + /** + * 세외수입 연계 여부 + */ + private String nxrpLinkYn; + + /** + * 세외수입 지역 구분 코드 + */ + private String nxrpRgnSeCd; + /** * 교부 은행 명 */ diff --git a/src/main/java/cokr/xit/fims/mngt/dao/FactionMapper.java b/src/main/java/cokr/xit/fims/mngt/dao/FactionMapper.java index 97ae690f..aec47d05 100644 --- a/src/main/java/cokr/xit/fims/mngt/dao/FactionMapper.java +++ b/src/main/java/cokr/xit/fims/mngt/dao/FactionMapper.java @@ -122,10 +122,7 @@ public interface FactionMapper extends AbstractMapper { * @return 부서 객체 */ default DataObject selectDeptInfo(CmmnQuery req) { - // 사용 여부 확인 - if (req.getUseYN() == null) { - req.setUseYN("Y"); - } + // 기본 정렬 if (req.getOrderBy() == null) { req.setOrderBy("D.DEPT_CD DESC"); diff --git a/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java b/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java index 360d5fe1..0194b887 100644 --- a/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java +++ b/src/main/java/cokr/xit/fims/mngt/web/Mngt04Controller.java @@ -8,6 +8,7 @@ import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.web.ApplicationController; import cokr.xit.fims.cmmn.CmmnQuery; +import cokr.xit.fims.mngt.FineIntegrationDepartment; import cokr.xit.fims.mngt.dao.FactionMapper; import cokr.xit.fims.mngt.service.FactionService; import cokr.xit.fims.mngt.service.bean.FactionBean; @@ -25,8 +26,10 @@ public class Mngt04Controller extends ApplicationController { public static final String deptMngtMain = "/010/main.do" , getDeptList = "/010/list.do" - , getDeptInfo = "/020/info.do" , removeDept = "/010/remove.do" + , getDeptInfo = "/020/info.do" + , createDept = "/020/create.do" + , updateDept = "/020/update.do" ; } @@ -78,8 +81,13 @@ public class Mngt04Controller extends ApplicationController { * } */ public ModelAndView getDeptInfo(CmmnQuery query) { + DataObject deptInfo = new DataObject(); - DataObject deptInfo = factionService.getDeptInfo(query); + if(!ifEmpty(query.getDeptCd(), ()->"").equals("")) { + deptInfo = factionService.getDeptInfo(query); + } else { + deptInfo = null; + } boolean json = jsonResponse(); ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/mngt/mngt04020-info"); @@ -107,4 +115,42 @@ public class Mngt04Controller extends ApplicationController { mav.addObject("saved", saved); return mav; } + + /**부서 정보를 등록한다. + * @param dept 부서 정보 + * @return jsonView + *
 {
+	 *     "saved": 저장되었으면 true, 그렇지 않으면 false
+	 * }
+ */ + public ModelAndView createDept(FineIntegrationDepartment dept) { + ModelAndView mav = new ModelAndView("jsonView"); + boolean saved = false; + String rtnMsg = factionService.create(dept); + if(rtnMsg.contains("[S]")) { + saved = true; + } + + mav.addObject("saved", saved); + return mav; + } + + /**부서 정보를 수정한다. + * @param dept 부서 정보 + * @return jsonView + *
 {
+	 *     "saved": 저장되었으면 true, 그렇지 않으면 false
+	 * }
+ */ + public ModelAndView updateDept(FineIntegrationDepartment dept) { + ModelAndView mav = new ModelAndView("jsonView"); + boolean saved = false; + String rtnMsg = factionService.update(dept); + if(rtnMsg.contains("[S]")) { + saved = true; + } + + mav.addObject("saved", saved); + return mav; + } } diff --git a/src/main/java/cokr/xit/fims/task/web/CmnController.java b/src/main/java/cokr/xit/fims/task/web/CmnController.java index 95ad795f..cfd40076 100644 --- a/src/main/java/cokr/xit/fims/task/web/CmnController.java +++ b/src/main/java/cokr/xit/fims/task/web/CmnController.java @@ -9,6 +9,7 @@ import org.springframework.web.servlet.ModelAndView; import cokr.xit.fims.cmmn.CmmnQuery; import cokr.xit.fims.crdn.Crdn; +import cokr.xit.fims.mngt.FineIntegrationDepartment; import cokr.xit.fims.mngt.FineIntegrationSigungu; import cokr.xit.fims.mngt.Task; import cokr.xit.fims.mngt.VltnQuery; @@ -666,6 +667,18 @@ public class CmnController { public ModelAndView removeDept(String... deptCds) { return super.removeDept(deptCds); } + + @Override + @RequestMapping(name="부서 등록", value=METHOD_URL.createDept) + public ModelAndView createDept(FineIntegrationDepartment dept) { + return super.createDept(dept); + } + + @Override + @RequestMapping(name="부서 수정", value=METHOD_URL.updateDept) + public ModelAndView updateDept(FineIntegrationDepartment dept) { + return super.updateDept(dept); + } } @Controller diff --git a/src/main/resources/sql/mapper/fims/mngt/faction-mapper.xml b/src/main/resources/sql/mapper/fims/mngt/faction-mapper.xml index 9a08c59d..5c0005be 100644 --- a/src/main/resources/sql/mapper/fims/mngt/faction-mapper.xml +++ b/src/main/resources/sql/mapper/fims/mngt/faction-mapper.xml @@ -162,6 +162,7 @@ UPDATE TB_SGG + @@ -169,11 +170,15 @@ UPDATE TB_SGG + + + + @@ -194,6 +199,7 @@ UPDATE TB_SGG , D.DEPT_NM , D.DEPT_TELNO , D.DEPT_FXNO + , D.CVLCPT_LINK_SE_CD , D.VRBACNT_LINK_SE_CD , D.PSTOFC_NM , D.RG_NO_HEADER @@ -201,11 +207,15 @@ UPDATE TB_SGG , D.EGP_CON_ORG , D.EGP_RCEPT_ID , D.EGP_APVL_NB + , D.EGP_ESB_PATH , D.EGP_POST_INST_ID + , D.EGP_CERT_CN , D.ENS_INTERFACE_ID , D.ENS_SOURCE_CD , D.ENS_TARGET_CD , D.ENS_URL + , D.NXRP_LINK_YN + , D.NXRP_RGN_SE_CD , D.DTBN_BANK_NM , D.DTBN_ACTNO , D.DOC_HEADER @@ -267,6 +277,7 @@ UPDATE TB_SGG , DEPT_NM , DEPT_TELNO , DEPT_FXNO + , CVLCPT_LINK_SE_CD , VRBACNT_LINK_SE_CD , PSTOFC_NM , RG_NO_HEADER @@ -274,11 +285,15 @@ UPDATE TB_SGG , EGP_CON_ORG , EGP_RCEPT_ID , EGP_APVL_NB + , EGP_ESB_PATH , EGP_POST_INST_ID + , EGP_CERT_CN , ENS_INTERFACE_ID , ENS_SOURCE_CD , ENS_TARGET_CD , ENS_URL + , NXRP_LINK_YN + , NXRP_RGN_SE_CD , DTBN_BANK_NM , DTBN_ACTNO , DOC_HEADER @@ -295,6 +310,7 @@ UPDATE TB_SGG , #{dept.name} , #{dept.telno} , #{dept.faxno} + , #{dept.cvlcptLinkSeCd} , #{dept.vrbacntLinkSeCd} , #{dept.pstofcNm} , #{dept.rgNoHeader} @@ -302,11 +318,15 @@ UPDATE TB_SGG , #{dept.egpConOrg} , #{dept.egpRceptId} , #{dept.egpApvlNb} + , #{dept.egpEsbPath} , #{dept.egpPostInstId} + , #{dept.egpCertCn} , #{dept.ensInterfaceId} , #{dept.ensSourceCd} , #{dept.ensTargetCd} , #{dept.ensUrl} + , #{dept.nxrpLinkYn} + , #{dept.nxrpRgnSeCd} , #{dept.dtbnBankNm} , #{dept.dtbnActno} , #{dept.docHeader} @@ -323,10 +343,11 @@ UPDATE TB_SGG /* 부서 수정(factionMapper.updateDept) */ UPDATE TB_DEPT SET SGG_CD = #{dept.sggID} - , INST_CD = #{dept.instCode} - , DEPT_NM = #{dept.name} - , DEPT_TELNO = #{dept.telno} + , INST_CD = #{dept.instCode} + , DEPT_NM = #{dept.name} + , DEPT_TELNO = #{dept.telno} , DEPT_FXNO = #{dept.faxno} + , CVLCPT_LINK_SE_CD = #{dept.cvlcptLinkSeCd} , VRBACNT_LINK_SE_CD = #{dept.vrbacntLinkSeCd} , PSTOFC_NM = #{dept.pstofcNm} , RG_NO_HEADER = #{dept.rgNoHeader} @@ -334,11 +355,15 @@ UPDATE TB_SGG , EGP_CON_ORG = #{dept.egpConOrg} , EGP_RCEPT_ID = #{dept.egpRceptId} , EGP_APVL_NB = #{dept.egpApvlNb} + , EGP_ESB_PATH = #{dept.egpEsbPath} , EGP_POST_INST_ID = #{dept.egpPostInstId} + , EGP_CERT_CN = #{dept.egpCertCn} , ENS_INTERFACE_ID = #{dept.ensInterfaceId} , ENS_SOURCE_CD = #{dept.ensSourceCd} , ENS_TARGET_CD = #{dept.ensTargetCd} , ENS_URL = #{dept.ensUrl} + , NXRP_LINK_YN = #{dept.nxrpLinkYn} + , NXRP_RGN_SE_CD = #{dept.nxrpRgnSeCd} , DTBN_BANK_NM = #{dept.dtbnBankNm} , DTBN_ACTNO = #{dept.dtbnActno} , DOC_HEADER = #{dept.docHeader} diff --git a/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt04010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt04010-main.jsp index b73ae97c..c4249405 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt04010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt04010-main.jsp @@ -237,6 +237,10 @@ $(document).ready(function(){ } $P.refreshDeptList = () => { + if($P.deptControl.query.pageNum == null){ + return; + } + $P.deptControl.untilPageNum = $P.deptControl.query.pageNum; $P.deptControl.query.fetchSize = $P.deptControl.defaultFetchSize * $P.deptControl.query.pageNum; $P.deptControl.load(1); @@ -304,10 +308,21 @@ $(document).ready(function(){ dialog.open({ id : "deptInfoDialog", title : "부서 정보", - size : "xxl", + size : "xl", content : resp, init : () => { + var parentRes = new Object(); + var childReq = pageObject.childReq.pop(); + for(var reqKey in childReq) { + if($P.provide[reqKey]){ + parentRes[reqKey] = $P.provide[reqKey]; + } else { + parentRes[reqKey] = function(){}; + } + } + + pageObject.parentRes.push(parentRes); } }); @@ -341,6 +356,12 @@ $(document).ready(function(){ } } + $P.provide = { + "refreshList" : function(){ + $P.refreshDeptList(); + }, + }; + /************************************************************************** * element.on **************************************************************************/ diff --git a/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt04020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt04020-info.jsp index 22480530..7cd7361e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt04020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt04020-info.jsp @@ -6,47 +6,207 @@
- - - + +
- +
- - - - +
- - + - + +
+ + +
+ +
+ + -
+ + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + +
+
+ +
- \ No newline at end of file + + + \ No newline at end of file