[培训] 相关代码提交

dev-train/src/main/java/com/tykj/dev/device/train/entity/vo/GradeEntry.java

@@ -8,6 +8,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Transient;
+import java.time.LocalDate;
+import java.time.ZoneOffset;
 import java.util.Date;
 
 /**
@@ -82,9 +84,11 @@ public class GradeEntry {
 //        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(formatStr);
 
 //        String twoYearsFormat = now.format(dateTimeFormatter)
-        Date time = new Date();
-        Date date = new Date(new Date().getTime() + 1000000000);
+        LocalDate newDate=LocalDate.now();
+        LocalDate plusYears1=newDate.plusYears(2);
+        Date newDat = Date.from(newDate.atStartOfDay(ZoneOffset.ofHours(8)).toInstant());
+        Date plusYearsDate1 = Date.from(plusYears1.atStartOfDay(ZoneOffset.ofHours(8)).toInstant());
 
-        return new Mgrcert(null, name, userId, null, time, date, 0, "培训证书");
+        return new Mgrcert(null, name, userId, null, newDat, plusYearsDate1, 0, "培训证书");
     }
 }

dev-user/src/main/java/com/tykj/dev/device/user/subject/entity/User.java

@@ -132,7 +132,7 @@ public class User {
     /**
      * 培训状态 0.已培训 1.已过期 2.未培训 3.快过期 5.不是专管员
      */
-    private Integer trainStatus=2;
+    private Integer trainStatus = 2;
 
     /**
      * 是否删除

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/MgrcertServiceImpl.java

@@ -35,7 +35,7 @@ public class MgrcertServiceImpl implements MgrcertService {
             mgrcert.setId(mgrcert1.getId());
             return mgrcertDao.save(mgrcert);
         } else {
-            mgrcert.setCertNum(1234567);
+//            mgrcert.setCertNum(1234567);
             return mgrcertDao.save(mgrcert);
         }