Browse Source

Merge remote-tracking branch 'origin/master'

SBK 1 year ago
parent
commit
f1474e0069

+ 1 - 1
src/main/resources/sqlmap/mappers/cw/cw1501/CW15010001UMapper.xml

@@ -63,7 +63,7 @@
 	</select>
 	</select>
     
     
    	<select id="selectZherCarDisplList" parameterType="map" resultType="easyHashMap">
    	<select id="selectZherCarDisplList" parameterType="map" resultType="easyHashMap">
-			select NVL(max(A.re_yyyymmdd), TO_CHAR(SYSDATE, 'YYYYMMDD'))  LDAY,  
+			select NVL(max(A.re_yyyymmdd), '00000000')  LDAY,  
 			       max(to_number(B.car_id)) ROMID 
 			       max(to_number(B.car_id)) ROMID 
 			  FROM ZEHR_CAR_DISPL A, ZEHR_CAR_INFO B
 			  FROM ZEHR_CAR_DISPL A, ZEHR_CAR_INFO B
    	</select>
    	</select>

+ 5 - 1
src/main/webapp/ux/cw/cw1501/CW15010001P.xml

@@ -126,7 +126,11 @@
     		return;
     		return;
     	}
     	}
     	
     	
-    	dcsearchMap1.set( "cmpnCd" 		, scwin.cmpnCd );
+    	if(lday = '00000000') {
+    		lday = sel1.getValue()-1 +"1231";
+    	}
+    	
+    	dcsearchMap1.set( "cmpnCd" 	, scwin.cmpnCd );
     	dcsearchMap1.set( "inDate1" , lday );
     	dcsearchMap1.set( "inDate1" , lday );
     	dcsearchMap1.set( "inDate2" , sel1.getValue() + "1231" );
     	dcsearchMap1.set( "inDate2" , sel1.getValue() + "1231" );