|
@@ -463,11 +463,11 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
|
|
//// c.add(Calendar.YEAR, -1);
|
|
//// c.add(Calendar.YEAR, -1);
|
|
//// Date y = c.getTime();
|
|
//// Date y = c.getTime();
|
|
// String year = yearNum +"-"+monthNum+"-"+dayNum+" 00:00:00";
|
|
// String year = yearNum +"-"+monthNum+"-"+dayNum+" 00:00:00";
|
|
- //本年3.1号
|
|
|
|
- SimpleDateFormat now = new SimpleDateFormat("yyyy-03-01 00:00:00");
|
|
|
|
|
|
+ //去年10.1号
|
|
|
|
+ SimpleDateFormat now = new SimpleDateFormat("yyyy-10-01 00:00:00");
|
|
Calendar c = Calendar.getInstance();
|
|
Calendar c = Calendar.getInstance();
|
|
c.setTime(new java.util.Date());
|
|
c.setTime(new java.util.Date());
|
|
- c.add(Calendar.YEAR, 0);
|
|
|
|
|
|
+ c.add(Calendar.YEAR, -1);
|
|
Date y = c.getTime();
|
|
Date y = c.getTime();
|
|
String year = now.format(y);
|
|
String year = now.format(y);
|
|
//公司id
|
|
//公司id
|
|
@@ -554,11 +554,11 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
|
|
//// c.add(Calendar.YEAR, -1);
|
|
//// c.add(Calendar.YEAR, -1);
|
|
//// Date y = c.getTime();
|
|
//// Date y = c.getTime();
|
|
// String year = yearNum +"-"+monthNum+"-"+dayNum+" 00:00:00";
|
|
// String year = yearNum +"-"+monthNum+"-"+dayNum+" 00:00:00";
|
|
- //本年3.1号
|
|
|
|
- SimpleDateFormat now = new SimpleDateFormat("yyyy-03-01 00:00:00");
|
|
|
|
|
|
+ //去年10.1号
|
|
|
|
+ SimpleDateFormat now = new SimpleDateFormat("yyyy-10-01 00:00:00");
|
|
Calendar c = Calendar.getInstance();
|
|
Calendar c = Calendar.getInstance();
|
|
c.setTime(new java.util.Date());
|
|
c.setTime(new java.util.Date());
|
|
- c.add(Calendar.YEAR, 0);
|
|
|
|
|
|
+ c.add(Calendar.YEAR, -1);
|
|
Date y = c.getTime();
|
|
Date y = c.getTime();
|
|
String year = now.format(y);
|
|
String year = now.format(y);
|
|
//公司id
|
|
//公司id
|
|
@@ -736,11 +736,11 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
|
|
// int dayNum = cal.get(Calendar.DAY_OF_MONTH);
|
|
// int dayNum = cal.get(Calendar.DAY_OF_MONTH);
|
|
// yearNum --;
|
|
// yearNum --;
|
|
// String year = yearNum +"-"+monthNum+"-"+dayNum+" 00:00:00";
|
|
// String year = yearNum +"-"+monthNum+"-"+dayNum+" 00:00:00";
|
|
- //本年3.1号
|
|
|
|
- SimpleDateFormat now = new SimpleDateFormat("yyyy-03-01 00:00:00");
|
|
|
|
|
|
+ //去年10.1号
|
|
|
|
+ SimpleDateFormat now = new SimpleDateFormat("yyyy-10-01 00:00:00");
|
|
Calendar c = Calendar.getInstance();
|
|
Calendar c = Calendar.getInstance();
|
|
c.setTime(new java.util.Date());
|
|
c.setTime(new java.util.Date());
|
|
- c.add(Calendar.YEAR, 0);
|
|
|
|
|
|
+ c.add(Calendar.YEAR, -1);
|
|
Date y = c.getTime();
|
|
Date y = c.getTime();
|
|
String year = now.format(y);
|
|
String year = now.format(y);
|
|
//公司id
|
|
//公司id
|