From cf32ad958021e17434c8fe2f53c79dd12a1e5562 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 8 Sep 2021 21:07:29 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85,?=
 =?UTF-8?q?=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=20s.getPutTime()=E7=A9=BA?=
 =?UTF-8?q?=E6=8C=87=E9=92=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarLawsAttrDetailedListServiceImpl.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 9028d493..045b8404 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
@@ -288,7 +288,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) {
-        putTime.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getPutTime()));
+        //临时
+        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()));
         mapList.put("实施日期("+s.getCountry()+")",putTime);

From 26f28b30b61a96341785e054df46b98df83763c3 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 8 Sep 2021 22:26:09 +0800
Subject: [PATCH 2/3] =?UTF-8?q?standRegionalTimeDto=20=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99=E5=92=8C=E6=95=B0=E6=8D=AE=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java  | 4 ++--
 .../service/impl/SarLawsAttrDetailedListServiceImpl.java      | 4 ++--
 2 files changed, 4 insertions(+), 4 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 7b50a568..8dc4d5f9 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 045b8404..e015ec4d 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
@@ -292,8 +292,8 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
         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()));
+        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);

From 1d915c30d280f94ed589db0ab1ebd28b03d99244 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 8 Sep 2021 22:48:22 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=AD=97=E6=AE=B5=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=97=B6,=E8=BF=94=E5=9B=9E=E4=BA=86null?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml
index 1e4eafe9..4ec8d322 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml
@@ -136,7 +136,7 @@
 
         <!--    查询字段及对应数据-->
         <select id="selectStandFieldAndData" resultType="Map">
-        SELECT ${fieldInfo}
+        SELECT STAND_ID,${fieldInfo}
         FROM SAR_BUSS_STAND_ATTR_INFO
         WHERE valid_flag=0 and stand_id = #{standId}
     </select>
@@ -161,4 +161,4 @@
         FROM SAR_BUSS_STAND_ATTR_INFO
         WHERE stand_id = #{standId} and valid_flag=0
     </select>
-</mapper>
\ No newline at end of file
+</mapper>