Explorar el Código

年底53周流程申请问题处理

wanxl hace 1 año
padre
commit
4a2a076f26

+ 2 - 1
src/main/java/com/template/controller/ApplicationProcedureTemporaryController.java

@@ -488,9 +488,10 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
         calendar1.setTime(TimeExchange.StringToDate(strDate2,"yyyy-MM-dd"));
         calendar1.setTime(TimeExchange.StringToDate(strDate2,"yyyy-MM-dd"));
         int year1 = calendar1.get(Calendar.YEAR);
         int year1 = calendar1.get(Calendar.YEAR);
         int week1 = calendar1.get(Calendar.WEEK_OF_YEAR);
         int week1 = calendar1.get(Calendar.WEEK_OF_YEAR);
+        week1=week1==1?53:week1;
         int day1 = calendar1.get(Calendar.DAY_OF_WEEK)-1;
         int day1 = calendar1.get(Calendar.DAY_OF_WEEK)-1;
         if (day1==0){
         if (day1==0){
-            day=7;
+            day1=7;
             week1=week1-1;
             week1=week1-1;
         }
         }
         if(year==year1&&week==week1){
         if(year==year1&&week==week1){