Merge branch 'refs/heads/main' into dev-server-call

# Conflicts:
#	src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java

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;

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;

src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java

@@ -49,6 +49,8 @@ import cokr.xit.base.web.ApplicationController;
 import cokr.xit.foundation.data.DataObject;
 import cokr.xit.foundation.data.JSON;
 import cokr.xit.foundation.web.WebClient;
+import net.minidev.json.JSONObject;
+import net.minidev.json.parser.ParseException;
 
 @Controller
 @RequestMapping(
@@ -68,8 +70,8 @@ public class AddsNimsController extends ApplicationController {
     @Value("${app.inf.nims.api.productAndseqInfo}")
     private String productAndseqInfoEndpoint;
 
-    @Resource(name="defaultOgdpBean")
+    @Resource(name="sigunguDepartmentService")
-    private DefaultOgdpBean defaultOgdpBean;
+    private SigunguDepartmentService sggDeptService;
 
     @Resource(name="dsuseMgtReceiptService")
     private DsuseMgtReceiptService dsuseMgtReceiptService;
@@ -374,7 +376,7 @@ public class AddsNimsController extends ApplicationController {
         ModelAndView mav = new ModelAndView("adds/nims/dsuseMgtReceipt-main");
         setCmmCode("ADDS11", mav);
 
-        List<DataObject> deptList = defaultOgdpBean.getDeptList(new OgdpQuery());
+        List<DataObject> deptList = sggDeptService.getDepartmentList(new DepartmentQuery());
     	mav.addObject("DEPTList", deptList);
 
         return mav
@@ -388,7 +390,7 @@ public class AddsNimsController extends ApplicationController {
     public ModelAndView dsuseMgtRsltMain() {
         ModelAndView mav = new ModelAndView("adds/nims/dsuseMgtRslt-main");
         setCmmCode("ADDS11", mav);
-        List<DataObject> deptList = defaultOgdpBean.getDeptList(new OgdpQuery());
+        List<DataObject> deptList = sggDeptService.getDepartmentList(new DepartmentQuery());
         mav.addObject("DEPTList", deptList);
 
         return mav
@@ -402,7 +404,7 @@ public class AddsNimsController extends ApplicationController {
     public ModelAndView dsuseMgtMapping() {
         ModelAndView mav = new ModelAndView("adds/nims/dsuseMgtMapping-main");
         setCmmCode("ADDS11", mav);
-        List<DataObject> deptList = defaultOgdpBean.getDeptList(new OgdpQuery());
+        List<DataObject> deptList = sggDeptService.getDepartmentList(new DepartmentQuery());
         mav.addObject("DEPTList", deptList);
 
         return mav
@@ -427,7 +429,7 @@ public class AddsNimsController extends ApplicationController {
                 .filter(c -> c.getCode().compareTo("06") >= 0)
                 .toList());
 
-        List<DataObject> deptList = defaultOgdpBean.getDeptList(new OgdpQuery());
+        List<DataObject> deptList = sggDeptService.getDepartmentList(new DepartmentQuery());
         mav.addObject("DEPTList", deptList);
 
         mav.addObject("pageName", "dsuseMgtDoc");

src/main/resources/application.yml

@@ -105,8 +105,9 @@ spring:
 
   datasource:
     hikari:
-      driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
+      #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: 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

src/main/resources/sql/mapper/base/actiongroup-mapper.xml

@@ -52,7 +52,10 @@ DELETE FROM TB_ACTION_GRP
 
 <select id="getActionList" parameterType="map" resultType="dataobject">/* 그룹별 기능 가져오기(actionGroupMapper.getActionList) */
 <include refid="utility.paging-prefix" />
-SELECT *
+SELECT GRP_ID
+     , ACTION
+     , REG_DT
+     , RGTR
   FROM TB_GRP_ACTION
 <if test="groupIDs != null">WHERE GRP_ID IN (<foreach collection="groupIDs" item="groupID" separator=",">#{groupID}</foreach>)</if>
 <include refid="utility.orderBy" />

src/main/resources/sql/mapper/base/authority-mapper.xml

@@ -95,7 +95,9 @@ DELETE FROM TB_AUTHORITY
 
 <select id="getActionGroupList" parameterType="map" resultType="dataobject">/* 권한-기능그룹 가져오기(authorityMapper.getActionGroups) */
 <include refid="utility.paging-prefix" />
-SELECT *
+SELECT AUTH_ID
+     , GRP_ID
+     , REG_DT
   FROM TB_AUTH_ACTION
 <if test="authIDs != null">WHERE AUTH_ID IN (<foreach collection="authIDs" item="authID" separator=",">#{authID}</foreach>)</if>
  ORDER BY AUTH_ID, GRP_ID
@@ -135,7 +137,10 @@ SELECT A.AUTH_ID
 
 <sql id="selectAuthUser">
 <include refid="utility.paging-prefix" />
-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
 <where>

src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp

@@ -8,16 +8,22 @@
 	<!-- hidden -->
 <%--		<label for="bssh--${pageName}">마약류 취급업체 정보</label>--%>
 		<div class="row my-1 mx-4 g-1" style="align-items: baseline">
-			<div class="col-md-4">
+			<div class="col-md-3">
-				<label for="bsshNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">취급업체명</label>
+				<label for="schBsshNm--${pageName}" class="w-px-90 bg-lighter pe-2 col-form-label text-sm-end">취급업체명</label>
-				<input type="text" class="form-control w-60" id="bsshNm--${pageName}" name="schBsshNm" data-map="BSSH_NM" >
+				<input type="text" class="form-control w-50" id="schBsshNm--${pageName}" name="schBsshNm" data-map="BSSH_NM" >
 			</div>
-			<div class="col-md-4">
+			<div class="col-md-3">
-				<label for="bsshCd--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">취급자번호</label>
+				<label for="schRprsntvNm--${pageName}" class="w-px-80 bg-lighter pe-2 col-form-label text-sm-end">대표자명</label>
-				<input type="text" class="form-control w-60" id="bsshNm--${pageName}" name="schBsshCd" data-map="BSSH_CD" >
+				<input type="text" class="form-control w-50" id="schRprsntvNm--${pageName}" name="schRprsntvNm" data-map="RPRSNTV_NM" >
+			</div>
+			<div class="col-md-3">
+				<label for="schBsshCd--${pageName}" class="w-px-90 bg-lighter pe-2 col-form-label text-sm-end">취급자번호</label>
+				<input type="text" class="form-control w-50" id="schBsshCd--${pageName}" name="schBsshCd" data-map="BSSH_CD" >
+			</div>
+			<div class="col-md-3">
+				<button type="button" class="btn btn-search w-px-120" id="btnSearch--${pageName}" title="검색">검색</button>&nbsp;
+				<button type="button" class="btn btn-primary w-px-120" id="btnSearch2--${pageName}" title="검색">NIMS 검색</button>
 			</div>
-			<button type="button" class="btn btn-search w-px-120" id="btnSearch--${pageName}" title="검색">검색</button>&nbsp;
-			<button type="button" class="btn btn-primary w-px-120" id="btnSearch2--${pageName}" title="검색">NIMS 검색</button>
 		</div>
 	</div>
 </form>
@@ -205,9 +211,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}"
 			};

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);
+			if(!${currentUser.hasAuthorities("ROLE_MANAGER")} && !${currentUser.hasAuthorities("ROLE_ADMIN")}) {
-			$("#btnCreateDsuseRsltListPhoto--${pageName}").prop("disabled", false);
+				$("#btnCreateDsuseRsltDoc--${pageName}").prop("disabled", false);
-			
+				$("#btnCreateDsuseRsltListPhoto--${pageName}").prop("disabled", false);
+			}
 			let key = item.data.dscdmng_id;
 
 			$("#tbody--${pageName}").setCurrentRow(key);

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'){
+			if(!${currentUser.hasAuthorities("ROLE_MANAGER")} && !${currentUser.hasAuthorities("ROLE_ADMIN")}) {
-				$("#btnPrgsSttus--${pageName}").prop("disabled", false);
+				if(item.data.PRGRS_STTS_CD == '21'){
-			}else{
+					$("#btnPrgsSttus--${pageName}").prop("disabled", false);
-				$("#btnPrgsSttus--${pageName}").prop("disabled", true);
+				}else{
-			}
+					$("#btnPrgsSttus--${pageName}").prop("disabled", true);
+				}
 
-			if(item.data.PRGRS_STTS_CD == '06' || item.data.PRGRS_STTS_CD == '21'){
+				if(item.data.PRGRS_STTS_CD == '06' || item.data.PRGRS_STTS_CD == '21'){
-				$("#btnCreateDsuseMgtMapping--${pageName}").prop("disabled", false);
+					$("#btnCreateDsuseMgtMapping--${pageName}").prop("disabled", false);
-			}else{
+				}else{
-				$("#btnCreateDsuseMgtMapping--${pageName}").prop("disabled", true);
+					$("#btnCreateDsuseMgtMapping--${pageName}").prop("disabled", true);
+				}
 			}
-			
 		};
 		
 		// 현재 선택 자료 변경 이벤트
@@ -332,7 +333,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,

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);
+			}
 		}
 
 

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);
+            }
         }
 
         /**************************************************************************

src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp

@@ -52,7 +52,8 @@
 					<input type="text" class="form-control w-45 form-date" id="dsuseDe--${pageName}" name="dsuseDe" data-fmt-type="day" data-map="dsuseDe" autocomplete="off" title="종료 날짜 선택" />
 					<button type="button" class="bx bx-sm bx-calendar bg-white"></button>
 				</div>
-				<div class="col-md-6">					
+				<div class="col-md-4"></div>
+				<div class="col-md-4">
 					<label for="dsuseSeCd--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">폐기구분</label>
 					<select class="form-select" id="dsuseSeCd--${pageName}" name="dsuseSeCd">
 						<c:forEach items="${ADDS03}" var="item">
@@ -60,7 +61,7 @@
 						</c:forEach>
 					</select>
 				</div>
-				<div class="col-md-6">
+				<div class="col-md-4">
 					<label for="dsuseMthCd--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">폐기방법</label>
 					<select class="form-select" id="dsuseMthCd--${pageName}" name="dsuseMthCd">
 						<c:forEach items="${ADDS05}" var="item">
@@ -68,9 +69,9 @@
 						</c:forEach>
 					</select>
 				</div>
-				<div class="col-md-10">
+				<div class="col-md-8">
 					<label for="dsuseLoc--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">폐기장소</label>
-					<input type="text" class="form-control w-80" id="dsuseLoc--${pageName}" name="dsuseLoc" data-map="dsuseLoc">
+					<input type="text" class="form-control w-30" id="dsuseLoc--${pageName}" name="dsuseLoc" data-map="dsuseLoc">
 				</div>
 				<div class="col-md-12">
 					<span class="d-inline-flex">
@@ -454,7 +455,9 @@
 
 			initDatepicker("frmEdit--${pageName}");																// 달력 초기화
 
-
+			if(${currentUser.hasAuthorities("ROLE_MANAGER")} || ${currentUser.hasAuthorities("ROLE_ADMIN")}) {
+				$("#btnSave--${pageName}").prop("disabled", true);
+			}
 		}
 
 

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}");
         }
-
         /**************************************************************************
          * 최초 실행 함수
          **************************************************************************/