성장점수 데이터 업는 경우 오류 발생 수정

src/main/java/com/backoffice/m/bf_growth/M_Bf_growthController.java

@@ -507,6 +507,8 @@ public class M_Bf_growthController extends AbstractControllerManager{
 					
 					// 2. rm_growth_body: 마지막 측정 값
 					DataMap rm_growth_body = bf_growth_bodyBO.select_bf_growth_body_child_for_last(paramMap); //smc_no, OEM_CODE
+					if(rm_growth_body == null ) rm_growth_body = new DataMap();
+					
 					// 3. rm_child 추가 정보: age, m
 					String birth_dt = RenaStringUtil.getData(rm_child, "birthday");
 					String base_dt = RenaStringUtil.getData(rm_growth_body, "base_dt");
@@ -545,7 +547,7 @@ public class M_Bf_growthController extends AbstractControllerManager{
 							}
 						}
 					}
-	
+		            
 		            if( RenaStringUtil.getDataToDouble(rm_growth_body, "height") == height_min)
 		            	rm_growth_body.put("degrowth", "Y");
 		            else rm_growth_body.put("degrowth", "N");

src/main/java/com/renastudio/creative/web/util/date/DateUtil.java

@@ -381,42 +381,47 @@ public class DateUtil {
 	}
 
 	public static int getDistanceByTwoMonth(String sDate, String eDate, String s_format, String e_format){
-		Calendar startCalendar = new GregorianCalendar();
-		startCalendar.setTime(DateUtil.getStringToDateTime(sDate, s_format));
-		Calendar endCalendar = new GregorianCalendar();
-		endCalendar.setTime(DateUtil.getStringToDateTime(eDate, e_format));
-
-		int diffYear = endCalendar.get(Calendar.YEAR) - startCalendar.get(Calendar.YEAR);
-		int diffMonth = diffYear * 12 + endCalendar.get(Calendar.MONTH) - startCalendar.get(Calendar.MONTH);
-
-        // 생일 안 지난 경우 month -1
-        if (startCalendar.get(Calendar.MONTH) * 100 + startCalendar.get(Calendar.DATE) > endCalendar.get(Calendar.MONTH) * 100 + endCalendar.get(Calendar.DATE) ) 
-            diffMonth--;
-        
+		int diffMonth  =0;
+		if( !null2Str(sDate,"").equals("") &&  !null2Str(eDate,"").equals("")  ) {
+			Calendar startCalendar = new GregorianCalendar();
+			startCalendar.setTime(DateUtil.getStringToDateTime(sDate, s_format));
+			Calendar endCalendar = new GregorianCalendar();
+			endCalendar.setTime(DateUtil.getStringToDateTime(eDate, e_format));
+	
+			int diffYear = endCalendar.get(Calendar.YEAR) - startCalendar.get(Calendar.YEAR);
+			diffMonth = diffYear * 12 + endCalendar.get(Calendar.MONTH) - startCalendar.get(Calendar.MONTH);
+	        // 생일 안 지난 경우 month -1
+	        if (startCalendar.get(Calendar.MONTH) * 100 + startCalendar.get(Calendar.DATE) > endCalendar.get(Calendar.MONTH) * 100 + endCalendar.get(Calendar.DATE) ) 
+	            diffMonth--;
+	        
+		}
 		return diffMonth;
 	}
 	
-	public static int getAge(String birthDate, String birth_format, String baseDate, String base_format)
-	{
-		Calendar birthCalendar = new GregorianCalendar();
-		birthCalendar.setTime(DateUtil.getStringToDateTime(birthDate, birth_format));
+	public static int getAge(String birthDate, String birth_format, String baseDate, String base_format) {
 		
-		int birthYear = birthCalendar.get(Calendar.YEAR);
-		int birthMonth = birthCalendar.get(Calendar.MONTH) + 1;
-		int birthDay = birthCalendar.get(Calendar.DAY_OF_MONTH);
-
-		Calendar baseCalendar = new GregorianCalendar();
-		baseCalendar.setTime(DateUtil.getStringToDateTime(baseDate, base_format));
-
-        int currentYear  = baseCalendar.get(Calendar.YEAR);
-        int currentMonth = baseCalendar.get(Calendar.MONTH) + 1;
-        int currentDay   = baseCalendar.get(Calendar.DAY_OF_MONTH);
-      
-        int age = currentYear - birthYear;
-        // 생일 안 지난 경우 -1
-        if (birthMonth * 100 + birthDay > currentMonth * 100 + currentDay) 
-            age--;
-      
+		int age = 0;
+	
+		if( !null2Str(birthDate,"").equals("") &&  !null2Str(baseDate,"").equals("")  ) {
+			Calendar birthCalendar = new GregorianCalendar();
+			birthCalendar.setTime(DateUtil.getStringToDateTime(birthDate, birth_format));
+			
+			int birthYear = birthCalendar.get(Calendar.YEAR);
+			int birthMonth = birthCalendar.get(Calendar.MONTH) + 1;
+			int birthDay = birthCalendar.get(Calendar.DAY_OF_MONTH);
+	
+			Calendar baseCalendar = new GregorianCalendar();
+			baseCalendar.setTime(DateUtil.getStringToDateTime(baseDate, base_format));
+	
+	        int currentYear  = baseCalendar.get(Calendar.YEAR);
+	        int currentMonth = baseCalendar.get(Calendar.MONTH) + 1;
+	        int currentDay   = baseCalendar.get(Calendar.DAY_OF_MONTH);
+	      
+	        age = currentYear - birthYear;
+	        // 생일 안 지난 경우 -1
+	        if (birthMonth * 100 + birthDay > currentMonth * 100 + currentDay) 
+	            age--;
+		} 
         return age;
 	}
 	
@@ -749,12 +754,14 @@ public class DateUtil {
 		final SimpleDateFormat f = new SimpleDateFormat(pattern);
 		
 		Date result = null;
-		try {
-			result = f.parse(date);
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+		if(date !=null && date.length() >7 ) {
+			try {
+				result = f.parse(date);
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}	
 		return result;
 	}	
 		
@@ -957,4 +964,11 @@ public class DateUtil {
 
 		return df.format(date);
 	}
+	
+	public static String null2Str(Object str, String strDefault) {
+		if(str == null || str == "null" || str.toString().length() == 0)
+			return strDefault;
+		else
+			return str.toString();
+	}
 }

src/main/webapp/WEB-INF/views/ftl/m/bf_growth/growth_balance.ftl

@@ -94,7 +94,7 @@
 					 <!-- growth_subMain_graph -->
                     <div class="growth_subMain_graph">
                      	<div class="growth_subMain_graph_box"> 
-                    		<span>${model['rm_report']['height_explain']}</span>
+                    		<span style="font-size:14px;">${model['rm_report']['height_explain']}</span>
                     	</div>	
                     </div>