diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
index 546b7201..c2258498 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
@@ -69,6 +69,7 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
 
         Page<SarStandUnqualified> standUnqualifiedPage=new Page<>();
         //判断前端是否提供页码和每页条数
+        sarStandUnqualifiedPage.setCloseState(1);
         List<SarStandUnqualified> sarStandUnqualifieds=sarStandUnqualifiedDao.getSarStandUnqualifiedPage((sarStandUnqualifiedPage.getCurrent()-1)*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage.getCurrent()*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage);
         Integer total=sarStandUnqualifiedDao.getSarStandUnqualifiedCount(sarStandUnqualifiedPage);
         standUnqualifiedPage.setRecords(sarStandUnqualifieds);
@@ -85,34 +86,41 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
      */
     @Override
     public IPage<SarStandUnqualified> getSarStandUnqualifiedHistoryPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
-        QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
+//        QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
 
-        if(sarStandUnqualifiedPage.getStandId()!=null){
-            sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId());
+//        if(sarStandUnqualifiedPage.getStandId()!=null){
+////            sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId());
 //            sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
-        }
-        if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){
-            sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber());
-        }
-        if (sarStandUnqualifiedPage.getStandName()!=null){
-            sarStandUnqualifiedQueryWrapper.like("stand_name",sarStandUnqualifiedPage.getStandName());
-        }
-
-        //仅查询关闭的
-        sarStandUnqualifiedQueryWrapper.eq("close_state",2);
-        if(sarStandUnqualifiedPage.getProductName()!=null){
-            sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName());
-        }
-        if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){
-            sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit());
-        }
-        Page<SarStandUnqualified> standUnqualifiedPage=new Page<>();
-        //判断前端是否提供页码和每页条数
-        if(sarStandUnqualifiedPage.getCurrent()!=null&&sarStandUnqualifiedPage.getSize()!=null){
-            standUnqualifiedPage=new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize());
-        }
-        return sarStandUnqualifiedDao.selectPage(standUnqualifiedPage,sarStandUnqualifiedQueryWrapper);
-
+//        }
+//        if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){
+//            sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber());
+//        }
+//        if (sarStandUnqualifiedPage.getStandName()!=null){
+//            sarStandUnqualifiedQueryWrapper.like("stand_name",sarStandUnqualifiedPage.getStandName());
+//        }
+//
+//        //仅查询关闭的
+//        sarStandUnqualifiedQueryWrapper.eq("close_state",2);
+//        if(sarStandUnqualifiedPage.getProductName()!=null){
+//            sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName());
+//        }
+//        if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){
+//            sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit());
+//        }
+//        Page<SarStandUnqualified> standUnqualifiedPage=new Page<>();
+//        //判断前端是否提供页码和每页条数
+//        if(sarStandUnqualifiedPage.getCurrent()!=null&&sarStandUnqualifiedPage.getSize()!=null){
+//            standUnqualifiedPage=new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize());
+//        }
+        sarStandUnqualifiedPage.setCloseState(2);
+        List<SarStandUnqualified> sarStandUnqualifieds=sarStandUnqualifiedDao.getSarStandUnqualifiedPage((sarStandUnqualifiedPage.getCurrent()-1)*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage.getCurrent()*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage);
+        Integer total=sarStandUnqualifiedDao.getSarStandUnqualifiedCount(sarStandUnqualifiedPage);
+        Page page=new Page();
+        page.setSize(sarStandUnqualifiedPage.getSize());
+        page.setCurrent(sarStandUnqualifiedPage.getCurrent());
+        page.setTotal(total);
+        page.setRecords(sarStandUnqualifieds);
+        return page;
     }
 
     /**
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml
index 91414c6f..cf9bb389 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml
@@ -31,45 +31,21 @@
     </select>
 
 
-    <select id="getSarStandUnqualifiedPageNew" resultType="com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified">
-        SELECT
-        sar_stand_unqualified.*, sar_standards_info.STAND_TYPE as standType
-        from
-        sar_stand_unqualified
-        left join sar_standards_info on sar_stand_unqualified.STAND_ID = sar_standards_info.id
-        WHERE
-        close_state = 1
-        <if test="sar.standId != null and sar.standId != '' ">
-            and STAND_ID = #{standId}
-        </if>
-        <if test="sar.productName != null and sar.productName != '' ">
-            and PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%')
-        </if>
-        <if test="sar.responsibleUnit != null and sar.responsibleUnit != '' ">
-            and RESPONSIBLE_UNIT = #{sar.responsibleUnit}
-        </if>
-        <if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
-            and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%')
-            or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%'))
-        </if>
-        order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc
-        limit #{start},#{end}
-    </select>
 
     <select id="getSarStandUnqualifiedPage" resultType="com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified">
         SELECT
         c.*
         FROM
         (
-            SELECT  (@i:=@i+1) as rows,sar_stand_unqualified.* ,sar_standards_info.STAND_TYPE as standType , ts_user.UNAME as dutyEngineerName , ts_institution.name as responsibleUnit FROM
+            SELECT  (@i:=@i+1) as rows,sar_stand_unqualified.* ,sar_standards_info.STAND_TYPE as standType , concat(ts_user.UNAME,concat('(',concat(ts_user.USID,')'))) as dutyEngineerName , ts_institution.name as responsibleUnit FROM
             (sar_stand_unqualified,(SELECT @i:=0)j)
             left join sar_standards_info on sar_stand_unqualified.STAND_ID = sar_standards_info.id
             left join ts_user on ts_user.USID = sar_stand_unqualified.DUTY_ENGINEER
             left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
             WHERE
-             sar_stand_unqualified.close_state = 1
+             sar_stand_unqualified.close_state = #{sar.closeState}
             <if test="sar.standId != null and sar.standId != '' ">
-                and sar_stand_unqualified.STAND_ID = #{standId}
+                and sar_stand_unqualified.STAND_ID = #{sar.standId}
             </if>
             <if test="sar.productName != null and sar.productName != '' ">
                 and sar_stand_unqualified.PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%')
@@ -81,34 +57,12 @@
                 and (REPLACE(sar_stand_unqualified.STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%')
                 or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%'))
             </if>
-        order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc
+        order by sar_stand_unqualified.ID,sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc
         limit #{start},#{end}
         )c
         ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows
     </select>
 
-    <select id="getSarStandUnqualifiedCountNew" resultType="java.lang.Integer">
-        SELECT
-         count(sar_stand_unqualified.ID)
-        from
-        sar_stand_unqualified
-        left join sar_standards_info on sar_stand_unqualified.STAND_ID = sar_standards_info.id
-        WHERE
-        close_state = 1
-        <if test="sar.standId != null and sar.standId != '' ">
-            and STAND_ID = #{standId}
-        </if>
-        <if test="sar.productName != null and sar.productName != '' ">
-            and PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%')
-        </if>
-        <if test="sar.responsibleUnit != null and sar.responsibleUnit != '' ">
-            and RESPONSIBLE_UNIT = #{sar.responsibleUnit}
-        </if>
-        <if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
-            and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%')
-            or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%'))
-        </if>
-    </select>
 
     <select id="getSarStandUnqualifiedCount" resultType="java.lang.Integer">
         SELECT
@@ -119,9 +73,9 @@
         SELECT  (@i:=@i+1) as rows,sar_stand_unqualified.*  FROM
         sar_stand_unqualified,(SELECT @i:=0)j
         WHERE
-        close_state = 1
+        close_state = #{sar.closeState}
         <if test="sar.standId != null and sar.standId != '' ">
-            and STAND_ID = #{standId}
+            and STAND_ID = #{sar.standId}
         </if>
         <if test="sar.productName != null and sar.productName != '' ">
             and PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%')