From 252cffe55f036cd9f0be314c0dac8b6b4e8bab02 Mon Sep 17 00:00:00 2001 From: Leeyh1121 <130335980+Leeyh1121@users.noreply.github.com> Date: Tue, 2 Jul 2024 17:54:05 +0900 Subject: [PATCH 1/6] =?UTF-8?q?fit=20:=20=ED=8C=8C=EB=9D=BC=EB=AF=B8?= =?UTF-8?q?=ED=84=B0=20=EC=A4=91=20=ED=8F=90=EA=B8=B0=EC=82=AC=EC=9C=A0=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=97=86=EC=96=B4=EC=84=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cokr/xit/adds/cmm/model/DsuseRsltInfo.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/cokr/xit/adds/cmm/model/DsuseRsltInfo.java b/src/main/java/cokr/xit/adds/cmm/model/DsuseRsltInfo.java index c930618..9c58271 100644 --- a/src/main/java/cokr/xit/adds/cmm/model/DsuseRsltInfo.java +++ b/src/main/java/cokr/xit/adds/cmm/model/DsuseRsltInfo.java @@ -48,6 +48,7 @@ public class DsuseRsltInfo { @JsonAlias("RPRSNTV_NM") private String rprsntvNm; + /** * 담당자명 */ @@ -69,6 +70,7 @@ public class DsuseRsltInfo { private String dscdmngId; private String usrRptIdNo; private String dsusePrvNm; + private String dsusePrvCd; private Integer rndDtlRptCnt; private String hdrDe; From e0e4ac7dca1bc6de298f9a7d7f2eb3b025675921 Mon Sep 17 00:00:00 2001 From: Leeyh1121 <130335980+Leeyh1121@users.noreply.github.com> Date: Tue, 2 Jul 2024 17:57:17 +0900 Subject: [PATCH 2/6] =?UTF-8?q?fit=20:=20=ED=8C=8C=EB=9D=BC=EB=AF=B8?= =?UTF-8?q?=ED=84=B0=20=EC=A4=91=20=ED=8F=90=EA=B8=B0=EC=82=AC=EC=9C=A0=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=97=86=EC=96=B4=EC=84=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cokr/xit/adds/cmm/model/DsuseMappingInfo.java | 1 + src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/cokr/xit/adds/cmm/model/DsuseMappingInfo.java b/src/main/java/cokr/xit/adds/cmm/model/DsuseMappingInfo.java index 41f2397..44a6395 100644 --- a/src/main/java/cokr/xit/adds/cmm/model/DsuseMappingInfo.java +++ b/src/main/java/cokr/xit/adds/cmm/model/DsuseMappingInfo.java @@ -69,6 +69,7 @@ public class DsuseMappingInfo { private String dscdmngId; private String usrRptIdNo; private String dsusePrvNm; + private String dsusePrvCd; private String rndDtlRptCnt; private String hdrDe; private String dsuseDe; diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp index 1fe86ff..afb194c 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp @@ -332,7 +332,7 @@ bsshCd: row.BSSH_CD, usrRptIdNo: row.USR_RPT_ID_NO, indutyNm: row.INDUTY_NM, - dsusePrvNm: row.DSUSE_PRV_NM, + dsusePrvCd: row.DSUSE_PRV_CD, rndDtlRptCnt: row.RND_DTL_RPT_CNT, hdrDe: row.HDR_DE, dsuseDe: row.DSUSE_DE, From 55afca2ae0c33830525896a756e8dc4ec67be769 Mon Sep 17 00:00:00 2001 From: leebj Date: Wed, 3 Jul 2024 13:58:03 +0900 Subject: [PATCH 3/6] =?UTF-8?q?SELECT=20=EC=BF=BC=EB=A6=AC=20=EC=95=A0?= =?UTF-8?q?=EC=8A=A4=ED=84=B0=EB=A6=AC=EC=8A=A4=ED=81=AC(*)=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/mapper/base/actiongroup-mapper.xml | 5 ++++- src/main/resources/sql/mapper/base/authority-mapper.xml | 9 +++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/resources/sql/mapper/base/actiongroup-mapper.xml b/src/main/resources/sql/mapper/base/actiongroup-mapper.xml index ef923c9..a190755 100644 --- a/src/main/resources/sql/mapper/base/actiongroup-mapper.xml +++ b/src/main/resources/sql/mapper/base/actiongroup-mapper.xml @@ -52,7 +52,10 @@ DELETE FROM TB_ACTION_GRP /* 권한-기능그룹 가져오기(authorityMapper.getActionGroups) */ -SELECT * +SELECT AUTH_ID + , GRP_ID + , REG_DT FROM TB_AUTH_ACTION WHERE AUTH_ID IN (#{authID}) ORDER BY AUTH_ID, GRP_ID @@ -135,7 +137,10 @@ SELECT A.AUTH_ID -SELECT A.*, USER_ACNT +SELECT A.AUTH_ID + , A.USER_ID + , A.REG_DT + , B.USER_ACNT FROM TB_AUTH_USER A , TB_USER B From 75e8416226fd6a35fbe426f10dcd11b545648f61 Mon Sep 17 00:00:00 2001 From: leebj Date: Wed, 3 Jul 2024 14:53:57 +0900 Subject: [PATCH 4/6] =?UTF-8?q?fix=20:=20=EC=A1=B0=ED=9A=8C=EC=A1=B0?= =?UTF-8?q?=EA=B1=B4=EC=9D=98=20=EB=B6=80=EC=84=9C=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=EC=8B=9C=20=EA=B3=B5=ED=86=B5=EB=9D=BC?= =?UTF-8?q?=EC=9D=B4=EB=B8=8C=EB=9F=AC=EB=A6=AC=20=EC=82=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/adds/nims/web/AddsNimsController.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java index 87009d3..a8cddb2 100644 --- a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java +++ b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java @@ -31,13 +31,13 @@ import cokr.xit.adds.nims.service.DsuseMgtDocService; import cokr.xit.adds.nims.service.DsuseMgtReceiptService; import cokr.xit.applib.Print; import cokr.xit.applib.PrintOption; -import cokr.xit.applib.ogdp.OgdpQuery; -import cokr.xit.applib.ogdp.service.bean.DefaultOgdpBean; import cokr.xit.base.code.CommonCode; import cokr.xit.base.file.FileInfo; import cokr.xit.base.file.FileInfo.Relation; import cokr.xit.base.file.service.FileQuery; import cokr.xit.base.file.service.FileService; +import cokr.xit.base.user.DepartmentQuery; +import cokr.xit.base.user.service.SigunguDepartmentService; import cokr.xit.base.web.ApplicationController; import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.JSON; @@ -57,8 +57,8 @@ public class AddsNimsController extends ApplicationController { @Value("${app.file.root.path}") private String fileRootPath; - @Resource(name="defaultOgdpBean") - private DefaultOgdpBean defaultOgdpBean; + @Resource(name="sigunguDepartmentService") + private SigunguDepartmentService sggDeptService; @Resource(name="dsuseMgtReceiptService") private DsuseMgtReceiptService dsuseMgtReceiptService; @@ -362,7 +362,7 @@ public class AddsNimsController extends ApplicationController { ModelAndView mav = new ModelAndView("adds/nims/dsuseMgtReceipt-main"); setCmmCode("ADDS11", mav); - List deptList = defaultOgdpBean.getDeptList(new OgdpQuery()); + List deptList = sggDeptService.getDepartmentList(new DepartmentQuery()); mav.addObject("DEPTList", deptList); return mav @@ -376,7 +376,7 @@ public class AddsNimsController extends ApplicationController { public ModelAndView dsuseMgtRsltMain() { ModelAndView mav = new ModelAndView("adds/nims/dsuseMgtRslt-main"); setCmmCode("ADDS11", mav); - List deptList = defaultOgdpBean.getDeptList(new OgdpQuery()); + List deptList = sggDeptService.getDepartmentList(new DepartmentQuery()); mav.addObject("DEPTList", deptList); return mav @@ -390,7 +390,7 @@ public class AddsNimsController extends ApplicationController { public ModelAndView dsuseMgtMapping() { ModelAndView mav = new ModelAndView("adds/nims/dsuseMgtMapping-main"); setCmmCode("ADDS11", mav); - List deptList = defaultOgdpBean.getDeptList(new OgdpQuery()); + List deptList = sggDeptService.getDepartmentList(new DepartmentQuery()); mav.addObject("DEPTList", deptList); return mav @@ -415,7 +415,7 @@ public class AddsNimsController extends ApplicationController { .filter(c -> c.getCode().compareTo("06") >= 0) .toList()); - List deptList = defaultOgdpBean.getDeptList(new OgdpQuery()); + List deptList = sggDeptService.getDepartmentList(new DepartmentQuery()); mav.addObject("DEPTList", deptList); mav.addObject("pageName", "dsuseMgtDoc"); From 1812bf52b8289d3382899b19a10cf33e5194c854 Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Thu, 4 Jul 2024 17:26:21 +0900 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=EA=B4=80=EB=A6=AC=EC=9E=90=EC=9D=B8?= =?UTF-8?q?=20=EA=B2=BD=EC=9A=B0=20=EB=93=B1=EB=A1=9D,=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=EB=B0=8F=20=EC=82=AD=EC=A0=9C=20=EA=B8=B0=EB=8A=A5?= =?UTF-8?q?=20disable=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 5 +++-- .../WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp | 7 ++++--- .../jsp/adds/nims/dsuseMgtMapping-main.jsp | 21 ++++++++++--------- .../jsp/adds/nims/dsuseMgtReceipt-info.jsp | 17 ++++----------- .../jsp/adds/nims/dsuseMgtReceipt-main.jsp | 5 +++++ .../jsp/adds/nims/dsuseMgtRslt-info.jsp | 13 +++++++----- .../jsp/adds/nims/dsuseMgtRslt-main.jsp | 10 ++++++--- 7 files changed, 42 insertions(+), 36 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b6d47fd..d020ff1 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -89,8 +89,9 @@ spring: datasource: hikari: - driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - jdbc-url: jdbc:log4jdbc:mariadb://211.119.124.9:4407/adds?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Seoul&useSSL=false + #driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + driver-class-name: org.mariadb.jdbc.Driver + jdbc-url: jdbc:mariadb://211.119.124.9:4407/adds?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Seoul&useSSL=false username: addsweb password: addsweb1234 auto-commit: false diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp index a0fa1b8..e7904a5 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp @@ -218,9 +218,10 @@ $("#btnCreateDsuseRsltListPhoto--${pageName}").prop("disabled", true); return; } - $("#btnCreateDsuseRsltDoc--${pageName}").prop("disabled", false); - $("#btnCreateDsuseRsltListPhoto--${pageName}").prop("disabled", false); - + if(!${currentUser.hasAuthorities("ROLE_MANAGER")} && !${currentUser.hasAuthorities("ROLE_ADMIN")}) { + $("#btnCreateDsuseRsltDoc--${pageName}").prop("disabled", false); + $("#btnCreateDsuseRsltListPhoto--${pageName}").prop("disabled", false); + } let key = item.data.dscdmng_id; $("#tbody--${pageName}").setCurrentRow(key); diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp index afb194c..a3a5d3c 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp @@ -274,18 +274,19 @@ $P.detailControl.query = { "schDscdmngId" : dscdmngId}; $P.detailControl.load(1); - if(item.data.PRGRS_STTS_CD == '21'){ - $("#btnPrgsSttus--${pageName}").prop("disabled", false); - }else{ - $("#btnPrgsSttus--${pageName}").prop("disabled", true); - } + if(!${currentUser.hasAuthorities("ROLE_MANAGER")} && !${currentUser.hasAuthorities("ROLE_ADMIN")}) { + if(item.data.PRGRS_STTS_CD == '21'){ + $("#btnPrgsSttus--${pageName}").prop("disabled", false); + }else{ + $("#btnPrgsSttus--${pageName}").prop("disabled", true); + } - if(item.data.PRGRS_STTS_CD == '06' || item.data.PRGRS_STTS_CD == '21'){ - $("#btnCreateDsuseMgtMapping--${pageName}").prop("disabled", false); - }else{ - $("#btnCreateDsuseMgtMapping--${pageName}").prop("disabled", true); + if(item.data.PRGRS_STTS_CD == '06' || item.data.PRGRS_STTS_CD == '21'){ + $("#btnCreateDsuseMgtMapping--${pageName}").prop("disabled", false); + }else{ + $("#btnCreateDsuseMgtMapping--${pageName}").prop("disabled", true); + } } - }; // 현재 선택 자료 변경 이벤트 diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp index 6fa83ea..19ff9c1 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp @@ -224,8 +224,6 @@ if (!item) return; $P.bsshFormFields.set($P.control, item); - // 업무구분에 따른 URL 변경 - //$P.fnSetURL(item.data.bsshCd); } $P.productControl.onCurrentChange = item => { @@ -233,8 +231,6 @@ // Dataset 셋팅 $P.productFormFields.set($P.productControl, item); - // 업무구분에 따른 URL 변경 - //$P.fnSetURL(item.data.bsshCd); } // 저장 callback @@ -388,14 +384,7 @@ $P.control.query.fetchSize = $P.control.defaultFetchSize * $P.control.query.pageNum; $P.control.load(1); } - - // 업무구분에 따른 URL 설정 - $P.fnSetURL = (taskSeCd) => { -// $P.control.urls.create = wctx.url("/" + taskSeCd + "${infoPrefixUrl}" + "/040/create.do"); // 등록 -// $P.control.urls.update = wctx.url("/" + taskSeCd + "${infoPrefixUrl}" + "/040/update.do"); // 수정 - } - - // 전자우편 안내문 등록 버튼 이벤트 + $P.fnSearchBssh = (title) => { $P.control.getBsshInfo(); } @@ -547,7 +536,9 @@ // 초기 화면 설정 $P.initForm = () => { - + if(${currentUser.hasAuthorities("ROLE_MANAGER")} || ${currentUser.hasAuthorities("ROLE_ADMIN")}) { + $("#btnSave--${pageName}").prop("disabled", true); + } } diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp index 9039bb1..7964616 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp @@ -643,6 +643,11 @@ $("#schDateTo--${pageName}").datepicker("setDate", new Date()); $('#schSggCd--${pageName}').val("${currentUser.deptCode}"); + + if(${currentUser.hasAuthorities("ROLE_MANAGER")} || ${currentUser.hasAuthorities("ROLE_ADMIN")}) { + $('#btnCreateDsuseMGT--${pageName}').prop('disabled', true); + $('#btnRemoveDsuseMGT--${pageName}').prop('disabled', true); + } } /************************************************************************** diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp index c707481..9762b47 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp @@ -52,7 +52,8 @@ -
+
+
-
+
-
+
- +
@@ -454,7 +455,9 @@ initDatepicker("frmEdit--${pageName}"); // 달력 초기화 - + if(${currentUser.hasAuthorities("ROLE_MANAGER")} || ${currentUser.hasAuthorities("ROLE_ADMIN")}) { + $("#btnSave--${pageName}").prop("disabled", true); + } } diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp index b032dc9..b6dea03 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp @@ -271,11 +271,16 @@ // 현재 선택 자료 변경 이벤트 $P.detailControl.onCurrentChange = (item) => { - if (!item) return; + if (!item){ + $('#btnCreateDsuseMGT--${pageName}').prop('disabled', true); + return; + } let key = item.data.DSCDMNG_SN; - $("#tbody--${pageName}Detail").setCurrentRow(key); + if(!${currentUser.hasAuthorities("ROLE_MANAGER")} && !${currentUser.hasAuthorities("ROLE_ADMIN")}) { + $('#btnCreateDsuseMGT--${pageName}').prop('disabled', false); + } }; // 신청서 정보 dialog @@ -560,7 +565,6 @@ $('#schSttsCd--${pageName}').val('01'); $('#schSggCd--${pageName}').val("${currentUser.deptCode}"); } - /************************************************************************** * 최초 실행 함수 **************************************************************************/ From 28ccd23241a63bbab330ed4d5edb106a3e0c68b3 Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Thu, 4 Jul 2024 18:16:40 +0900 Subject: [PATCH 6/6] =?UTF-8?q?feat:=20=EC=97=85=EC=B2=B4=EA=B2=80?= =?UTF-8?q?=EC=83=89=20=ED=8C=9D=EC=97=85=20-=20=EB=8C=80=ED=91=9C?= =?UTF-8?q?=EC=9E=90=20=EA=B2=80=EC=83=89=20=EC=A1=B0=EA=B1=B4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/adds/nims/bssh-popup.jsp | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp index 937a3e0..5c3bcb3 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp @@ -8,16 +8,22 @@ <%-- --%>
-
- - +
+ +
-
- - +
+ + +
+
+ + +
+
+   +
-   -
@@ -204,9 +210,10 @@ $P.fnSearchList = (dbSkipYn) => { $P.control.query = { - ... $P.formFields.get(), + //... $P.formFields.get(), bc: $P.formFields.get().schBsshCd, bn: $P.formFields.get().schBsshNm, + rprsntvNm: $P.formFields.get().schRprsntvNm, dbSkipYn: dbSkipYn? dbSkipYn : "N", userId: "${currentUser.account}" };