|
@@ -633,17 +633,17 @@ public class OrderItems extends Controller {
|
|
|
if(whereObject.containsKey("datetype") && !"".equals(whereObject.getString("datetype"))) {
|
|
|
String datetype = whereObject.getStringValue("datetype");
|
|
|
switch (datetype) {
|
|
|
- case "月":
|
|
|
- begindate = getMonthFirstDay();
|
|
|
- enddate = getMonthLastDay();
|
|
|
+ case "7":
|
|
|
+ begindate = getDate_Str(-7);
|
|
|
+ enddate = getDate_Str();
|
|
|
break;
|
|
|
- case "年":
|
|
|
- begindate = new SimpleDateFormat("yyyy").format(new Date()) + "-01-01";
|
|
|
- enddate = new SimpleDateFormat("yyyy").format(new Date()) + "-12-31";
|
|
|
+ case "30":
|
|
|
+ begindate = getDate_Str(-30);
|
|
|
+ enddate = getDate_Str();
|
|
|
break;
|
|
|
- case "周":
|
|
|
- begindate = getWeekFirstDay();
|
|
|
- enddate = getWeekLastDay();
|
|
|
+ case "90":
|
|
|
+ begindate = getDate_Str(-90);
|
|
|
+ enddate = getDate_Str();
|
|
|
break;
|
|
|
default:
|
|
|
break;
|