diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java index 9bdae697..496c8f4d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java @@ -1,7 +1,11 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.entity; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * //TODO 添加类、接口描述 @@ -13,10 +17,19 @@ import lombok.Data; public class StandRegionalTimeDto { @ApiModelProperty(value = "国家") private String country; + @ApiModelProperty(value = "实施日期") - private String putTime; + @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date putTime; + @ApiModelProperty(value = "在产车实施日期") - private String zccssrq; + @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date zccssrq; + @ApiModelProperty(value = "新车型实施日期") - private String xcxssrq; + @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date xcxssrq; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 0a8ac441..70c5fd21 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -16,6 +16,7 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -268,13 +269,11 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl> mapList, List putTime, List xcx, List zcc, StandRegionalTimeDto s) { - putTime.add(s.getPutTime()) ; - xcx.add(s.getXcxssrq()); - zcc.add(s.getZccssrq()); + putTime.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getPutTime())); + xcx.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getXcxssrq())); + zcc.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getZccssrq())); mapList.put("实施日期("+s.getCountry()+")",putTime); mapList.put("新车型实施日期("+s.getCountry()+")",xcx); mapList.put("在产车实施日期("+s.getCountry()+")",zcc); } - - } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java index 8985ecd5..55893831 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java @@ -5,11 +5,13 @@ import java.time.LocalDateTime; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; /** *

@@ -60,10 +62,14 @@ public class SarStandAttrInfo extends BaseEntity { @ApiModelProperty(value = "新车型实施日期(文本)") @TableField("XCXSSRQ") + @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private String xcxssrq; @ApiModelProperty(value = "在产车实施日期(文本)") @TableField("ZCCSSRQ") + @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private String zccssrq; @ApiModelProperty(value = "标签") @@ -148,6 +154,8 @@ public class SarStandAttrInfo extends BaseEntity { @ApiModelProperty(value = "实施日期(标准文本)") @TableField("SSRQ") + @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private String ssrq; @ApiModelProperty(value = "实施日期(国际)")