合规评估-标准维度查询不出来bug修复 以及导出接口白名单

adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java

@@ -69,6 +69,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
     //OCR回调存储文件
     addInterceptor.excludePathPatterns("/api/ocr/OCRRestful/OcrHandleResult");
 
+    addInterceptor.excludePathPatterns("/api/sarStandProjectLibrary/exportStandAttrInfoExcel");
+
 
 //    //测试接口使用
 //    addInterceptor.excludePathPatterns("/api/**");

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java

@@ -21,7 +21,7 @@ import java.util.List;
 @Repository
 public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
 
-    List<SarStandardsInfo> getSarStandardsInfoPage(SarStandardsInfoEOPage page);
+    List<SarStandardsInfo> getSarStandardsInfoPage(@Param("page") SarStandardsInfoEOPage page,@Param("mark")String mark);
 
     int getSarStandardsInfoCount(SarStandardsInfoEOPage page);
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -307,7 +307,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
         Integer rowCount = dao.getSarStandardsInfoCount(page);
         page.getPager().setRowCount(rowCount);
-        List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page);
+        List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page,"0");
         attrInfoCollect(sarlist);
         return sarlist;
     }
@@ -335,7 +335,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
         Integer rowCount = dao.getSarStandardsInfoCount(page);
         page.getPager().setRowCount(rowCount);
-        List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page);
+        List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page,"999");
         attrInfo(sarlist);
         return sarlist;
     }
@@ -1508,7 +1508,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 standNum = getDelStandInfo.getStandSort() + " " + getDelStandInfo.getStandNumber();
             }
             sarStandardsInfoEOPage.setReplacedStandNum(standNum);
-            List<SarStandardsInfo> getReplacedStands = dao.getSarStandardsInfoPage(sarStandardsInfoEOPage);
+            List<SarStandardsInfo> getReplacedStands = dao.getSarStandardsInfoPage(sarStandardsInfoEOPage,"0");
             if (getReplacedStands != null && !getReplacedStands.isEmpty()) {
                 for (SarStandardsInfo stand : getReplacedStands) {
                     SarStandardsInfo newStand = new SarStandardsInfo();
@@ -2739,7 +2739,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 //        }
         Integer rowCount = dao.getSarStandardsInfoCount(page);
         page.getPager().setRowCount(rowCount);
-        List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page);
+        List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page,"0");
         attrInfo(sarlist);
         return sarlist;
     }

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml

@@ -566,7 +566,7 @@
     </sql>
 
     <sql id="standSort_in">
-        <if test='standType != null and standType == "INLAND"'>
+        <if test='page.standType != null and page.standType == "INLAND"'>
             ORDER BY
             CASE tmp_tb.stand_sort
             when 'GB' THEN 0
@@ -581,7 +581,7 @@
             END,
             tmp_tb.stand_sort ASC
         </if>
-        <if test='standType != null and standType == "FOREIGN"'>
+        <if test='page.standType != null and page.standType == "FOREIGN"'>
             ORDER BY
             CASE tmp_tb.stand_sort
             when 'ECE' THEN 0
@@ -659,6 +659,170 @@
             a.stand_sort ASC,
         </if>
     </sql>
+
+    <sql id="standSort_out_2">
+        <if test='page.standType != null and page.standType == "INLAND"'>
+            CASE a.stand_sort
+            when 'GB' THEN 0
+            when 'GB/T' THEN 1
+            when 'QC/T' THEN 2
+            when 'JT' THEN 3
+            when 'JB' THEN 4
+            when 'GA' THEN 5
+            when 'GJB' THEN 6
+            when 'HJ' THEN 7
+            ELSE 8
+            END,
+            a.stand_sort ASC,
+        </if>
+        <if test='page.standType != null and page.standType == "FOREIGN"'>
+            CASE a.stand_sort
+            when 'ECE' THEN 0
+            when 'EU' THEN 1
+            when 'EC' THEN 2
+            when 'EEC' THEN 3
+            when 'ISO' THEN 4
+            when 'IEC' THEN 5
+            when 'GTR' THEN 6
+            when 'CFR' THEN 7
+            when 'JASO' THEN 8
+            when 'JIS' THEN 9
+            when 'GSO' THEN 10
+            when 'GOST' THEN 11
+            when 'ΓOCT' THEN 12
+            when 'TP' THEN 13
+            when 'SASO' THEN 14
+            when 'UAE' THEN 15
+            when 'CONTRAN' THEN 16
+            when 'DENATRAN' THEN 17
+            when 'ABNT NBR' THEN 18
+            when 'NBR' THEN 19
+            when 'INMETRO' THEN 20
+            when 'CONAMA' THEN 21
+            when 'Normative Instruction' THEN 22
+            when 'ADR' THEN 23
+            ELSE 24
+            END,
+            a.stand_sort ASC,
+        </if>
+    </sql>
+
+    <sql id="SarStandardsInfo_in_left_2">
+        left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id
+        where 1=1 and SAR_STANDARDS_INFO.valid_flag=0
+        <trim suffixOverrides=",">
+            <!-- 标准分类 国内标准，国外标准  必要搜索项                 -->
+            <if test='page.standType != null and page.standType != "ALL"'>
+                and stand_type = #{page.standType}
+            </if>
+            <!--                     基本搜索项                         -->
+            <!-- 国家、地区 -->
+            <if test="page.country != null and page.country != ''">
+                and country = #{page.country}
+            </if>
+            <!-- 标准编号111 -->
+            <if test="page.standNumber != null and page.standNumber != ''">
+                and (
+                (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
+                SAR_STANDARDS_INFO.STAND_YEAR) like concat(concat('%',#{page.standNumber}),'%') and SAR_STANDARDS_INFO.STAND_YEAR != '')
+                or (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER) like concat(concat('%',#{page.standNumber}),'%')
+                and SAR_STANDARDS_INFO.STAND_YEAR = '')
+                or (stand_name like concat(concat('%',#{page.standNumber}),'%'))
+                )
+            </if>
+            <!-- 标准名称 -->
+            <if test="page.standName != null and page.standName != ''">
+                and stand_name like concat(concat('%',#{page.standName}),'%')
+                or STAND_NUMBER like concat(concat('%',#{page.standName}),'%')
+                or STAND_YEAR like concat(concat('%',#{page.standName}),'%')
+                or STAND_SORT like concat(concat('%',#{page.standName}),'%')
+            </if>
+            <if test="page.standEnName != null and page.standEnName != ''">
+                and stand_en_name like concat(concat('%',#{page.standEnName}),'%')
+            </if>
+            <!-- 标准状态 -->
+            <if test="page.standState != null and page.standState != ''">
+                and stand_state = #{page.standState}
+            </if>
+            <!--                   高级检索项                          -->
+            <!--  标准性质 -->
+            <if test="page.standNature != null and page.standNature != ''">
+                and stand_nature = #{page.standNature}
+            </if>
+            <!--  代替标准  允许输入的时候输入多个-->
+            <if test="page.replaceStandNum != null and page.replaceStandNum != ''">
+                and replace_stand_num like concat(concat('%',#{page.replaceStandNum}),'%')
+            </if>
+            <!--  被代替标准 -->
+            <if test="page.replacedStandNum != null and page.replacedStandNum != ''">
+                and replaced_stand_num like concat(concat('%',#{page.replacedStandNum}),'%')
+            </if>
+            <if test="page.isRelateAccess != null and page.isRelateAccess != ''" >
+                and is_relate_access = #{page.isRelateAccess}
+            </if>
+            <!--  目录判断 -->
+            <if test="page.menuId != null and page.menuId !='nomenu' and page.menuAllChildrenIdList != null">
+                and SAR_STAND_MENU.MENU_ID in
+                <foreach collection="page.menuAllChildrenIdList" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+
+            </if>
+            <!--  新修改需求，根据角色查询有权限的菜单数据-->
+            <if test="page.menuRoleList != null">
+                and SAR_STAND_MENU.MENU_ID in
+                <foreach collection="page.menuRoleList" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <!--            <if test="(menuId == null or menuId =='') and standType =='FOREIGN'">-->
+            <!--                and SAR_STAND_MENU.MENU_ID in (-->
+            <!--                select TS_RESOURCE.id from TS_RESOURCE start with id=(select TS_RESOURCE.id from TS_RESOURCE WHERE parent_id is null-->
+            <!--                and sor_divide-->
+            <!--                ='FOREIGN_STAND') connect by prior id= parent_id-->
+            <!--                )-->
+            <!--            </if>-->
+            <!-- 导出数据过程中，选择的id -->
+            <if test="page.idlist != null">
+                and SAR_STANDARDS_INFO.id in
+                <foreach collection="page.idlist" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="page.standSort != null and page.standSort != ''" >
+                and SAR_STANDARDS_INFO.stand_sort = #{page.standSort}
+            </if>
+            <!--标准年份-->
+            <if test="page.standYear != null and page.standYear != ''">
+                and SAR_STANDARDS_INFO.STAND_YEAR = #{page.standYear}
+            </if>
+            <if test="page.issueTime != null and page.issueTime != ''">
+                and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME  ,'%Y-%m-%d') = #{page.issueTime}
+            </if>
+            <!--内容摘要-->
+            <if test="page.synopsis != null and page.synopsis != ''" >
+                AND dbms_lob.instr(SYNOPSIS, #{page.synopsis} ,1,1) > 0
+            </if>
+
+            <!--文本状态-->
+            <if test="page.textStatus != null and page.textStatus != ''" >
+                and SAR_STANDARDS_INFO.TEXT_STATUS = #{page.textStatus}
+            </if>
+            <!--是否纳入法规清单-->
+            <if test="page.isRelateAccess != null and page.isRelateAccess != ''" >
+                and SAR_STANDARDS_INFO.IS_RELATE_ACCESS = #{page.isRelateAccess}
+            </if>
+
+            <if test="page.collectMenuId != null and page.collectMenuId != ''">
+                and SAR_STANDARDS_INFO.id in (
+                select COLLECT_RES_ID from TS_PERSON_COLLECT where TS_PERSON_COLLECT.VALID_FLAG=0
+                and (collect_type='INLAND_STAND' or collect_type='FOREIGN_STAND')
+                and TS_PERSON_COLLECT.user_id=#{page.userId}
+                )
+            </if>
+        </trim>
+    </sql>
+
     <sql id="SarStandardsInfo_in_left">
         left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id
         where 1=1 and SAR_STANDARDS_INFO.valid_flag=0
@@ -780,19 +944,19 @@
         )
         left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = a.id and SAR_STAND_ATTR_INFO.valid_flag=0)
         where 1=1
-        <if test='labelMenuId != null and labelMenuId == "gxhbq"'>
+        <if test='page.labelMenuId != null and page.labelMenuId == "gxhbq"'>
             and SAR_STAND_ATTR_INFO.GXHBQ is not null
         </if>
-        <if test='labelMenuId != null and labelMenuId != "gxhbq"'>
+        <if test='page.labelMenuId != null and page.labelMenuId != "gxhbq"'>
-            and SAR_STAND_ATTR_INFO.GXHBQ like concat(concat('%',#{labelMenuId}),'%')
+            and SAR_STAND_ATTR_INFO.GXHBQ like concat(concat('%',#{page.labelMenuId}),'%')
         </if>
         <!--适用车型-->
-        <if test="applyArctic != null and applyArctic != ''">
+        <if test="page.applyArctic != null and page.applyArctic != ''">
-            and SAR_STAND_ATTR_INFO.CLLX = #{applyArctic}
+            and SAR_STAND_ATTR_INFO.CLLX = #{page.applyArctic}
         </if>
         <trim suffixOverrides=",">
-            <if test="advanceSearchStr != null and advanceSearchStr != ''">
+            <if test="page.advanceSearchStr != null and page.advanceSearchStr != ''">
-                and (${advanceSearchStr})
+                and (${page.advanceSearchStr})
             </if>
         </trim>
     </sql>
@@ -830,14 +994,18 @@
         SELECT
         <include refid="Base_Column_List_DIS"/>
         from SAR_STANDARDS_INFO
-        <include refid="SarStandardsInfo_in_left"/>
+        <include refid="SarStandardsInfo_in_left_2"/>
+        <if test="mark == 999 ">
+            and  sar_standards_info.ID in (select distinct stand_id from sar_stand_items)
+        </if>
         ) tmp_tb
         <include refid="standSort_in"/>
-        limit ${pager.startIndex-1},${pageSize}) a
+        limit ${page.pager.startIndex-1},${page.pageSize}
+        ) a
         <include refid="SarStandardsInfo_out_left"/>
         order by
-        <include refid="standSort_out"/>
+        <include refid="standSort_out_2"/>
-        ${orderByA} ${order1},a.id
+        ${page.orderByA} ${page.order1},a.id
     </select>
     <!--FIELD(SAR_STANDARDS_INFO.issue_time,'已发布'), FIELD(SAR_STANDARDS_INFO.issue_time,'TBD'), FIELD(SAR_STANDARDS_INFO.issue_time,'N/A') ,-->
     <!--if(isnull(SAR_STANDARDS_INFO.issue_time),0,1) desc  ,-->