Merge branch 'develop_3' into 'develop_master'

Develop 3

See merge request LiuChao/foton-slrs-system-rest!161

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;
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java

@@ -288,9 +288,12 @@ 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()));
+        //临时
-        xcx.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getXcxssrq()));
+        if (s.getPutTime()!=null){
-        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);

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>
+</mapper>