证书到期日期和设备到期日期提前一个月

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CertificateMaintenanceVO.java

@@ -54,6 +54,8 @@ public class CertificateMaintenanceVO extends CertificateMaintenanceEntity {
             Calendar cal = Calendar.getInstance();
             cal.setTime(this.getAirworthinessDate());
             cal.add(Calendar.YEAR, Integer.valueOf(this.airworthinessValidityPeriod.toString()));
+            // 然后提前一个月
+            cal.add(Calendar.MONTH, -1);
             //得到结算后的结果 yyyy-MM-dd HH:mm
             Date date = cal.getTime();
             cal.setTime(date);
@@ -70,6 +72,8 @@ public class CertificateMaintenanceVO extends CertificateMaintenanceEntity {
             Calendar cal = Calendar.getInstance();
             cal.setTime(this.getAstronautDate());
             cal.add(Calendar.YEAR, Integer.valueOf(this.astronautValidityPeriod.toString()));
+            // 然后提前一个月
+            cal.add(Calendar.MONTH, -1);
             //得到结算后的结果 yyyy-MM-dd HH:mm
             Date date = cal.getTime();
             cal.setTime(date);
@@ -85,6 +89,8 @@ public class CertificateMaintenanceVO extends CertificateMaintenanceEntity {
             Calendar cal = Calendar.getInstance();
             cal.setTime(this.getCertificateDate());
             cal.add(Calendar.YEAR, Integer.valueOf(this.validityPeriod.toString()));
+            // 然后提前一个月
+            cal.add(Calendar.MONTH, -1);
             //得到结算后的结果 yyyy-MM-dd HH:mm
             Date date = cal.getTime();
             cal.setTime(date);

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/EquipmentMaintenanceVO.java

@@ -43,6 +43,8 @@ public class EquipmentMaintenanceVO extends EquipmentMaintenanceEntity {
             Calendar cal = Calendar.getInstance();
             cal.setTime(this.getEquipmentDate());
             cal.add(Calendar.YEAR, Integer.valueOf(this.getEquipmentValidityPeriod().toString()));
+            // 然后提前一个月
+            cal.add(Calendar.MONTH, -1);
             //得到结算后的结果 yyyy-MM-dd HH:mm
             Date date = cal.getTime();
             cal.setTime(date);