|
|
@@ -3,6 +3,7 @@ package com.jzg.commons.entity.quote.vo.aggregated;
|
|
|
|
|
|
import com.baomidou.mybatisplus.annotation.IdType;
|
|
|
import com.baomidou.mybatisplus.annotation.TableId;
|
|
|
+import com.fasterxml.jackson.annotation.JsonFormat;
|
|
|
import com.jzg.commons.constants.ProductsType;
|
|
|
import com.jzg.commons.constants.quote.enums.quote.RiskCode;
|
|
|
import com.jzg.commons.entity.orders.po.InsOrderAdjustInfo;
|
|
|
@@ -27,6 +28,7 @@ import org.springframework.beans.BeanUtils;
|
|
|
|
|
|
import java.io.Serial;
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.time.LocalDateTime;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
@@ -56,8 +58,10 @@ public class QuoteEchoVo extends QuoteVo {
|
|
|
private String agreementName;
|
|
|
private String agreementType;
|
|
|
private String createBy;
|
|
|
- private String createTime;
|
|
|
- private String quoteTime;
|
|
|
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
|
+ private LocalDateTime createTime;
|
|
|
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|
|
+ private LocalDateTime quoteTime;
|
|
|
private String signingTime;
|
|
|
private String payTime;
|
|
|
}
|
|
|
@@ -281,8 +285,8 @@ public class QuoteEchoVo extends QuoteVo {
|
|
|
this.getOrder().setProductsName(insOrdersVo.getProductName());
|
|
|
this.getOrder().setOrderStatus(insOrdersVo.getInsOrders().getOrderStatus());
|
|
|
this.getOrder().setCreateBy(insOrdersVo.getCreateBy());
|
|
|
- this.getOrder().setCreateTime(insOrdersVo.getCreateTime().toString());
|
|
|
- this.getOrder().setQuoteTime(insOrdersVo.getCreateTime().toString());
|
|
|
+ this.getOrder().setCreateTime(insOrdersVo.getCreateTime());
|
|
|
+ this.getOrder().setQuoteTime(insOrdersVo.getCreateTime());
|
|
|
this.getOrder().setSigningTime(insOrdersVo.getPayTime());
|
|
|
this.setCiSpecialInfoVo(insOrdersVo.getSpecialInfoVo().stream().filter(companyClauseVo -> companyClauseVo.getRiskCode().equals("0507")).collect(Collectors.toList()));
|
|
|
this.setBiSpecialInfoVo(insOrdersVo.getSpecialInfoVo().stream().filter(companyClauseVo -> companyClauseVo.getRiskCode().equals("0510")).collect(Collectors.toList()));
|