ccjgmwz 3 rokov pred
rodič
commit
a85844dd3b

+ 5 - 5
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CollectionWarehousingRecordServiceImpl.java

@@ -92,12 +92,12 @@ public class CollectionWarehousingRecordServiceImpl extends ServiceImpl<Collecti
         }
         Calendar cal = Calendar.getInstance();
         int yearNum = cal.get(Calendar.YEAR);
-        int month = cal.get(Calendar.MONTH) + 1;
-        if(month < 9){
-            yearNum --;
-        }
+//        int month = cal.get(Calendar.MONTH) + 1;
+//        if(month < 9){
+//            yearNum --;
+//        }
 
-        SimpleDateFormat now = new SimpleDateFormat(yearNum +"-09-01 00:00:00");
+        SimpleDateFormat now = new SimpleDateFormat(yearNum +"-01-01 00:00:00");
         Calendar c = Calendar.getInstance();
         c.setTime(new java.util.Date());
         c.add(Calendar.YEAR, 0);

+ 10 - 10
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/IdentityAuthenticationInfoServiceImpl.java

@@ -421,12 +421,12 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
             pageView.put("currentPage", identityAuthenticationInfo.getCurrentPage());
             Calendar cal = Calendar.getInstance();
             int yearNum = cal.get(Calendar.YEAR);
-            int month = cal.get(Calendar.MONTH) + 1;
-            if(month < 9){
-                yearNum --;
-            }
+//            int month = cal.get(Calendar.MONTH) + 1;
+//            if(month < 9){
+//                yearNum --;
+//            }
 
-            SimpleDateFormat now = new SimpleDateFormat(yearNum +"-09-01 00:00:00");
+            SimpleDateFormat now = new SimpleDateFormat(yearNum +"-01-01 00:00:00");
             Calendar c = Calendar.getInstance();
             c.setTime(new java.util.Date());
             c.add(Calendar.YEAR, 0);
@@ -501,12 +501,12 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
         }
         Calendar cal = Calendar.getInstance();
         int yearNum = cal.get(Calendar.YEAR);
-        int month = cal.get(Calendar.MONTH) + 1;
-        if(month < 9){
-            yearNum --;
-        }
+//        int month = cal.get(Calendar.MONTH) + 1;
+//        if(month < 9){
+//            yearNum --;
+//        }
 
-        SimpleDateFormat now = new SimpleDateFormat(yearNum +"-09-01 00:00:00");
+        SimpleDateFormat now = new SimpleDateFormat(yearNum +"-01-01 00:00:00");
         Calendar c = Calendar.getInstance();
         c.setTime(new java.util.Date());
         c.add(Calendar.YEAR, 0);