|
|
@@ -343,7 +343,7 @@ public class Base {
|
|
|
RiskInfoVo biRiskInfo = (RiskInfoVo) riskList.stream().filter(x -> x.getRiskCode().equals(InsuranceRisk.BUSINESS.getCode())).findFirst().orElse(null);
|
|
|
|
|
|
|
|
|
- CarInsDateDto cidd = base.buildInsDate(ciRiskInfo.getStartDate());
|
|
|
+ CarInsDateDto cidd = base.buildInsDate(ciRiskInfo.getStartDate(),ciRiskInfo.getEndDate());
|
|
|
if (null != ciRiskInfo) {
|
|
|
base.setTInsrncBgnTmJQ(cidd.getStartDate());
|
|
|
base.setTInsrncEndTmJQ(cidd.getEndDate());
|
|
|
@@ -380,7 +380,7 @@ public class Base {
|
|
|
}
|
|
|
|
|
|
|
|
|
- private CarInsDateDto buildInsDate(String startDate) {
|
|
|
+ private CarInsDateDto buildInsDate(String startDate,String endDate) {
|
|
|
CarInsDateDto cidd = new CarInsDateDto();
|
|
|
if (isNowToTodayEnd(startDate)) {
|
|
|
cidd.setForthwith(true);
|
|
|
@@ -391,6 +391,10 @@ public class Base {
|
|
|
|
|
|
cidd.setEndDate(DateTimeUtil.getFirstDayOfYearStr(sEndDateTime));
|
|
|
|
|
|
+ }else{
|
|
|
+ cidd.setStartDate(startDate);
|
|
|
+ cidd.setEndDate(endDate);
|
|
|
+
|
|
|
}
|
|
|
return cidd;
|
|
|
|