|
|
@@ -484,7 +484,10 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
|
|
|
Calendar calendar = Calendar.getInstance();
|
|
|
calendar.setTime(TimeExchange.StringToDate(strDate1,"yyyy-MM-dd"));
|
|
|
int week = calendar.get(Calendar.WEEK_OF_YEAR);
|
|
|
- week=week==1?53:week;
|
|
|
+ int month = calendar.get(Calendar.MONTH);
|
|
|
+ if(week==1&&month==11){
|
|
|
+ week=53;
|
|
|
+ }
|
|
|
int day = calendar.get(Calendar.DAY_OF_WEEK)-1;
|
|
|
if (day==0){
|
|
|
day=7;
|
|
|
@@ -493,13 +496,16 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
|
|
|
Calendar calendar1 = Calendar.getInstance();
|
|
|
calendar1.setTime(TimeExchange.StringToDate(strDate2,"yyyy-MM-dd"));
|
|
|
int week1 = calendar1.get(Calendar.WEEK_OF_YEAR);
|
|
|
- week1=week1==1?53:week1;
|
|
|
+ int month1 = calendar1.get(Calendar.MONTH);
|
|
|
+ if(week1==1&&month1==11){
|
|
|
+ week1=53;
|
|
|
+ }
|
|
|
int day1 = calendar1.get(Calendar.DAY_OF_WEEK)-1;
|
|
|
if (day1==0){
|
|
|
day1=7;
|
|
|
week1=week1-1;
|
|
|
}
|
|
|
- if(week==week1){
|
|
|
+ if(week==week1||week-week1==52){
|
|
|
return day1-day;
|
|
|
}else if (week+1==week1&&day1==1){
|
|
|
return day1+7-day;
|