From ad4da8c8bb56e278e3b0cd421e8dac421d0a7279 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Thu, 22 Jun 2023 09:49:13 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EA=B3=A0=EB=8F=84=ED=99=94=20=20-=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=EC=9A=94=EC=B2=AD=20=20=09-=20=EC=8B=A0=EC=B2=AD=EC=9D=B8=20?= =?UTF-8?q?=ED=94=BC=EC=8B=A0=EC=B2=AD=EC=9D=B8=20=EB=B2=95=EC=9D=B8=20?= =?UTF-8?q?=EA=B0=9C=EC=9D=B8=EC=82=AC=EC=97=85=EC=9E=90=EC=9D=B8=20?= =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20=EC=8B=A0=EC=B2=AD=EB=AA=A9=EB=A1=9D,=20?= =?UTF-8?q?=EC=A7=84=ED=96=89=EB=AA=A9=EB=A1=9D,=20=EC=8B=A0=EC=B2=AD?= =?UTF-8?q?=EC=84=9C=20=EB=8B=A8=EC=B2=B4=EB=AA=85=20=ED=91=9C=EC=8B=9C=20?= =?UTF-8?q?=09=09-=20=EC=A0=84=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=A0?= =?UTF-8?q?=EC=B2=AD=EA=B4=80=EB=A6=AC=20>=20=EB=A6=AC=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=20=09=09=09->=20=EC=99=84=20=09=09-=20=EC=A0=84=EC=9E=90?= =?UTF-8?q?=EC=A1=B0=EC=A0=95=EC=8B=A0=EC=B2=AD=EA=B4=80=EB=A6=AC=20>=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=20=09=09=09->=20=EC=99=84=20=09=09-=20?= =?UTF-8?q?=EC=A1=B0=EC=A0=95=EC=A7=84=ED=96=89=EB=AA=A9=EB=A1=9D=20>=20?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=09=09=09->=20=EC=99=84=20=09=09-?= =?UTF-8?q?=20=EC=A1=B0=EC=A0=95=EC=A7=84=ED=96=89=EB=AA=A9=EB=A1=9D=20>?= =?UTF-8?q?=20=EC=83=81=EC=84=B8=20=09=09=09->=20=EC=99=84=20=09=09=09-=20?= =?UTF-8?q?=EA=B8=B0=EC=9D=BC=EC=A7=80=EC=A0=95=20>=20=EB=93=B1=EB=A1=9D?= =?UTF-8?q?=20=09=09=09=09->=20=EC=99=84=20=09=09=09-=20=EA=B8=B0=EC=9D=BC?= =?UTF-8?q?=EC=A7=80=EC=A0=95=20>=20=EC=83=81=EC=84=B8=20=09=09=09=09->=20?= =?UTF-8?q?=EC=99=84=20=09=09=09-=20=EA=B8=B0=EC=9D=BC=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=20>=20=EB=93=B1=EB=A1=9D=20=09=09=09=09->=20=EC=99=84=20=09=09?= =?UTF-8?q?=09-=20=EA=B8=B0=EC=9D=BC=EB=B3=80=EA=B2=BD=20>=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=20=09=09=09=09->=20=EC=99=84=20=09=09=09-=20=EA=B8=B0?= =?UTF-8?q?=EC=9D=BC=EC=A1=B0=EC=84=9C=20>=20=EB=93=B1=EB=A1=9D=20=09=09?= =?UTF-8?q?=09=09->=20=EC=99=84=20=09=09=09-=20=EA=B8=B0=EC=9D=BC=EC=A1=B0?= =?UTF-8?q?=EC=84=9C=20>=20=EC=83=81=EC=84=B8=20=09=09=09=09->=20=EC=99=84?= =?UTF-8?q?=20=09=09=09-=20=EC=A1=B0=EC=A0=95=EC=A1=B0=EC=84=9C=20>=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=09=09=09=09->=20=EC=99=84=20=09=09=09-=20?= =?UTF-8?q?=EC=A1=B0=EC=A0=95=EC=A1=B0=EC=84=9C=20>=20=EC=83=81=EC=84=B8?= =?UTF-8?q?=20=09=09=09=09->=20=EC=99=84=20=09=09=09-=20=EB=B6=88=EC=84=B1?= =?UTF-8?q?=EB=A6=BD=EC=A2=85=EA=B2=B0=ED=86=B5=EB=B3=B4=EC=84=9C=20>=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=09=09=09=09->=20=EC=99=84=20=09=09=09-=20?= =?UTF-8?q?=EB=B6=88=EC=84=B1=EB=A6=BD=EC=A2=85=EA=B2=B0=ED=86=B5=EB=B3=B4?= =?UTF-8?q?=EC=84=9C=20>=20=EC=83=81=EC=84=B8=20=09=09=09=09->=20=EC=99=84?= =?UTF-8?q?=20=09=09=09-=20=EC=A7=81=EA=B6=8C=EC=A1=B0=EC=A0=95=EA=B2=B0?= =?UTF-8?q?=EC=A0=95=EC=84=9C=20>=20=EB=93=B1=EB=A1=9D=20=09=09=09=09->=20?= =?UTF-8?q?=EC=99=84=20=09=09=09-=20=EC=A7=81=EA=B6=8C=EC=A1=B0=EC=A0=95?= =?UTF-8?q?=EA=B2=B0=EC=A0=95=EC=84=9C=20>=20=EC=83=81=EC=84=B8=20=09=09?= =?UTF-8?q?=09=09->=20=EC=99=84=20=09=09=09-=20=ED=99=95=EC=A0=95=EC=A6=9D?= =?UTF-8?q?=EB=AA=85=EC=9B=90=20>=20=EB=93=B1=EB=A1=9D=20=09=09=09=09->=20?= =?UTF-8?q?=EC=99=84=20=09=09=09-=20=ED=99=95=EC=A0=95=EC=A6=9D=EB=AA=85?= =?UTF-8?q?=EC=9B=90=20>=20=EC=83=81=EC=84=B8=20=09=09=09=09->=20=EC=99=84?= =?UTF-8?q?=20=09=09=09-=20=EC=B7=A8=ED=95=98=EC=A2=85=EA=B2=B0=ED=86=B5?= =?UTF-8?q?=EB=B3=B4=EC=84=9C=20>=20=EB=93=B1=EB=A1=9D=20=09=09=09=09->=20?= =?UTF-8?q?=EC=99=84=20=09=09=09-=20=EC=B7=A8=ED=95=98=EC=A2=85=EA=B2=B0?= =?UTF-8?q?=ED=86=B5=EB=B3=B4=EC=84=9C=20>=20=EC=83=81=EC=84=B8=20=09=09?= =?UTF-8?q?=09=09->=20=EC=99=84=20=09=09=09-=20=EC=A1=B0=EC=A0=95=EA=B6=8C?= =?UTF-8?q?=EA=B3=A0=EC=95=88=20>=20=EB=93=B1=EB=A1=9D=20=09=09=09=09->=20?= =?UTF-8?q?=EC=99=84=20=09=09=09-=20=EC=A1=B0=EC=A0=95=EA=B6=8C=EA=B3=A0?= =?UTF-8?q?=EC=95=88=20>=20=EC=83=81=EC=84=B8=20=09=09=09=09->=20=EC=99=84?= =?UTF-8?q?=20=09=09-=20=EB=82=B4=EB=B6=80=EA=B2=B0=EC=9E=AC=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D(=EC=9D=BC=EB=B0=98=EA=B2=B0=EC=9E=AC)=20>=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=20=09=09=09->=20=EC=99=84=20=09=09-=20=EB=82=B4?= =?UTF-8?q?=EB=B6=80=EA=B2=B0=EC=9E=AC=EB=AA=A9=EB=A1=9D(=EC=A2=85?= =?UTF-8?q?=EA=B2=B0=EA=B2=B0=EC=9E=AC)=20>=20=EC=83=81=EC=84=B8=20=09=09?= =?UTF-8?q?=09->=20=EC=99=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjPgrMgr/cmm/service/PgrCmmVO.java | 12 ++++ .../cmm/service/impl/PgrCmmServiceImpl.java | 4 +- .../web/InternalApprovManageController.java | 2 +- .../egovProps/globals.properties | 3 + .../egovProps/globals_dev.properties | 3 + .../egovProps/globals_local.properties | 3 + .../egovProps/globals_svr.properties | 3 + .../spring/com/context-datasource.xml | 6 +- .../kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml | 60 +++++++++++++++++-- .../kccadr/adjPgrMgr/drt/Drt_SQL_Mysql.xml | 30 +++++++++- .../adjPgrMgr/drtctr/DrtCtr_SQL_Mysql.xml | 33 +++++++++- .../adjPgrMgr/iam/IamManage_SQL_Mysql.xml | 32 +++++++++- .../kccadr/adjrppl/AdjRppl_SQL_Mysql.xml | 2 +- .../jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp | 51 ++++++++++++++-- .../kccadr/adjPgrMgr/apm/popup/docRegPop.jsp | 4 +- .../jsp/kccadr/adjPgrMgr/arm/armDetail.jsp | 8 ++- .../jsp/kccadr/adjPgrMgr/arm/armReg.jsp | 8 ++- .../jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp | 8 ++- .../jsp/kccadr/adjPgrMgr/cfrm/cfrmReg.jsp | 8 ++- .../jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp | 8 ++- .../jsp/kccadr/adjPgrMgr/chd/chdReg.jsp | 8 ++- .../jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp | 7 ++- .../jsp/kccadr/adjPgrMgr/crt/crtReg.jsp | 7 ++- .../jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp | 7 ++- .../jsp/kccadr/adjPgrMgr/dnt/dntReg.jsp | 7 ++- .../jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp | 55 +++++++++-------- .../jsp/kccadr/adjPgrMgr/ent/entDetail.jsp | 8 ++- .../jsp/kccadr/adjPgrMgr/ent/entReg.jsp | 8 ++- .../iam/internalApprovManageDetail.jsp | 2 +- .../iam/internalApprovManageEndDetail.jsp | 10 +++- .../jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp | 8 ++- .../jsp/kccadr/adjPgrMgr/oad/oadReg.jsp | 8 ++- src/main/webapp/innorix/innorix_dev.js | 55 +++++++++++++++++ src/main/webapp/innorix/innorix_svr.js | 53 ++++++++++++++++ 34 files changed, 468 insertions(+), 63 deletions(-) create mode 100644 src/main/webapp/innorix/innorix_dev.js create mode 100644 src/main/webapp/innorix/innorix_svr.js diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java index 26f7d30f..6c65cebe 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java @@ -23,6 +23,8 @@ public class PgrCmmVO implements Serializable { private String appliCantId; // 신청인 ID 1명 private String appliCantNm; // 신청인 private String appliCantBizNm; // 신청인 법인(개인사업자)명 + private String appliCantUsrTy; // 신청인 법인(개인사업자)명 + private String resPonDentId; // 피신청인 ID private String resPonDentNm; // 피신청인 @@ -1631,4 +1633,14 @@ public class PgrCmmVO implements Serializable { this.searchSbmtId = searchSbmtId; } + public String getAppliCantUsrTy() { + return appliCantUsrTy; + } + + public void setAppliCantUsrTy(String appliCantUsrTy) { + this.appliCantUsrTy = appliCantUsrTy; + } + + + } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java index 0805c7af..15226176 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java @@ -544,10 +544,12 @@ public class PgrCmmServiceImpl implements PgrCmmService { //step1.statCd 30000X 로 update int resultCnt = kccadrMgrUdtService.updateAdrMgrUdt(adjReqMgrVO, s_adrHstryMgrSeq); + String s_adrHstryMgrSeq2 = adrHstryMgrSeqGnrService.getNextStringId(); + //step2.statCd 400000 로 update statCd = KccadrConstants.ADR_CLOSE; adjReqMgrVO.setStatCd(statCd); // 최종 변경 상태값 - resultCnt += kccadrMgrUdtService.updateAdrMgrUdt(adjReqMgrVO, s_adrHstryMgrSeq); + resultCnt += kccadrMgrUdtService.updateAdrMgrUdt(adjReqMgrVO, s_adrHstryMgrSeq2); //step3.접수결재 요청(ADR_RCPT_APPR_REQ, 201010), 배당결재요청(ADR_RCPT_DTB_REQ, 202010) 일 경우 결재 요청 delete 처리 if(closeVO.getStatCd().equals(KccadrConstants.ADR_RCPT_APPR_REQ) diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java b/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java index 50cec9e7..11360f45 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java @@ -285,7 +285,7 @@ public class InternalApprovManageController { // 법인일 경우 법인명+대표자명 노출 AdjRpplVO rpplVO = adjRpplService.findOfRpplBizNm(info.getAdrSeq()); info.setRpplUsrTy(rpplVO.getRpplUsrTy()); - info.setRpplBizNm(rpplVO.getRpplBizNm()); + info.setRpplBizNm(egovCryptoUtil.decrypt(rpplVO.getRpplNm())); model.addAttribute("info", info); model.addAttribute("approvLine", approvLine); diff --git a/src/main/resources/egovframework/egovProps/globals.properties b/src/main/resources/egovframework/egovProps/globals.properties index 5d46961e..9139bf94 100644 --- a/src/main/resources/egovframework/egovProps/globals.properties +++ b/src/main/resources/egovframework/egovProps/globals.properties @@ -190,6 +190,9 @@ Globals.ozFont=NanumSquareR.ttf #\ub300\uc6a9\ub7c9 innorix filePath Globals.Innorix.FilePath=D:\\usr\\local\\tomcat\\file\\sht\\ +#\ub300\uc6a9\ub7c9 innorix license +Globals.Innorix.License=dev + #inipay \uacb0\uc81c #\uac1c\ubc1c\uc11c\ubc84 Globals.pay.mid=INIpayTest diff --git a/src/main/resources/egovframework/egovProps/globals_dev.properties b/src/main/resources/egovframework/egovProps/globals_dev.properties index 32bed20e..3654249f 100644 --- a/src/main/resources/egovframework/egovProps/globals_dev.properties +++ b/src/main/resources/egovframework/egovProps/globals_dev.properties @@ -191,6 +191,9 @@ Globals.ozFont=NanumSquareR.ttf #\ub300\uc6a9\ub7c9 innorix filePath Globals.Innorix.FilePath=D:\\usr\\local\\tomcat\\file\\sht\\ +#\ub300\uc6a9\ub7c9 innorix license +Globals.Innorix.License=dev + #inipay \uacb0\uc81c #\uac1c\ubc1c\uc11c\ubc84 Globals.pay.mid=INIpayTest diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index 25b86164..285d0ded 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -200,6 +200,9 @@ Globals.ozFont=NanumSquareR.ttf #\ub300\uc6a9\ub7c9 innorix filePath Globals.Innorix.FilePath=D:\\usr\\local\\tomcat\\file\\sht\\ +#\ub300\uc6a9\ub7c9 innorix license +Globals.Innorix.License=dev + #inipay \uacb0\uc81c #\uac1c\ubc1c\uc11c\ubc84 Globals.pay.mid=INIpayTest diff --git a/src/main/resources/egovframework/egovProps/globals_svr.properties b/src/main/resources/egovframework/egovProps/globals_svr.properties index 8764a7ca..716cd270 100644 --- a/src/main/resources/egovframework/egovProps/globals_svr.properties +++ b/src/main/resources/egovframework/egovProps/globals_svr.properties @@ -190,6 +190,9 @@ Globals.ozFont=NanumSquareR.ttf #\ub300\uc6a9\ub7c9 innorix filePath Globals.Innorix.FilePath=/usr/local/tomcat/file/sht/ +#\ub300\uc6a9\ub7c9 innorix license +Globals.Innorix.License=svr + #inipay \uacb0\uc81c #\uac1c\ubc1c\uc11c\ubc84 #Globals.pay.mid=INIpayTest diff --git a/src/main/resources/egovframework/spring/com/context-datasource.xml b/src/main/resources/egovframework/spring/com/context-datasource.xml index 51e03214..3f66279c 100644 --- a/src/main/resources/egovframework/spring/com/context-datasource.xml +++ b/src/main/resources/egovframework/spring/com/context-datasource.xml @@ -1,6 +1,9 @@ + xmlns:util="http://www.springframework.org/schema/util" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd + http://www.springframework.org/schema/util + http://www.springframework.org/schema/util/spring-util-4.0.xsd"> @@ -10,6 +13,7 @@ + diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml index 0e597e09..3bf2f128 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml @@ -18,7 +18,19 @@ LEFT JOIN LETTCCMMNDETAILCODE RCD ON RCD.CODE_ID = 'CC014' AND RCD.CODE = TRIM ( M.REQ_OL_CD ) LEFT JOIN LETTCCMMNDETAILCODE CCD ON CCD.CODE_ID = 'CC002' AND CCD.CODE = TRIM ( M.CC_TY ) LEFT JOIN ADR_MEM_DEPT_MGR DM ON DM.MEM_DEPT_SEQ = D.MEM_DEPT_SEQ - LEFT JOIN ADR_RPPL AP ON AP.ADR_SEQ = M.ADR_SEQ AND AP.RPPL_TY = '10' + LEFT JOIN (SELECT + CASE + WHEN ttt1.RPPL_USR_TY = '01' + THEN ttt1.RPPL_NM + WHEN ttt1.RPPL_USR_TY = '02' + THEN ttt1.RPPL_BIZ_NM + ELSE '3' + END RPPL_NM, + ttt1.RPPL_TY, + ttt1.adr_seq, + ttt1.frst_regist_pnttm + FROM ADR_RPPL ttt1 + ) AP ON AP.ADR_SEQ = M.ADR_SEQ AND AP.RPPL_TY = '10' LEFT JOIN ( SELECT ADR_SEQ , ADR_SN @@ -114,7 +126,19 @@ , DM.MEM_DEPT_NM AS memDeptNm /* 조정부명 */ , AP.RPPL_NM AS appliCantNm /* 신청인 */ , ( SELECT GROUP_CONCAT ( RPPL_NM SEPARATOR ', ' ) - FROM ADR_RPPL S1 + FROM (SELECT + CASE + WHEN ttt1.RPPL_USR_TY = '01' + THEN ttt1.RPPL_NM + WHEN ttt1.RPPL_USR_TY = '02' + THEN ttt1.RPPL_BIZ_NM + ELSE '3' + END RPPL_NM, + ttt1.RPPL_TY, + ttt1.adr_seq, + ttt1.frst_regist_pnttm + FROM ADR_RPPL ttt1 + ) S1 WHERE S1.ADR_SEQ = M.ADR_SEQ AND S1.RPPL_TY = '20' GROUP BY S1.ADR_SEQ @@ -220,7 +244,8 @@ , AP.RPPL_NM AS appliCantNm /* 신청인 */ , AP.RPPL_SEQ AS appliCantId /* 신청인ID */ , AP.RPPL_BIZ_NM AS appliCantBizNm /* 신청인 법인명 */ - + , AP.RPPL_USR_TY AS appliCantUsrTy /* 신청인 회원구분 */ + , ( SELECT GROUP_CONCAT ( RPPL_NM SEPARATOR ', ' ) FROM ADR_RPPL S1 WHERE S1.ADR_SEQ = M.ADR_SEQ @@ -237,7 +262,19 @@ , ( SELECT GROUP_CONCAT ( RPPL_NM SEPARATOR ', ' ) - FROM ADR_RPPL S1 + FROM (SELECT + CASE + WHEN ttt1.RPPL_USR_TY = '01' + THEN ttt1.RPPL_NM + WHEN ttt1.RPPL_USR_TY = '02' + THEN ttt1.RPPL_BIZ_NM + ELSE '3' + END RPPL_NM, + ttt1.RPPL_TY, + ttt1.adr_seq, + ttt1.frst_regist_pnttm + FROM ADR_RPPL ttt1 + ) S1 WHERE S1.ADR_SEQ = M.ADR_SEQ AND S1.RPPL_TY = '20' GROUP BY S1.ADR_SEQ @@ -565,6 +602,7 @@ , AP.RPPL_NM AS appliCantNm /* 신청인 */ , AP.RPPL_SEQ AS appliCantId /* 신청인ID */ , AP.RPPL_BIZ_NM AS appliCantBizNm /* 신청인 법인명 */ + , AP.RPPL_USR_TY AS appliCantUsrTy /* 신청인 회원구분 */ , ( SELECT GROUP_CONCAT ( RPPL_NM SEPARATOR ', ' ) FROM ADR_RPPL S1 @@ -582,7 +620,19 @@ , ( SELECT GROUP_CONCAT ( RPPL_NM SEPARATOR ', ' ) - FROM ADR_RPPL S1 + FROM (SELECT + CASE + WHEN ttt1.RPPL_USR_TY = '01' + THEN ttt1.RPPL_NM + WHEN ttt1.RPPL_USR_TY = '02' + THEN ttt1.RPPL_BIZ_NM + ELSE '3' + END RPPL_NM, + ttt1.RPPL_TY, + ttt1.adr_seq, + ttt1.frst_regist_pnttm + FROM ADR_RPPL ttt1 + ) S1 WHERE S1.ADR_SEQ = M.ADR_SEQ AND S1.RPPL_TY = '20' GROUP BY S1.ADR_SEQ diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/drt/Drt_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/drt/Drt_SQL_Mysql.xml index 87dd49f8..d07697d9 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/drt/Drt_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/drt/Drt_SQL_Mysql.xml @@ -86,7 +86,20 @@ , G.RPPL_RLTN_TY AS rpplRltnTy /* 참관대리인 종류*/ , G.AGNT_NM AS agntNm /* 참관대리인 명*/ , DECODE(G.AGNT_SEQ, NULL, 'N','Y') isAgnt /* 참관대리인 존재여부*/ - FROM ADR_RPPL A + FROM (SELECT + CASE + WHEN ttt1.RPPL_USR_TY = '01' + THEN ttt1.RPPL_NM + WHEN ttt1.RPPL_USR_TY = '02' + THEN ttt1.RPPL_BIZ_NM + ELSE '3' + END RPPL_NM, + ttt1.RPPL_TY, + ttt1.adr_seq, + ttt1.frst_regist_pnttm, + ttt1.RPPL_SEQ + FROM ADR_RPPL ttt1 + ) A LEFT JOIN ADR_AGNT_MGR G ON A.ADR_SEQ = G.ADR_SEQ AND A.RPPL_SEQ = G.RPPL_SEQ AND G.ADR_SN =#adrSn# WHERE A.ADR_SEQ = #adrSeq# @@ -106,7 +119,20 @@ , G.AGNT_NM AS agntNm /* 참관대리인 명*/ , DECODE(G.AGNT_SEQ, NULL, 'N','Y') isAgnt /* 참관대리인 존재여부*/ FROM ADR_ASS_MGR A - LEFT JOIN ADR_RPPL L ON A.ADD_USR_ID = L.RPPL_SEQ + LEFT JOIN (SELECT + CASE + WHEN ttt1.RPPL_USR_TY = '01' + THEN ttt1.RPPL_NM + WHEN ttt1.RPPL_USR_TY = '02' + THEN ttt1.RPPL_BIZ_NM + ELSE '3' + END RPPL_NM, + ttt1.RPPL_TY, + ttt1.adr_seq, + ttt1.frst_regist_pnttm, + ttt1.RPPL_SEQ + FROM ADR_RPPL ttt1 + ) L ON A.ADD_USR_ID = L.RPPL_SEQ LEFT JOIN ADR_AGNT_MGR G ON A.ADR_SEQ = A.ADR_SEQ AND A.ADD_USR_ID = G.RPPL_SEQ AND G.ADR_SN =A.ADR_SN WHERE A.ADR_SEQ = #adrSeq# AND A.ADR_SN = #adrSn# diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/drtctr/DrtCtr_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/drtctr/DrtCtr_SQL_Mysql.xml index b0a20d41..15b42b35 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/drtctr/DrtCtr_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/drtctr/DrtCtr_SQL_Mysql.xml @@ -7,7 +7,20 @@ , RPPL_SEQ AS addUsrId /* 출석인일련번호 */ , RPPL_TY AS assUsrTy /* 출석인구분 */ , RPPL_NM AS addUsrNm /* 출석인명 */ - FROM ADR_RPPL + FROM (SELECT + CASE + WHEN ttt1.RPPL_USR_TY = '01' + THEN ttt1.RPPL_NM + WHEN ttt1.RPPL_USR_TY = '02' + THEN ttt1.RPPL_BIZ_NM + ELSE '3' + END RPPL_NM, + ttt1.RPPL_TY, + ttt1.adr_seq, + ttt1.frst_regist_pnttm, + ttt1.RPPL_SEQ + FROM ADR_RPPL ttt1 + ) WHERE ADR_SEQ = #adrSeq# @@ -25,7 +38,23 @@ , L.RPPL_ADDR AS rpplAddr /* 출석인 주소*/ , L.RPPL_ADDR_DTL AS rpplAddrDtl /* 출석인 상세주소 */ FROM ADR_ASS_MGR A - LEFT JOIN ADR_RPPL L ON A.ADD_USR_ID = L.RPPL_SEQ + LEFT JOIN (SELECT + CASE + WHEN ttt1.RPPL_USR_TY = '01' + THEN ttt1.RPPL_NM + WHEN ttt1.RPPL_USR_TY = '02' + THEN ttt1.RPPL_BIZ_NM + ELSE '3' + END RPPL_NM, + ttt1.RPPL_TY, + ttt1.adr_seq, + ttt1.frst_regist_pnttm, + ttt1.RPPL_SEQ, + ttt1.RPPL_ADDR, + ttt1.RPPL_ADDR_DTL, + ttt1.RPPL_POST + FROM ADR_RPPL ttt1 + ) L ON A.ADD_USR_ID = L.RPPL_SEQ WHERE A.ADR_SEQ = #adrSeq# AND A.ADR_SN = #adrSn# diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/iam/IamManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/iam/IamManage_SQL_Mysql.xml index 95b69efe..d89694d2 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/iam/IamManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/iam/IamManage_SQL_Mysql.xml @@ -706,14 +706,40 @@ T3.ADR_CDNT AS adrCdnt, T3.ADR_CDNT_SEQ AS adrCdntSeq, T3.ADR_CCLT AS adrCclt, - ( SELECT RPPL_NM FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.ADR_SEQ AND S1.RPPL_TY = '20' LIMIT 1) AS resPonDentNm, - ( SELECT RPPL_NM FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.ADR_SEQ AND S1.RPPL_TY = '30' LIMIT 1) AS depuTyNm, + ( SELECT GROUP_CONCAT(RPPL_NM SEPARATOR ', ') FROM (SELECT + CASE + WHEN ttt1.RPPL_USR_TY = '01' + THEN ttt1.RPPL_NM + WHEN ttt1.RPPL_USR_TY = '02' + THEN ttt1.RPPL_BIZ_NM + ELSE '3' + END RPPL_NM, + ttt1.RPPL_TY, + ttt1.adr_seq, + ttt1.frst_regist_pnttm, + ttt1.RPPL_SEQ + FROM ADR_RPPL ttt1 + ) s1 WHERE 1=1 AND S1.adr_seq = T1.ADR_SEQ AND S1.RPPL_TY = '20') AS resPonDentNm, + ( SELECT GROUP_CONCAT(RPPL_NM SEPARATOR ', ') FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.ADR_SEQ AND S1.RPPL_TY = '30') AS depuTyNm, ( SELECT GROUP_CONCAT(RPPL_NM SEPARATOR ', ') FROM ADR_RPPL s1 WHERE 1=1 AND S1.ADR_SEQ = T1.ADR_SEQ AND S1.RPPL_TY = '20' GROUP BY ADR_SEQ) AS resPonDentNms, ( SELECT GROUP_CONCAT(RPPL_NM SEPARATOR ', ') FROM ADR_RPPL s1 WHERE 1=1 AND S1.ADR_SEQ = T1.ADR_SEQ AND S1.RPPL_TY = '30' GROUP BY ADR_SEQ) AS depuTyNms, ( SELECT GROUP_CONCAT(CODE_NM) FROM ADR_RPPL s1 LEFT JOIN LETTCCMMNDETAILCODE ON CODE_ID = 'CC006' AND CODE = S1.RPPL_RELATION WHERE 1=1 AND S1.ADR_SEQ = T1.ADR_SEQ AND S1.RPPL_TY = '30' GROUP BY ADR_SEQ) AS depuTyNmsTy, ( SELECT GROUP_CONCAT(RPPL_NM SEPARATOR ', ') FROM ADR_RPPL s1 WHERE 1=1 AND S1.ADR_SEQ = T1.ADR_SEQ AND S1.RPPL_TY = '40' GROUP BY ADR_SEQ) AS resPonAgntNms, ( SELECT GROUP_CONCAT(CODE_NM) FROM ADR_RPPL s1 LEFT JOIN LETTCCMMNDETAILCODE ON CODE_ID = 'CC006' AND CODE = S1.RPPL_RELATION WHERE 1=1 AND S1.ADR_SEQ = T1.ADR_SEQ AND S1.RPPL_TY = '40' GROUP BY ADR_SEQ) AS resPonAgntNmsTy, - ( SELECT RPPL_NM FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.ADR_SEQ AND S1.RPPL_TY = '10') AS appliCantNm, + ( SELECT RPPL_NM FROM (SELECT + CASE + WHEN ttt1.RPPL_USR_TY = '01' + THEN ttt1.RPPL_NM + WHEN ttt1.RPPL_USR_TY = '02' + THEN ttt1.RPPL_BIZ_NM + ELSE '3' + END RPPL_NM, + ttt1.RPPL_TY, + ttt1.adr_seq, + ttt1.frst_regist_pnttm, + ttt1.RPPL_SEQ + FROM ADR_RPPL ttt1 + ) s1 WHERE 1=1 AND S1.adr_seq = T1.ADR_SEQ AND S1.RPPL_TY = '10') AS appliCantNm, ( SELECT TO_CHAR(HSTRY_DE, 'YYYY-MM-DD') FROM ADR_HSTRY WHERE ADR_SEQ = T1.ADR_SEQ AND STAT_CD = '101050' LIMIT 1) AS reqDt, ( SELECT TO_CHAR(HSTRY_DE, 'YYYY-MM-DD') FROM ADR_HSTRY WHERE ADR_SEQ = T1.ADR_SEQ AND ADR_SN = T2.ADR_SN LIMIT 1) AS workDt, ( SELECT TO_CHAR(LAST_UPDT_PNTTM, 'YYYY-MM-DD') FROM ADR_HSTRY WHERE ADR_SEQ = T1.ADR_SEQ AND STAT_CD = '309050' ORDER BY STAT_CD DESC LIMIT 1) AS endDt, diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjrppl/AdjRppl_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjrppl/AdjRppl_SQL_Mysql.xml index a5a8c985..6a047c3b 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjrppl/AdjRppl_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjrppl/AdjRppl_SQL_Mysql.xml @@ -113,7 +113,7 @@