3 Commits e151207ba1 ... b685b318c0

Author SHA1 Message Date
  DESKTOP-HMLPH8S\kim b685b318c0 eTEC E&C Standard 화면 및 쿼리 수정 2 years ago
  DESKTOP-HMLPH8S\kim 6f608c4e42 Merge branch 'master' of http://211.38.140.247:3000/sgc/sgc-portal 2 years ago
  DESKTOP-HMLPH8S\kim 394820410f Over View Week 비고사항 merge 해제 2 years ago

+ 2 - 2
src/main/resources/sqlmap/mappers/qc/qc0102/QC01020001UMapper.xml

@@ -55,7 +55,7 @@
 	</select>
 	
 	<select id="selectQcStndGudlList30" parameterType="map" resultType="easyHashMap">
-		SELECT DISTINCT A1.CMPN_CD, A1.DOC_ID, A1.UPPER_DOC_ID, A1.STND_DOC_NM_CLICK 
+		SELECT DISTINCT A1.CMPN_CD, A1.DOC_ID, A1.UPPER_DOC_ID, A1.STND_DOC_NM_CLICK || ' > ' || B1.GUDL_NM AS STND_DOC_NM_CLICK, B1.GUDL_SEQ 
   		  FROM (
 					WITH RECURSIVE_CODE
 					    (
@@ -164,7 +164,7 @@
 	</select>
 	
 	<select id="selectQcStndGudlList" parameterType="map" resultType="easyHashMap">
-		SELECT DISTINCT A1.CMPN_CD, A1.DOC_ID, A1.UPPER_DOC_ID, A1.STND_DOC_NM_CLICK 
+		SELECT DISTINCT A1.CMPN_CD, A1.DOC_ID, A1.UPPER_DOC_ID, A1.STND_DOC_NM_CLICK || ' > ' || B1.GUDL_NM AS STND_DOC_NM_CLICK, B1.GUDL_SEQ 
   		  FROM (
 					WITH RECURSIVE_CODE
 					    (

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

@@ -151,7 +151,8 @@
             callback: function(result, e) {
                 dcdataList1.setJSON(result);
 				scwin.grdSearch2();
-                //grdData1.mergeCol( 3 , true );
+               
+                grdData1.mergeCol( 2 , false );
                 grdData1.mergeByCol();
             }
         });

+ 4 - 1
src/main/webapp/ux/qc/qc0102/QC01020001P.xml

@@ -44,6 +44,7 @@
 						<w2:column dataType="text" id="docId" name=""></w2:column>
 						<w2:column dataType="text" id="upperDocId" name=""></w2:column>
 						<w2:column dataType="text" id="stndDocNmClick" name=""></w2:column>
+						<w2:column dataType="text" id="gudlSeq" name=""></w2:column>
 					</w2:columnInfo>
 				</w2:dataList>
 			</w2:dataCollection>
@@ -230,6 +231,7 @@
     	var docId = dcList2.getCellData( idx , "docId" );
     	var stndDocNmClick = dcList2.getCellData( idx , "stndDocNmClick" );
     	var upperDocId = dcList2.getCellData( idx , "upperDocId" );
+    	var gudlSeq = dcList2.getCellData( idx , "gudlSeq" );
         
         popupLib.closePopup();
         
@@ -244,7 +246,8 @@
 				guBun2 : "GUDL",
 				docId : docId,
 				upperDocId : upperDocId, 
-				name : stndDocNmClick
+				name : stndDocNmClick,
+				gudlSeq : gudlSeq
 			},
 		callback: ""
 		});

+ 4 - 1
src/main/webapp/ux/qc/qc0102/QC01020002P.xml

@@ -54,6 +54,7 @@
 						<w2:column dataType="text" id="docId" name=""></w2:column>
 						<w2:column dataType="text" id="upperDocId" name=""></w2:column>
 						<w2:column dataType="text" id="stndDocNmClick" name=""></w2:column>
+						<w2:column dataType="text" id="gudlSeq" name=""></w2:column>
 					</w2:columnInfo>
 				</w2:dataList>
 				<w2:dataList baseNode="list" id="dcList4" repeatNode="map" saveRemovedData="false" userData1="첨부파일목록" style="">
@@ -345,6 +346,7 @@
     	var docId = dcList3.getCellData( idx , "docId" );
     	var stndDocNmClick = dcList3.getCellData( idx , "stndDocNmClick" );
     	var upperDocId = dcList3.getCellData( idx , "upperDocId" );
+    	var gudlSeq = dcList3.getCellData( idx , "gudlSeq" );
         
         popupLib.closePopup();
         
@@ -359,7 +361,8 @@
 				guBun2 : "GUDL",
 				docId : docId,
 				upperDocId : upperDocId, 
-				name : stndDocNmClick
+				name : stndDocNmClick,
+				gudlSeq : gudlSeq
 			},
 		callback: ""
 		});

+ 7 - 1
src/main/webapp/ux/qc/qc0102/QC01020002U.xml

@@ -214,6 +214,8 @@
 		   	 	scwin.tabControl1_ontabclick("", 1);
     		}else if(param_data.guBun2 == "GUDL"){
     			
+    			tabGudlSeq = param_data.gudlSeq;
+    			
     			tabControl1.setReadOnly( true );
     			tabControl1.setSelectedTabIndex( 2 );
 		    	scwin.v_lastLeftRowIndex = 0;
@@ -236,6 +238,9 @@
 		   	 	
 		   	 	scwin.tabControl1_ontabclick("", 1);
     		}else if(param_data.guBun2 == "GUDL"){
+    		
+    			tabGudlSeq = param_data.gudlSeq;
+    		
     			tabControl1.setReadOnly( true );
     			tabControl1.setSelectedTabIndex( 2 );
 		    	scwin.v_lastLeftRowIndex = 0;
@@ -268,6 +273,7 @@
 	var tabGubun = "";
 	var tabDocId = "";
 	var tabUpperDocId = "";
+	var tabGudlSeq = "";
 
     /**************************************************************************
      * [3] Event 정의
@@ -386,7 +392,7 @@
 			    	scwin.grdSearch2(tabDocId);
 
 			    }else if(tab == 2){
-			    	scwin.grdSearch3(tabDocId);
+			    	scwin.grdSearch3(tabDocId, tabGudlSeq);
 			    }
 		    }
         });