日期特殊处理

ibzdst-core/src/main/java/cn/ibizlab/core/lite/extensions/domain/ModelObj.java

@@ -561,7 +561,7 @@ public class ModelObj extends DataObj<String,Object> {
             quStr=quStr.replace("+","").trim();
             Integer day=0;
             if(!StringUtils.isEmpty(quStr)){
-                day=  Integer.parseInt(quStr);
+                day=  Integer.parseInt(quStr.toUpperCase().replace("Y","").replace("M",""));
             }
 
 
@@ -573,7 +573,12 @@ public class ModelObj extends DataObj<String,Object> {
                 {
                     Calendar calendar = Calendar.getInstance();
                     calendar.setTime((Timestamp)val);
-                    calendar.add(Calendar.DATE, day);
+                    if((!StringUtils.isEmpty(quStr))&&(quStr.toUpperCase().indexOf("Y")>=0))
+                        calendar.add(Calendar.YEAR, day);
+                    else if((!StringUtils.isEmpty(quStr))&&(quStr.toUpperCase().indexOf("M")>=0))
+                        calendar.add(Calendar.MONTH, day);
+                    else
+                        calendar.add(Calendar.DATE, day);
                     return new Timestamp(calendar.getTime().getTime());
                 }
                 else if(val instanceof Integer)