|
|
|
@@ -69,7 +69,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
c.set(Calendar.SECOND, 0); |
|
|
|
c.set(Calendar.MILLISECOND, 0); |
|
|
|
Date result = c.getTime(); |
|
|
|
return date; |
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
|
private Date convertDateAndAdd(Date date, int addDayAmount) { |
|
|
|
@@ -81,7 +81,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
c.set(Calendar.SECOND, 0); |
|
|
|
c.set(Calendar.MILLISECOND, 0); |
|
|
|
Date result = c.getTime(); |
|
|
|
return date; |
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
|
//取的当月券数据 |
|
|
|
|