Browse Source

Over View Week 재수정

DESKTOP-HMLPH8S\kim 2 years ago
parent
commit
0b3790fdb1

+ 2 - 1
src/main/resources/sqlmap/mappers/cw/cw0902/CW09020001UMapper.xml

@@ -46,9 +46,10 @@
 										AND B.DEPT_CD = #{deptCd} 
 										</when>
 										<otherwise>
-										AND A.P_DEPT_CD = #{lvDeptCd}  OR (A.DEPT_CD = #{lvDeptCd} OR A.P_DEPT_CD = NULL) 
+										AND A.CD_CCGRP = #{lvDeptCd}  OR (A.DEPT_CD = #{lvDeptCd} OR A.CD_CCGRP = NULL) 
 										</otherwise>
 									</choose>
+								  AND LENGTH(A.DEPT_CD) NOT IN ('2')
 								GROUP BY A.CMPN_CD, A.DEPT_NM, B.WORK_BASEDATE_FROM, C.WORK_EMP_NO, B.WORK_BASEDATE_TO, B.ATCHFILE_ID, A.DEPT_CD
 					     ) A1
 			     		 LEFT JOIN SM_COM_ATCHFILE B1 ON A1.ATCHFILE_ID = B1.ATCHFILE_ID AND B1.DEL_YN= 'N'

+ 4 - 4
src/main/webapp/ux/cw/cw0902/CW09020001P.xml

@@ -84,7 +84,7 @@
         
         deptCd1 = scwin.param.deptCd;
         workBasedateFrom1 = scwin.param.workBasedateFrom;
-		pDeptCd1 = scwin.param.pDeptCd;
+		cdCcgrp1 = scwin.param.cdCcgrp;
 		
         scwin.grdSearch();
     };
@@ -103,7 +103,7 @@
     scwin.param;
     var cmpnCd1 = "";
     var deptCd1 = "";
-    var pDeptCd1 = "";
+    var cdCcgrp1 = "";
     var workBasedateFrom1 = "";
     var guBun1 = "";
 
@@ -133,13 +133,13 @@
     scwin.grdSearch = function(){
 		
 		guBun1 = 'P';		
-		if(pDeptCd1 == "" || pDeptCd1 == null || pDeptCd1 == " " || pDeptCd1 == undefined){
+		if(cdCcgrp1 == "" || cdCcgrp1 == null || cdCcgrp1 == " " || cdCcgrp1 == undefined){
 			guBun1 = 'D';
 		}
 		
 		dcsearchMap1.set( "cmpnCd" 		 	 , scwin.cmpnCd );
 		dcsearchMap1.set( "deptCd" 		 	 , deptCd1 );
-		dcsearchMap1.set( "lvDeptCd" 		 , pDeptCd1 );
+		dcsearchMap1.set( "lvDeptCd" 		 , cdCcgrp1 );
 		dcsearchMap1.set( "workBasedateFrom" , workBasedateFrom1 );
 		dcsearchMap1.set( "guBun1" 		 	 , guBun1 );		
 				

+ 2 - 2
src/main/webapp/ux/cw/cw0902/CW09020001U.xml

@@ -246,7 +246,7 @@
         
         var deptCd = dcdataList1.getCellData( row , "deptCd");
         var workBasedateFrom = dcdataList1.getCellData( row , "workBasedateFrom");
-        var pDeptCd = dcdataList1.getCellData( row , "pDeptCd");
+        var cdCcgrp = dcdataList1.getCellData( row , "cdCcgrp");
         
 		if(col == 0 || col == 1){
 	
@@ -263,7 +263,7 @@
 					param: {
 					    workBasedateFrom : colunmId,
 					    deptCd : deptCd,
-					    pDeptCd : pDeptCd
+					    cdCcgrp : cdCcgrp
 					},
 					callback: ""
 				});