From a41ec08f4fe0344fe0a7779005907c68b8df87f8 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Tue, 15 Nov 2022 21:06:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0-=E6=8A=80?=
 =?UTF-8?q?=E6=9C=AF=E8=AF=84=E4=BC=B0-=E6=9F=A5=E7=9C=8Bbug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...arInterpretationNationalStandardServiceImpl.java | 13 ++++++++++++-
 .../SarInterpretationNationalStandardMapper.xml     |  4 ++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java
index 5986628f..01535a29 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java
@@ -9,6 +9,7 @@ import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarInterpretat
 import com.adc.da.sys.util.UUIDUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -59,7 +60,17 @@ public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl<Sa
 
     @Override
     public List<SarInterpretationNationalStandard> getAllDatas(InterpretationEO sarInterpretationNationalStandard) {
-        return sarInterpretationNationalStandardDao.getAllDatas(sarInterpretationNationalStandard);
+        List<SarInterpretationNationalStandard> list =  sarInterpretationNationalStandardDao.getAllDatas(sarInterpretationNationalStandard);
+
+        // 处理适用车型 ["N1","N2"]
+        for (SarInterpretationNationalStandard standard : list) {
+            if (StringUtils.isNotEmpty(standard.getApplyArctic()) && standard.getApplyArctic().startsWith("[") && standard.getApplyArctic().endsWith("]")) {
+                String applyArctics = standard.getApplyArctic().substring(1,standard.getApplyArctic().length()-1).replace("\"", "");
+                standard.setApplyArctic(applyArctics);
+            }
+        }
+
+        return  list;
     }
 
     @Override
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml
index c5abdfdd..130001ef 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml
@@ -79,9 +79,9 @@
                 <if test="prcNum!=null and prcNum!=''">
                     AND sins.prc_num like concat(concat('%',#{prcNum}),'%')
                 </if>
-                ORDER BY sins.STAND_ID, sins.specific_item
+                ORDER BY sins.specific_item
 
-                ) c  ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.specific_item,1,(SELECT LOCATE('.',CONCAT(c.specific_item,'.')))),SIGNED) ,rows
+                ) c  ORDER BY CONVERT(SUBSTRING(c.specific_item,1,(SELECT LOCATE('.',CONCAT(c.specific_item,'.')))),SIGNED)
                 LIMIT ${(current-1)*size},${size}
     </select>
     <select id="getAllDatasCout" resultType="java.lang.Integer">