|
@@ -201,7 +201,7 @@ public class WorkOrderStatisticsController {
|
|
maintainerCount = userCenterClient.findMaintainerCount(String.format("%s-12",startDate));
|
|
maintainerCount = userCenterClient.findMaintainerCount(String.format("%s-12",startDate));
|
|
startDate = String.format("%s-01-01", startDate);
|
|
startDate = String.format("%s-01-01", startDate);
|
|
if(isCurrentYear(startDate)==true){
|
|
if(isCurrentYear(startDate)==true){
|
|
- endDate = String.format("%s-%s-01", localDate.getYear(),localDate.getDayOfMonth()+2);
|
|
|
|
|
|
+ endDate = String.format("%s-%s-01", localDate.getYear(),localDate.getMonthValue()+1);
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
endDate = subYear(startDate, 1);
|
|
endDate = subYear(startDate, 1);
|
|
@@ -317,7 +317,7 @@ public class WorkOrderStatisticsController {
|
|
case 1:
|
|
case 1:
|
|
startDate = String.format("%s-01-01", startDate);
|
|
startDate = String.format("%s-01-01", startDate);
|
|
if(isCurrentYear(startDate)==true){
|
|
if(isCurrentYear(startDate)==true){
|
|
- endDate = String.format("%s-%s-01", localDate.getYear(),localDate.getDayOfMonth()+2);
|
|
|
|
|
|
+ endDate = String.format("%s-%s-01", localDate.getYear(),localDate.getMonthValue()+1);
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
endDate = subYear(startDate, 1);
|
|
endDate = subYear(startDate, 1);
|