From 2fb488386dace9c6dd03c09ffadaff01db88e0b0 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 10 Jan 2017 10:39:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E4=BD=9C=E5=BA=9F=E4=BA=A7?= =?UTF-8?q?=E6=A3=80=E5=8A=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/common/utils/DateUtil.java | 106 ++++----------------- 1 file changed, 18 insertions(+), 88 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 3ada921..3d0478d 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -70,18 +70,30 @@ public class DateUtil { int year1 = c1.get(Calendar.YEAR); int year2 = c2.get(Calendar.YEAR); - int mouth1 = c1.get(Calendar.MONTH); - int mouth2 = c2.get(Calendar.MONTH); + int mouth1 = c1.get(Calendar.MONTH);//0当前 + int mouth2 = c2.get(Calendar.MONTH);//4 int i=0; - if(mouth2-mouth1>=0){ - int days1 = c1.get(Calendar.DAY_OF_MONTH); - int days2 = c2.get(Calendar.DAY_OF_MONTH); + /* if(mouth2-mouth1>=0){ + int days1 = c1.get(Calendar.DAY_OF_MONTH);//当前10 + int days2 = c2.get(Calendar.DAY_OF_MONTH);//1 if(days1days2){ } }else if(mouth1-mouth2<0){ i=i-1; + }*/ + + if(mouth2==mouth1){ + int days1 = c1.get(Calendar.DAY_OF_MONTH);//当前10 + int days2 = c2.get(Calendar.DAY_OF_MONTH);//1 + if(days1days2){ +// i=i-1; + } + }else if(mouth2>mouth1){ + i=i-1; } @@ -766,89 +778,7 @@ public class DateUtil { public static void main(String[] arg) { - /* Date today = new Date(1448336360000L); - - System.out.println(DateUtil.getyyyy_MM_dd_hms(today)); - System.out.println(today); - System.out.println(getWeek(parseYMDHMS("2015-05-20 16:30:00"), parseYMDHMS("2015-12-22 11:30:00"))); - System.out.println(new DateTime().minusDays(77));*/ -// System.out.println(getDaySeconds()); - -// String s = getBabyMonthAge(parseYMD("2015-08-12"), new Date()); -// System.out.println(s); -// SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd "); -// System.out.println(getBabyAgeMonth(parseYMD("2016-05-23"), new Date())); -// System.out.println(DateUtil.getyyyy_MM_dd_hms(DateUtil.addDay(new Date(),-108))); -// System.out.println(DateUtil.getyyyy_MM_dd_hms(DateUtil.addDay(new Date(), -146))); -// System.out.print(1457688652-23341); - //1457711993 -// 1426089600 - -// Date lastLmess = parseYMD("2016-07-02"); -// Date startDate = DateUtil.getRangeDate(lastLmess, 1, "周", -2); -// Date startDate = DateUtil.addDay(new Date(), -100); -// System.out.println(getyyyy_MM_dd(startDate)); - try { - -// Date startDate = DateUtil.addMonth(new Date(), -1); -// Date endtDate = DateUtil.addMonth(new Date(), -2); -// System.out.println(y_m_d_h_m_s.format(startDate)); -// System.out.println(y_m_d_h_m_s.format(endtDate)); - -// Date d = parseD("7"); -// System.out.print(getDD(d)); - -// Date sendDate = dd.parse("02"); -// String md = DateUtil.getMMdd(new Date()); -// String str = md +"-"+DateUtil.getDD(sendDate); -// Date d = DateUtil.parseYMD(str); -// -// Date actualSendDate = DateUtil.addDay(d, -2); -// String sendDateStr = DateUtil.getDD(actualSendDate); - -// SimpleDateFormat md = new SimpleDateFormat("M-d"); -// String st = md.format(new Date()); -// System.out.print(st); - -// int s = getBabyMonthAge1(parseYMD("2016-09-07"), new Date()); -// System.out.println(s); -// Date s = addDay(parseYMD("2016-02-26"), 168); - -// int start = 38; -// int end = 38; -//// -//// -//// Date startDate = DateUtil.getNewDate(-end-1,"周",1+1); -//// Date endDate = DateUtil.getNewDate(-start,"周",0+1); -// -// -// Date startDate = DateUtil.getNewDate(-end-1,"周",2+1); -// Date endDate = DateUtil.getNewDate(-start,"周",2); -// -// -// String date = y_m_d_h_m_s.format(startDate.getTime()); -//// Date startDate = DateUtil.getNewDate(-end-1,"月",1); -//// Date endDate = DateUtil.getNewDate(-start,"月",1); -// -// System.out.println(date + "==="); - - -// Date startDate = getRangeDate(parseYMD("2016-09-07"),2,"周",-1); -// System.out.println(getyyyy_MM_dd(startDate)); - - - int a = getBabyAgeMonth(parseYMD("2012-10-01"),parseYMD("2016-10-01")); -// int a = daysBetween(parseYMD("2016-10-01"),new Date())/7; - System.out.println(a); - -// Date dueDate = DateUtil.addDay(DateUtil.addMonth(parseYMD("2016-02-08"), 9), 7); -// System.out.println(getyyyy_MM_dd(dueDate)); - } catch (Exception e) - { - - } - - + System.out.println(getAge(parseYMD("1990-01-9"))); } /** -- 1.8.3.1