FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_3' into 'develop_master'

Browse Source 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!162
This commit is contained in:
super_liu
2021-09-09 17:22:22 +08:00
parent d4dc194a79 60e28c19dc
commit ab7e69ef39
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java
+2 -2
View File
@@ -26,10 +26,10 @@ public class StandRegionalTimeDto {
@ApiModelProperty(value = "在产车实施日期") @ApiModelProperty(value = "在产车实施日期")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private Date ZCCSSRQ; private Date zccssrq;
@ApiModelProperty(value = "新车型实施日期") @ApiModelProperty(value = "新车型实施日期")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", 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
+4 -5
View File
@@ -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) { 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())); putTime.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getPutTime()));
} xcx.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getXcxssrq()));
xcx.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getXCXSSRQ())); zcc.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getZccssrq()));
zcc.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getZCCSSRQ()));
mapList.put("实施日期("+s.getCountry()+")",putTime); mapList.put("实施日期("+s.getCountry()+")",putTime);
mapList.put("新车型实施日期("+s.getCountry()+")",xcx); mapList.put("新车型实施日期("+s.getCountry()+")",xcx);
mapList.put("在产车实施日期("+s.getCountry()+")",zcc); mapList.put("在产车实施日期("+s.getCountry()+")",zcc);
adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
+1 -1
View File
@@ -156,7 +156,7 @@
<select id="selectTimes" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.StandRegionalTimeDto"> <select id="selectTimes" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.StandRegionalTimeDto">
SELECT SELECT
b.country_area AS country, b.country_area AS country,
a.ssrq AS ssrq, a.ssrq AS putTime,
a.xcxssrq AS xcxssrq, a.xcxssrq AS xcxssrq,
a.zccssrq AS zccssrq a.zccssrq AS zccssrq
FROM FROM