From 0cdf343a092719688a8f1cb647f6a99c2ac2e217 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 9 Sep 2021 10:59:26 +0800
Subject: [PATCH] =?UTF-8?q?standRegionalTimeDto=20=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=B8=8E=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AD=97=E6=AE=B5=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/StandRegionalTimeDto.java                     | 4 ++--
 .../service/impl/SarLawsAttrDetailedListServiceImpl.java | 9 ++++-----
 .../SarLawsAttrDetailedListMapper.xml                    | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

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 8dc4d5f9..7b50a568 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
@@ -26,10 +26,10 @@ public class StandRegionalTimeDto {
     @ApiModelProperty(value = "在产车实施日期")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    private Date ZCCSSRQ;
+    private Date zccssrq;
 
     @ApiModelProperty(value = "新车型实施日期")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    private Date XCXSSRQ;
+    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 e015ec4d..37584cbb 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
@@ -289,11 +289,10 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
 
     private void dateTime(LinkedHashMap<String, List<String>> mapList, List<String> putTime, List<String> xcx, List<String> zcc, StandRegionalTimeDto s) {
         //临时
-        if (s.getPutTime()!=null){
-            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()));
+
+        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/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
index 48a89181..925aa272 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
@@ -156,7 +156,7 @@
     <select id="selectTimes" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.StandRegionalTimeDto">
         SELECT
             b.country_area AS country,
-            a.ssrq AS ssrq,
+            a.ssrq AS putTime,
             a.xcxssrq AS xcxssrq,
             a.zccssrq AS zccssrq
         FROM