From 0ae192be2f122474d84f7551e003565fbad04c20 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Thu, 12 Aug 2021 10:40:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsAttrDetailedListController.java | 4 +-- .../entity/LawsDto.java | 2 +- .../entity/SarLawsAttrDetailedList.java | 4 +-- .../SarLawsAttrDetailedListServiceImpl.java | 6 ++-- .../sarLawsDetailedList/entity/TimeDto.java | 2 +- .../impl/SarLawsDetailedListServiceImpl.java | 28 +++++++++---------- .../SarLawsAttrDetailedListMapper.xml | 18 ++++++------ 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java index 47156302..724cf5f8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java @@ -222,8 +222,8 @@ public class SarLawsAttrDetailedListController extends BaseController> sycpx = (List>)map.get("SYCPXCLASS"); for (LawsDto list1:data){ - if (list1.getPutTime()!=null){ - list1.setPutTime(list1.getPutTime().substring(0,10)); + if (list1.getSSRQ()!=null){ + list1.setSSRQ(list1.getSSRQ().substring(0,10)); } if (list1.getZCCSSRQGJ()!=null){ list1.setZCCSSRQGJ(list1.getZCCSSRQGJ().substring(0,10)); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java index 730446d8..4fc014e7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java @@ -63,7 +63,7 @@ public class LawsDto { @ExcelProperty(value = "标准实施日期", index = 8) @ApiModelProperty(value = "标准实施日期") @DateTimeFormat("yyyy年MM月dd日") - private String putTime; + private String SSRQ; @ColumnWidth(16) @ExcelProperty(value = "新车型实施日期", index = 9) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java index 45dc5441..b037f45f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java @@ -44,8 +44,8 @@ public class SarLawsAttrDetailedList extends BaseEntity { private String number; @ApiModelProperty(value = "标准实施日期") - @TableField(value = "putTime") - private String putTime; + @TableField(value = "ssrq") + private String ssrq; @ApiModelProperty(value = "新车型实施日期") @TableField(value = "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 92c664b7..863a8f63 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 @@ -55,8 +55,8 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper); - if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getPutTime())){ - lawsDto.setPutTime(sarLawsAttrDetailedLists.get(0).getPutTime()); + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq())){ + lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq()); } if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq())){ lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq()); @@ -199,7 +199,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); if ( detailedUpDto.getInforlist().contains(",")) { String[] id = detailedUpDto.getInforlist().split(","); - String[] putTime = detailedUpDto.getInforlist1().split(","); + String[] ssrq = detailedUpDto.getInforlist1().split(","); String[] zcc = detailedUpDto.getInforlist2().split(","); String[] xcx = detailedUpDto.getInforlist3().split(","); for (int a = 0; a < id.length; a++) { TimeDto dto = new TimeDto(); dto.setStandId(id[a]); - if (putTime.length<=a) { - dto.setPutTime(null); + if (ssrq.length<=a) { + dto.setSsrq(null); } else { - dto.setPutTime(putTime[a]); + dto.setSsrq(ssrq[a]); } - if (putTime.length<=a) { + if (ssrq.length<=a) { dto.setXcxssrqgj(null); } else { dto.setXcxssrqgj(xcx[a]); } - if (putTime.length<=a) { + if (ssrq.length<=a) { dto.setZccssrqgj(null); } else { dto.setZccssrqgj(zcc[a]); @@ -275,7 +275,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl SELECT b.country_area AS country, - a.putTime AS putTime, + a.ssrq AS ssrq, a.xcxssrq AS xcxssrq, a.zccssrq AS zccssrq FROM @@ -150,12 +150,12 @@ WHERE b.sort_key = 1 AND a.stand_id = #{standId} - AND (a.putTime is not NULL + AND (a.ssrq is not NULL AND a.xcxssrq is not NULL AND a.zccssrq is not NULL) - INSERT INTO sar_laws_attr_detailed_list ( id, number, detailed_list_id, stand_id ,putTime,xcxssrq,zccssrq) VALUES + INSERT INTO sar_laws_attr_detailed_list ( id, number, detailed_list_id, stand_id ,ssrq,xcxssrq,zccssrq) VALUES - (#{list.id,jdbcType=VARCHAR}, #{list.number}, #{list.detailedListId,jdbcType=VARCHAR}, #{list.standId,jdbcType=VARCHAR},#{list.putTime,jdbcType=VARCHAR},#{list.xcxssrq,jdbcType=VARCHAR},#{list.zccssrq,jdbcType=VARCHAR}) + (#{list.id,jdbcType=VARCHAR}, #{list.number}, #{list.detailedListId,jdbcType=VARCHAR}, #{list.standId,jdbcType=VARCHAR},#{list.ssrq,jdbcType=VARCHAR},#{list.xcxssrq,jdbcType=VARCHAR},#{list.zccssrq,jdbcType=VARCHAR})