修改标准清单的实施日期字段

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java

@@ -222,8 +222,8 @@ public class SarLawsAttrDetailedListController extends BaseController<SarLawsAtt
             //产品线
             List<Map<String, String>> sycpx = (List<Map<String, String>>)map.get("SYCPXCLASS");
             for (LawsDto list1:data){
-                if (list1.getPutTime()!=null){
+                if (list1.getSSRQ()!=null){
-                    list1.setPutTime(list1.getPutTime().substring(0,10));
+                    list1.setSSRQ(list1.getSSRQ().substring(0,10));
                 }
                 if (list1.getZCCSSRQGJ()!=null){
                     list1.setZCCSSRQGJ(list1.getZCCSSRQGJ().substring(0,10));

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)

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")
+    @TableField(value = "ssrq")
-    private String putTime;
+    private String ssrq;
 
     @ApiModelProperty(value = "新车型实施日期")
     @TableField(value = "xcxssrq")

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

@@ -55,8 +55,8 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
             queryWrapper.eq("stand_id",lawsDto.getId())
                     .eq("detailed_list_id",sarFindDto.getId());
             List<SarLawsAttrDetailedList> sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper);
-              if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getPutTime())){
+              if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq())){
-                  lawsDto.setPutTime(sarLawsAttrDetailedLists.get(0).getPutTime());
+                  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<SarLawsAttrD
                             .standId(timeDto1.getStandId())
                             .detailedListId(standId)
                             .number(String.valueOf(a))
-                            .putTime(timeDto1.getPutTime())
+                            .ssrq(timeDto1.getSsrq())
                             .xcxssrq(timeDto1.getXcxssrqgj())
                             .zccssrq(timeDto1.getZccssrqgj())
                             .build();

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java

@@ -15,7 +15,7 @@ public class TimeDto {
     private String standId;
 
     @ApiModelProperty(value = "实施日期")
-    private String putTime;
+    private String ssrq;
 
     @ApiModelProperty(value = "在产车实施日期")
     private String zccssrqgj;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java

@@ -98,23 +98,23 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
             if (addDetailedDto.getInforlist()!=null){
                 if (addDetailedDto.getInforlist().contains(",")){
                     String[] id = addDetailedDto.getInforlist().split(",");
-                    String[] putTime = addDetailedDto.getInforlist1().split(",");
+                    String[] ssrq = addDetailedDto.getInforlist1().split(",");
                     String[] zcc = addDetailedDto.getInforlist2().split(",");
                     String[] xcx = addDetailedDto.getInforlist3().split(",");
                     for (int a =0;a< id.length;a++){
                         TimeDto dto = new TimeDto();
                         dto.setStandId(id[a]);
-                        if ("-".equals(putTime[a]) || null==putTime[a] ){
+                        if ("-".equals(ssrq[a]) || null==ssrq[a] ){
-                            dto.setPutTime(null);
+                            dto.setSsrq(null);
                         }else {
-                            dto.setPutTime(putTime[a]);
+                            dto.setSsrq(ssrq[a]);
                         }
-                        if ("-".equals(putTime[a]) || null == xcx[a]){
+                        if ("-".equals(ssrq[a]) || null == xcx[a]){
                             dto.setXcxssrqgj(null);
                         }else {
                             dto.setXcxssrqgj(xcx[a]);
                         }
-                        if ("-".equals(putTime[a]) || null == zcc[a]){
+                        if ("-".equals(ssrq[a]) || null == zcc[a]){
                             dto.setZccssrqgj(null);
                         }else {
                             dto.setZccssrqgj(zcc[a]);
@@ -124,7 +124,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
                 }else {
                     TimeDto dto = new TimeDto();
                     dto.setStandId(addDetailedDto.getInforlist());
-                    dto.setPutTime(addDetailedDto.getInforlist1());
+                    dto.setSsrq(addDetailedDto.getInforlist1());
                     dto.setXcxssrqgj(addDetailedDto.getInforlist2());
                     dto.setZccssrqgj(addDetailedDto.getInforlist3());
                     timeDto.add(dto);
@@ -249,23 +249,23 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
             List<TimeDto> 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) {
+                        if (ssrq.length<=a) {
-                            dto.setPutTime(null);
+                            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<SarLawsDetailedL
             } else {
                 TimeDto dto = new TimeDto();
                 dto.setStandId(detailedUpDto.getInforlist());
-                dto.setPutTime(detailedUpDto.getInforlist1());
+                dto.setSsrq(detailedUpDto.getInforlist1());
                 dto.setXcxssrqgj(detailedUpDto.getInforlist2());
                 dto.setZccssrqgj(detailedUpDto.getInforlist3());
                 timeDto.add(dto);

adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao">
 
     <select id="selectLawsById" parameterType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarFindDto" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto">
-        SELECT a.ID,a.STAND_NUMBER as standNumber,a.STAND_NAME  as standName,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQ as XCXSSRQGJ,b.ZCCSSRQ as ZCCSSRQGJ,
+        SELECT a.ID,a.STAND_NUMBER as standNumber,a.STAND_NAME  as standName,a.STAND_EN_NAME,b.NYLX,b.SSRQ as SSRQ,b.XCXSSRQ as XCXSSRQGJ,b.ZCCSSRQ as ZCCSSRQGJ,
                b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN,b.CLLX as typeApplicable,dicstandSort.DIC_TYPE_NAME as standSortShow,
                a.STAND_YEAR as standYear,ISSUE_TIME as issueTime,a.STAND_TYPE as standType,a.TEXT_STATUS as textStatus
         FROM sar_standards_info a
@@ -47,7 +47,7 @@
     </select>
 
     <select id="selectLawsByIdE" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto">
-        SELECT a.ID, CONCAT(dicstandSort.DIC_TYPE_NAME," ", a.STAND_NUMBER, "-", a.STAND_YEAR) AS standNumber,a.STAND_NAME  as standName,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQ as XCXSSRQGJ,b.ZCCSSRQ as ZCCSSRQGJ,
+        SELECT a.ID, CONCAT(dicstandSort.DIC_TYPE_NAME," ", a.STAND_NUMBER, "-", a.STAND_YEAR) AS standNumber,a.STAND_NAME  as standName,a.STAND_EN_NAME,b.NYLX,b.SSRQ as SSRQ,b.XCXSSRQ as XCXSSRQGJ,b.ZCCSSRQ as ZCCSSRQGJ,
         b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN,b.CLLX as typeApplicable,dicstandSort.DIC_TYPE_NAME as standSortShow,
         a.STAND_YEAR as standYear,ISSUE_TIME as issueTime,a.STAND_TYPE as standType,a.TEXT_STATUS as textStatus
         FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on
@@ -84,7 +84,7 @@
         order by number
     </select>
     <select id="selectLawsByIdC" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto">
-        SELECT a.ID,a.STAND_NUMBER as standNumber,a.STAND_NAME as standName,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQ as XCXSSRQGJ,b.ZCCSSRQ as ZCCSSRQGJ,
+        SELECT a.ID,a.STAND_NUMBER as standNumber,a.STAND_NAME as standName,a.STAND_EN_NAME,b.NYLX,b.SSRQ as SSRQ,b.XCXSSRQ as XCXSSRQGJ,b.ZCCSSRQ as ZCCSSRQGJ,
         b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN,b.CLLX as typeApplicable,a.STAND_SORT as standSortShow,
         a.STAND_YEAR as standYear,ISSUE_TIME as issueTime,a.STAND_TYPE as standType,a.TEXT_STATUS as textStatus
         FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on
@@ -112,7 +112,7 @@
     </select>
 
     <select id="selectLawsByIdCount" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto">
-        SELECT a.ID,a.STAND_NUMBER as standNumber,a.STAND_NAME as standName,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQ as XCXSSRQGJ,b.ZCCSSRQ as ZCCSSRQGJ,
+        SELECT a.ID,a.STAND_NUMBER as standNumber,a.STAND_NAME as standName,a.STAND_EN_NAME,b.NYLX,b.SSRQ as SSRQ,b.XCXSSRQ as XCXSSRQGJ,b.ZCCSSRQ as ZCCSSRQGJ,
         b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN,b.CLLX as typeApplicable,a.STAND_SORT as standSortShow,
         a.STAND_YEAR as standYear,ISSUE_TIME as issueTime,a.STAND_TYPE as standType,a.TEXT_STATUS as textStatus
         FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on
@@ -141,7 +141,7 @@
     <select id="selectTimes" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.StandRegionalTimeDto">
         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)
     </select>
     <select id="selectLawsByIdList" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto">
-        SELECT a.ID,a.STAND_NUMBER as standNumber,a.STAND_NAME  as standName,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQ as XCXSSRQGJ,b.ZCCSSRQ as ZCCSSRQGJ,
+        SELECT a.ID,a.STAND_NUMBER as standNumber,a.STAND_NAME  as standName,a.STAND_EN_NAME,b.NYLX,b.SSRQ as SSRQ,b.XCXSSRQ as XCXSSRQGJ,b.ZCCSSRQ as ZCCSSRQGJ,
         b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN,b.CLLX as typeApplicable,a.TEXT_STATUS as textStatus,
         a.STAND_YEAR as standYear,ISSUE_TIME as issueTime,a.STAND_TYPE as standType
         FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on
@@ -200,9 +200,9 @@
     </select>
 
     <insert id="insertList">
-        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
         <foreach collection ="sarLawsAttrDetailedLists" item="list" separator =",">
-            (#{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})
         </foreach >
     </insert>