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