jprdonnelly/tcommon-studio-se
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TDI-32659: Tmap:the function "Talenddate"-"diffdate" is not correct

Browse Source 
https://jira.talendforge.org/browse/TDI-32659
This commit is contained in:
wluo-talend
2015-08-06 15:40:11 -07:00
parent fd29309c37
commit eef60ff013
6 changed files with 311 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
main/plugins/org.talend.librariesmanager/resources/java/routines/TalendDate.java
View File

@@ -211,6 +211,15 @@ public class TalendDate {
* @param ignoreTimeZone (if true ignore TimeZone when pare date with pattern)
* @return the result whether the stringDate is a date string that with a right pattern
*
* {talendTypes} Boolean
*
* {Category} TalendDate
*
* {param} String(mydate) stringDate : the date to judge
*
* {param} String("yyyy-MM-dd HH:mm:ss") pattern : the specified pattern
*
* {param} boolean(true) ignoreTimeZone : ignore the time zone
*/
public static boolean isDate(String stringDate, String pattern, boolean ignoreTimeZone) {
TimeZone tz = TimeZone.getDefault();
@@ -328,7 +337,7 @@ public class TalendDate {
*
* {param} date(myDate) date : the date to update
*
* {param} date(addValue) nb : the added value
* {param} int(addValue) nb : the added value
*
* {param} date("MM") dateType : the part to add
*
@@ -382,11 +391,11 @@ public class TalendDate {
*
* {Category} TalendDate
*
* {param} date(myDate) date : the date to update
* {param} String("") string : date represent in string
*
* {param} date(pattern) string : the pattern
* {param} String("yyyy-MM-dd") pattern : date pattern
*
* {param} date(addValue) nb : the added value
* {param} int(addValue) nb : the added value
*
* {param} date("MM") dateType : the part to add
*
@@ -463,6 +472,8 @@ public class TalendDate {
*
* {param} String("MM") dateType : the difference on the specified part
*
* {param} boolean(true) ignoreDST : ignore daylight saving time or not.
*
* {examples}
*
* ->> diffDate(2012/03/26 00:00:00, 2012/03/24 00:00:00, "dd", true) : return 2 not 1 in GMT+1#
@@ -565,8 +576,6 @@ public class TalendDate {
*
* {param} date(myDate2) date2 : the second date to compare
*
* {param} String("MM") dateType : the difference on the specified part
*
* {examples}
*
* ->> diffDate(2012/03/26 00:00:00, 2012/03/24 00:00:00) : return 2 not 1 in GMT+1#
@@ -1010,24 +1019,6 @@ public class TalendDate {
return new Date(random);
}
/**
*
* Method used for tests only.
*
* @param args
*/
public static void main(String[] args) {
// test_formatDate();
// test_isDate();
// test_getRandomDate();
// System.out.println(getPartOfDate("DAY_OF_WEEK_IN_MONTH", parseDate("yyyy-MM-dd", "2010-12-26")));
// System.out.println(getPartOfDate("WEEK_OF_MONTH", parseDate("yyyy-MM-dd", "2010-12-26")));
System.out.println(TalendDate.diffDateFloor(TalendDate.parseDate("yyyy/MM/dd hh:mm:ss.SSS", "2011/05/10 14:15:16.788"),
TalendDate.parseDate("yyyy/MM/dd hh:mm:ss.SSS", "2010/05/10 14:15:16.789"), "MM"));
}
/**
*
* Testcase: