Merge branch 'master' into test

src/main/java/com/ydtech/modules/ins/model/yc/ruote/Base.java

@@ -405,20 +405,16 @@ public class Base {
             cidd.setForthwith(true);
             cidd.setStartDate(startDate);
 
-            LocalDate sEndDateTime = LocalDate.now();
-            LocalDateTime localDateTime = sEndDateTime.atStartOfDay();
-            LocalDateTime localDateTime1 = localDateTime.plusYears(1).plusDays(1);
-
-            cidd.setEndDate(DateTimeUtil.format(localDateTime1, "yyyy-MM-dd HH:mm:ss"));
+            LocalDateTime sEndDateTime = DateTimeUtil.parseLocalDateTime(startDate, DateTimeUtil.DATETIME_PATTERN);
+            sEndDateTime = sEndDateTime.plusYears(1);
+            cidd.setEndDate(DateTimeUtil.format(sEndDateTime, "yyyy-MM-dd HH:mm:ss"));
 
         } else {
             cidd.setStartDate(startDate);
             cidd.setEndDate(endDate);
             LocalDateTime sEndDateTime = DateTimeUtil.parseLocalDateTime(startDate, DateTimeUtil.DATETIME_PATTERN);
             sEndDateTime = sEndDateTime.plusYears(1).minusSeconds(1);
-
             cidd.setEndDate(DateTimeUtil.format(sEndDateTime, "yyyy-MM-dd HH:mm:ss"));
-
         }
         return cidd;