|
@@ -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);
|