diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java
index 3b76d119..6b8980ed 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java
@@ -159,7 +159,13 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
                         Collectors.averagingDouble(item ->{
 
                             Double score;
-                            switch (item.getProcessNode()){
+                            String value;
+                            if (item.getProcessNode()==null){
+                                value="";
+                            }else {
+                                value=item.getProcessNode();
+                            }
+                            switch (value){
                                 case "会签征求意见":
                                     score=Double.valueOf(item.getScore()) * 0.3;
                                     break;
@@ -172,6 +178,7 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
                                 case "标准法规部部长审核":
                                     score=Double.valueOf(item.getScore()) * 0.3;
                                     break;
+
                                 default: score=Double.valueOf(item.getScore());
                             }
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java
index 5018002c..65dfec0e 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java
@@ -51,6 +51,7 @@ public class SarStandUnqualified extends BaseEntity {
     @TableField("STAND_NAME")
     private String standName;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "项目编号")
     @TableField("product_id")
     private String productId;
@@ -146,13 +147,21 @@ public class SarStandUnqualified extends BaseEntity {
     @TableField("DUTY_ENGINEER")
     private String dutyEngineer;
 
-    @ExcelProperty("计划关闭时间")
+    @ExcelIgnore
     @ApiModelProperty(value = "计划关闭时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("PLAN_CLOSE_TIME")
     private Date planCloseTime;
 
+
+    @ExcelProperty("计划关闭时间")
+    @ApiModelProperty(value = "计划关闭时间excel导出")
+
+    @TableField(exist = false)
+    private String planCloseTimeExport;
+
+
     @ExcelIgnore
     @ApiModelProperty(value = "主键")
     @TableId(type = IdType.UUID)
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 aaaff4f2..1e8c240c 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
@@ -18,6 +18,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.sql.Timestamp;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -165,6 +167,18 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
             sarStandUnqualifiedQueryWrapper.in("id",standUnqualifiedExcelVO.getIds());
         }
                List<SarStandUnqualified> stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper);
+        //        去掉日期时分秒
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+
+            stand.forEach(item->{
+
+                Optional.ofNullable(item.getPlanCloseTime())
+                        .ifPresent(time ->{
+                            item.setPlanCloseTimeExport(sdf.format(time));
+                        });
+
+            });
+
         List<SarStandUnqualified> a = stand;
         return a;
     }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java
index e3d4b902..fafcea69 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java
@@ -25,6 +25,8 @@ public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
 
     int getSarStandardsInfoCount(SarStandardsInfoEOPage page);
 
+    int getSarStandardsInfoCountWk1(SarStandardsInfoEOPage page);
+
     int insertSelective(SarStandardsInfo page);
 
     SarStandardsInfo selectByPrimaryKeyAndModifyTime(SarStandardsInfo page);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java
index 6b48976e..62203ee5 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java
@@ -88,8 +88,19 @@ public class SarStandardsInfoEOPage extends BasePage {
     private String orderBy1 = "SAR_STANDARDS_INFO.issue_time";
     private String order1 = "";
 
-//    zhaokaiyao
-    private String textStatus;//文本状态
+    /**
+     *     zhaokaiyao
+     *     文本状态
+     */
+    private String textStatus;
 
+    /**
+     *  日期范围查询发布日期开始
+     */
+    private String startIssueTime;
 
+    /**
+     *   日期范围查询发布日期结束
+     */
+    private String endIssueTime;
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index 48b557dc..c4a0878c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -342,7 +342,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 }
             }
         }
-        Integer rowCount = dao.getSarStandardsInfoCount(page);
+        Integer rowCount = dao.getSarStandardsInfoCountWk1(page);
         page.getPager().setRowCount(rowCount);
         List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page,"996");
         attrInfoCollect(sarlist);
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
index 7c8e4c57..1e6d26f7 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
@@ -832,9 +832,19 @@
             <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.startIssueTime != null and page.startIssueTime != '' and page.endIssueTime != null and page.endIssueTime != ''">
+                and
+                DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME  ,'%Y-%m-%d')
+                between
+                DATE_FORMAT(#{page.startIssueTime}  ,'%Y-%m-%d')
+                and
+                DATE_FORMAT(#{page.endIssueTime}  ,'%Y-%m-%d')
+            </if>
             <!--内容摘要-->
             <if test="page.synopsis != null and page.synopsis != ''" >
                 AND dbms_lob.instr(SYNOPSIS, #{page.synopsis} ,1,1) > 0
@@ -932,6 +942,130 @@
                     #{item}
                 </foreach>
 
+            </if>
+            <!--  新修改需求，根据角色查询有权限的菜单数据-->
+            <if test="menuRoleList != null">
+                and SAR_STAND_MENU.MENU_ID in
+                <foreach collection="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="idlist != null">
+                and SAR_STANDARDS_INFO.id in
+                <foreach collection="idlist" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="standSort != null and standSort != ''" >
+                and SAR_STANDARDS_INFO.stand_sort = #{standSort}
+            </if>
+            <!--标准年份-->
+            <if test="standYear != null and standYear != ''">
+                and SAR_STANDARDS_INFO.STAND_YEAR = #{standYear}
+            </if>
+            <if test="issueTime != null and issueTime != ''">
+                and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME  ,'%Y-%m-%d') = #{issueTime}
+            </if>
+
+            <if test="startIssueTime != null and startIssueTime != '' and endIssueTime != null and endIssueTime != ''">
+                and
+                DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME  ,'%Y-%m-%d')
+                between
+                DATE_FORMAT( #{startIssueTime} ,'%Y-%m-%d')
+                and
+                DATE_FORMAT( #{startIssueTime} ,'%Y-%m-%d')
+            </if>
+            <!--内容摘要-->
+            <if test="synopsis != null and synopsis != ''" >
+                AND dbms_lob.instr(SYNOPSIS, #{synopsis} ,1,1) > 0
+            </if>
+
+            <!--文本状态-->
+            <if test="textStatus != null and textStatus != ''" >
+                and SAR_STANDARDS_INFO.TEXT_STATUS = #{textStatus}
+            </if>
+            <!--是否纳入法规清单-->
+            <if test="isRelateAccess != null and isRelateAccess != ''" >
+                and SAR_STANDARDS_INFO.IS_RELATE_ACCESS = #{isRelateAccess}
+            </if>
+
+            <if test="collectMenuId != null and 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=#{userId}
+                )
+            </if>
+        </trim>
+    </sql>
+
+    <sql id="SarStandardsInfo_in_left_wk">
+        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='standType != null and standType != "ALL"'>
+                and stand_type = #{standType}
+            </if>
+            <!--                     基本搜索项                         -->
+            <!-- 国家、地区 -->
+            <if test="country != null and country != ''">
+                and country = #{country}
+            </if>
+            <!-- 标准编号111 -->
+            <if test="standNumber != null and standNumber != ''">
+                and (
+                (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
+                SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),
+                ' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '')
+                or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like
+                trim(replace(concat(concat('%',#{standNumber}),'%'),' ',''))
+                )
+                or (trim(replace(stand_name,' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ',''))  )
+                )
+            </if>
+            <!-- 标准名称 -->
+            <if test="standName != null and standName != ''">
+                and stand_name like concat(concat('%',#{standName}),'%')
+            </if>
+            <if test="standEnName != null and standEnName != ''">
+                and stand_en_name like concat(concat('%',#{standEnName}),'%')
+            </if>
+            <!-- 标准状态 -->
+            <if test="standState != null and standState != ''">
+                and stand_state = #{standState}
+            </if>
+            <!--                   高级检索项                          -->
+            <!--  标准性质 -->
+            <if test="standNature != null and standNature != ''">
+                and stand_nature = #{standNature}
+            </if>
+            <!--  代替标准  允许输入的时候输入多个-->
+            <if test="replaceStandNum != null and replaceStandNum != ''">
+                and replace_stand_num like concat(concat('%',#{replaceStandNum}),'%')
+            </if>
+            <!--  被代替标准 -->
+            <if test="replacedStandNum != null and replacedStandNum != ''">
+                and replaced_stand_num like concat(concat('%',#{replacedStandNum}),'%')
+            </if>
+            <if test="isRelateAccess != null and isRelateAccess != ''" >
+                and is_relate_access = #{isRelateAccess}
+            </if>
+            <!--  目录判断 -->
+            <if test="menuId != null and menuId !='nomenu' and menuAllChildrenIdList != null">
+                and SAR_STAND_MENU.MENU_ID in
+                <foreach collection="menuAllChildrenIdList" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+
             </if>
             <!--  新修改需求，根据角色查询有权限的菜单数据-->
             <if test="menuRoleList != null">
@@ -1019,6 +1153,14 @@
         GROUP BY SAR_STANDARDS_INFO.id) a
     </select>
 
+    <select id="getSarStandardsInfoCountWk1" resultType="java.lang.Integer"
+            parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage">
+        select count(1) from (select count(*) from SAR_STANDARDS_INFO
+        left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0)
+        <include refid="SarStandardsInfo_in_left_wk"/>
+        GROUP BY SAR_STANDARDS_INFO.id) a
+    </select>
+
     <select id="selectByPrimaryKeyAndModifyTime" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo">
         select
         <include refid="Base_Column_List"/>