From 530a6febf6f8d64a9834e4a2c9fe816ca4ad6460 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 11 Aug 2021 13:36:50 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=88=86=E8=A7=A3?=
 =?UTF-8?q?=E5=8D=95=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/adc/da/slrs/sarStandItems/entity/SarItemVO.java   | 8 +++++---
 .../mybatis/mapper/SarStandItems/SarStandItemsMapper.xml  | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java
index ac471308..6de98409 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java
@@ -18,7 +18,6 @@ public class SarItemVO extends BaseEntity {
     @ApiModelProperty(value = "主键")
     private String id;
 
-
     @ApiModelProperty(value = "标准ID")
     private String standId;
 
@@ -28,10 +27,10 @@ public class SarItemVO extends BaseEntity {
     @ApiModelProperty(value = "条款名称")
     private String itemsName;
 
-    @ApiModelProperty(value = "条款内容")
+    @ApiModelProperty(value = "条款内容(未使用)")
     private String itemsTitle;
 
-    @ApiModelProperty(value = "解读内容--条款要求")
+    @ApiModelProperty(value = "条款内容--条款要求")
     private String termsConditions;
 
     @ApiModelProperty(value = "新车实施日期")
@@ -64,4 +63,7 @@ public class SarItemVO extends BaseEntity {
 
     @ApiModelProperty(value = "文件类型")
     private String fileType;
+
+    @ApiModelProperty(value = "解读内容")
+    private String interpretationContent;
 }
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
index f66c5ee1..2f4b9196 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
@@ -67,6 +67,7 @@
         <result column="compliance_state" property="complianceState"/>
         <result column="COMPLIANCE_REQUIR" property="complianceRequire"/>
         <result column="FILE_TYPE" property="fileType"/>
+        <result column="core_technical_requirement" property="interpretationContent"/>
     </resultMap>
 
 

From adb039fa98045cdeefc27994c6f339f4af98ccb1 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 9 Aug 2021 17:52:01 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=EF=BC=81=EF=BC=81=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/SarLawsAttrDetailedListDao.java       |  1 -
 .../SarLawsAttrDetailedListMapper.xml         | 30 ++-----------------
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java
index 2ff5fc7c..47444721 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java
@@ -31,7 +31,6 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper<SarLawsAttrDetail
     List<LawsDto> selectLawsByIdE(@Param("param1") List<String> LawsIds);
     //根据标准id查出数据
     List<LawsDto> selectLawsByIdC(@Param("start")Integer start,@Param("end")Integer end,@Param("param1") List<String> LawsIds, @Param("standName") String standName,@Param("standType")String standType,@Param("fileType")String fileType);
-    List<LawsDto> selectLawsByIdCount(@Param("param1") List<String> LawsIds, @Param("standName") String standName,@Param("standType")String standType,@Param("fileType")String fileType);
     //查询时间
     List<StandRegionalTimeDto> selectTimes(String standId);
     List<String> selectLawsId2(String standId);
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
index 70378358..994ffcb3 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
@@ -110,34 +110,6 @@
         group by a.ID
         limit #{start},#{end}
     </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,
-        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
-        a.ID = b.STAND_ID
-        left join sar_stand_items ssi on ssi.stand_id = a.id
-        <where>
-            <if test="standName != null">
-                (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')
-                or a.STAND_NAME LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%'))
-                and
-            </if>
-            <if test="fileType !=null">
-                ssi.FILE_TYPE = #{fileType} and
-            </if>
-            <if test="standType !=null">
-                a.STAND_TYPE = #{standType} and
-            </if>
-            a.ID IN
-            <foreach collection="param1" index="index" item="item" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </where>
-        group by a.ID
-    </select>
-
     <select id="selectTimes" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.StandRegionalTimeDto">
         SELECT
             b.country_area AS country,
@@ -211,4 +183,6 @@
     </delete>
 
 
+
+
 </mapper>

From def09cd38a083d5903580dae05bc26072134cc84 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Tue, 10 Aug 2021 14:49:44 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=80=BB=E6=95=B0?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=20=EF=BC=81=EF=BC=81=EF=BC=81=EF=BC=81?=
 =?UTF-8?q?=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/SarLawsAttrDetailedListDao.java       |  1 +
 .../SarLawsAttrDetailedListMapper.xml         | 30 +++++++++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java
index 47444721..2ff5fc7c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java
@@ -31,6 +31,7 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper<SarLawsAttrDetail
     List<LawsDto> selectLawsByIdE(@Param("param1") List<String> LawsIds);
     //根据标准id查出数据
     List<LawsDto> selectLawsByIdC(@Param("start")Integer start,@Param("end")Integer end,@Param("param1") List<String> LawsIds, @Param("standName") String standName,@Param("standType")String standType,@Param("fileType")String fileType);
+    List<LawsDto> selectLawsByIdCount(@Param("param1") List<String> LawsIds, @Param("standName") String standName,@Param("standType")String standType,@Param("fileType")String fileType);
     //查询时间
     List<StandRegionalTimeDto> selectTimes(String standId);
     List<String> selectLawsId2(String standId);
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
index 994ffcb3..70378358 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
@@ -110,6 +110,34 @@
         group by a.ID
         limit #{start},#{end}
     </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,
+        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
+        a.ID = b.STAND_ID
+        left join sar_stand_items ssi on ssi.stand_id = a.id
+        <where>
+            <if test="standName != null">
+                (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')
+                or a.STAND_NAME LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%'))
+                and
+            </if>
+            <if test="fileType !=null">
+                ssi.FILE_TYPE = #{fileType} and
+            </if>
+            <if test="standType !=null">
+                a.STAND_TYPE = #{standType} and
+            </if>
+            a.ID IN
+            <foreach collection="param1" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </where>
+        group by a.ID
+    </select>
+
     <select id="selectTimes" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.StandRegionalTimeDto">
         SELECT
             b.country_area AS country,
@@ -183,6 +211,4 @@
     </delete>
 
 
-
-
 </mapper>

From 2107728ce838c08a1b5003e8eb1389a64a73c4a7 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 11 Aug 2021 14:42:09 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=9C=80=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java
index 6de98409..3d573ee0 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java
@@ -64,6 +64,6 @@ public class SarItemVO extends BaseEntity {
     @ApiModelProperty(value = "文件类型")
     private String fileType;
 
-    @ApiModelProperty(value = "解读内容")
+    @ApiModelProperty(value = "解读内容--核心技术要点")
     private String interpretationContent;
 }