Просмотр исходного кода

1、永诚修改即时起报问题2。

ligang134 2 лет назад
Родитель
Сommit
d740277344

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

@@ -371,7 +371,7 @@ public class Base {
     }
 
 
-    private boolean isNowToTodayEnd(String dateTime) {
+    public static boolean isNowToTodayEnd(String dateTime) {
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime todayEnd = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
         LocalDateTime startDateTime = DateTimeUtil.parseLocalDateTime(dateTime, DateTimeUtil.DATETIME_PATTERN);
@@ -380,7 +380,7 @@ public class Base {
     }
 
 
-    private CarInsDateDto buildInsDate(String startDate,String endDate) {
+    public static CarInsDateDto buildInsDate(String startDate,String endDate) {
         CarInsDateDto cidd = new CarInsDateDto();
         if (isNowToTodayEnd(startDate)) {
             cidd.setForthwith(true);
@@ -389,7 +389,7 @@ public class Base {
             LocalDateTime sEndDateTime = DateTimeUtil.parseLocalDateTime(startDate, DateTimeUtil.DATETIME_PATTERN);
             sEndDateTime = sEndDateTime.plusYears(1);
 
-            cidd.setEndDate(DateTimeUtil.getFirstDayOfYearStr(sEndDateTime));
+            cidd.setEndDate(DateTimeUtil.format(sEndDateTime,"yyyy-MM-dd HH:mm:ss"));
 
         }else{
             cidd.setStartDate(startDate);

+ 6 - 2
src/main/java/com/ydtech/modules/ins/service/impl/InsAlltrustApiServiceImpl.java

@@ -27,6 +27,7 @@ import com.ydtech.modules.esm.service.*;
 import com.ydtech.modules.ins.dao.InsAlltrustRegionMapper;
 import com.ydtech.modules.ins.model.InsApiLog;
 import com.ydtech.modules.ins.model.InsOrder;
+import com.ydtech.modules.ins.model.dto.CarInsDateDto;
 import com.ydtech.modules.ins.model.dto.CarInsPolicyDto;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
@@ -429,8 +430,11 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
             System.err.println("新起:" + newStartDate);
             System.err.println("新止:" + newEndDate);
 
-            m.getRequestLabel().getCondition().getBase().setTInsrncBgnTmJQ(newStartDate);
-            m.getRequestLabel().getCondition().getBase().setTInsrncEndTmJQ(newEndDate);
+            CarInsDateDto cidd = Base.buildInsDate(newStartDate,newEndDate);
+
+
+            m.getRequestLabel().getCondition().getBase().setTInsrncBgnTmJQ(cidd.getStartDate());
+            m.getRequestLabel().getCondition().getBase().setTInsrncEndTmJQ(cidd.getEndDate());
 
 
             return false;