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 6b8980ed..e721dc00 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
@@ -152,11 +152,11 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
         /**
          * 同一节点为多人评价时，需要取多人评价的平均分用以计算最终得分。
          * 各环节评分权重分别设置为30%、40%、30%，
-         * 即：标准编写质量最终得分=征求意见会签人评价平均分*30%+技术委员会专家评价平均分*40%+标准法规工程师和标准法规部主管领导评价平均分*30%。
+         * 即：标准编写质量最终得分=征求意见会签人评价平均分*30%+技术委员会专家评价平均分*40%+标准法规工程师  "和"  标准法规部主管领导评价平均分*30%。
          */
         result.putAll(list.stream()
                 .collect(Collectors.groupingBy(QualityEvaluation::getEvaluationType,
-                        Collectors.averagingDouble(item ->{
+                        Collectors.summingDouble(item ->{
 
                             Double score;
                             String value;
@@ -173,10 +173,10 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
                                     score=Double.valueOf(item.getScore()) * 0.4;
                                     break;
                                 case "标准法规工程师复审":
-                                    score=Double.valueOf(item.getScore()) * 0.3;
+                                    score=Double.valueOf(item.getScore()) * 0.15;
                                     break;
                                 case "标准法规部部长审核":
-                                    score=Double.valueOf(item.getScore()) * 0.3;
+                                    score=Double.valueOf(item.getScore()) * 0.15;
                                     break;
 
                                 default: score=Double.valueOf(item.getScore());
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java
index c456d737..b83f734b 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java
@@ -24,6 +24,8 @@ public interface SarStandUnqualifiedDao extends BaseMapper<SarStandUnqualified>
 
     List<SarStandUnqualified> getSarStandUnqualifiedPage(@Param("start")Integer start, @Param("end")Integer end, @Param("sar") SarStandUnqualifiedPage sarStandUnqualified);
 
+    List<SarStandUnqualified> getSarStandUnqualifiedExcel(@Param("ids")List<String> strings);
+
     Integer getSarStandUnqualifiedCount(@Param("sar") SarStandUnqualifiedPage sarStandUnqualified);
 
 }
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 1b256213..eeb93142 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
@@ -142,11 +142,16 @@ public class SarStandUnqualified extends BaseEntity {
     @TableField("AUTH_ENGINEER")
     private String authEngineer;
 
-    @ExcelProperty("责任工程师")
+    @ExcelIgnore
     @ApiModelProperty(value = "责任工程师")
     @TableField("DUTY_ENGINEER")
     private String dutyEngineer;
 
+    @ExcelProperty("责任工程师")
+    @ApiModelProperty(value = "责任工程师")
+    @TableField(exist=false)
+    private String dutyEngineerName;
+
     @ExcelIgnore
     @ApiModelProperty(value = "计划关闭时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -177,10 +182,6 @@ public class SarStandUnqualified extends BaseEntity {
     @TableField(exist=false)
     private String authEngineerName;
 
-    @ExcelIgnore
-    @ApiModelProperty(value = "责任工程师")
-    @TableField(exist=false)
-    private String dutyEngineerName;
 
     @ExcelIgnore
     @ApiModelProperty(value = "国内OR海外")
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 c2258498..76d1de95 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
@@ -148,12 +148,12 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
      */
     @Override
     public List<SarStandUnqualified> getStandUnqualifiedExcelData(StandUnqualifiedExcelVO standUnqualifiedExcelVO) {
-        QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
-        sarStandUnqualifiedQueryWrapper.eq("close_state",1);
-        if(standUnqualifiedExcelVO.getIds()!=null && standUnqualifiedExcelVO.getIds().size()>0){
-            sarStandUnqualifiedQueryWrapper.in("id",standUnqualifiedExcelVO.getIds());
-        }
-               List<SarStandUnqualified> stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper);
+//        QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
+//        sarStandUnqualifiedQueryWrapper.eq("close_state",1);
+//        if(standUnqualifiedExcelVO.getIds()!=null && standUnqualifiedExcelVO.getIds().size()>0){
+//            sarStandUnqualifiedQueryWrapper.in("id",standUnqualifiedExcelVO.getIds());
+//        }
+        List<SarStandUnqualified> stand = sarStandUnqualifiedDao.getSarStandUnqualifiedExcel(standUnqualifiedExcelVO.getIds());
         //        去掉日期时分秒
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
index 0182065a..b94c7bbf 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
@@ -210,59 +210,23 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
     @GetMapping("/getSarStandardsInfoPageBak")
     //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage")
     public ResponseMessage<PageInfo<SarStandardsInfo>> getSarStandardsInfoPageBak(SarStandardsInfoEOPage page,@RequestParam(defaultValue = "0") String mark) throws Exception {
-//        int isNull = -1;
-//        if (null != page.getNowOrderBy()) {
-//            switch (page.getNowOrderBy()) {
-//                case 1:
-//                    page.setOrderByA("issueTime");//发布日期
-//                    break;
-//                case 2:
-//                    page.setOrderByA("SAR_STAND_ATTR_INFO.ZCCSSRQ");//新车型实施日期
-//                    break;
-//                case 3:
-//                    page.setOrderByA("SAR_STAND_ATTR_INFO.XCXSSRQ");//在产车实施日期
-//                    break;
-//                case 4:
-//                    page.setOrderByA("SAR_STANDARDS_INFO.text_status");//文本状态
-//                    break;
-//                case 5:
-//                    page.setOrderByA("paixu");
-//                    break;
-//                case 6:
-//                    page.setOrderByA("SAR_STAND_ATTR_INFO.SSRQ");
-//                    break;
-//                default:
-//                    page.setNowOrder(null);
-//                    break;
-//            }
-//            if (null != page.getNowOrder()) {
-//                switch (page.getNowOrder()) {
-//                    case 1:
-//                        page.setOrder1("desc");
-//                        break;
-//                    case 2:
-//                        page.setOrder1("asc");
-//                    default:
-//                        page.setOrder1(null);
-//                        break;
-//                }
-//            }
-//        }
-//
-//
-//        if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
-//            List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
-//            String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList);
-//            if (StringUtils.isNotBlank(advanceStr)) {
-//                page.setAdvanceSearchStr(advanceStr);
-//            } else {
-//                page.setAdvanceSearchStr(null);
-//            }
-//        }
-//
-//        if(page.getUserId() == null || page.getUserId().equals("")){
-//            page.setUserId(LoginUserUtil.getUserId());
-//        }
+        if (null != page.getNowOrderBy()) {
+            nowOrderFunc(page);
+        }
+
+        if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
+            List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
+            String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList);
+            if (StringUtils.isNotBlank(advanceStr)) {
+                page.setAdvanceSearchStr(advanceStr);
+            } else {
+                page.setAdvanceSearchStr(null);
+            }
+        }
+
+        if(page.getUserId() == null || page.getUserId().equals("")){
+            page.setUserId(LoginUserUtil.getUserId());
+        }
         List<SarStandardsInfo> rows = sarStandardsInfoEOService.getSarStandardsInfoPageBak1(page);
         return Result.success(getPageInfo(page.getPager(), rows));
     }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java
index f9fb1071..a6d6cd24 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java
@@ -275,7 +275,8 @@ public class SarFileSplitInfoEOController extends BaseController<SarFileSplitInf
         if(null!=sarFileSplitInfoEO){
             sarFileSplitInfoEO.setModifyTime(new Date());
             if (null==sarFileSplitInfoEO.getSplitStatus())
-            sarFileSplitInfoEO.setSplitStatus("1");
+                sarFileSplitInfoEO.setStandId(null);
+//            sarFileSplitInfoEO.setSplitStatus("1");
             sarFileSplitInfoEOService.updateByPrimaryKeySelective(sarFileSplitInfoEO);
             return Result.success("0","编辑成功",null);
         }else{
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml
index 86929393..e0ca3281 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml
@@ -11,9 +11,8 @@
 			`index`.value_type as valueType,
 			eva.evaluation_type as evaluationType,
 			process_node as processNode,
-			avg(eva.score * `index`.weight) AS score,
-			min(eva.create_time) as createTiem,
-			max(eva.modify_time) as modifyTime
+			sum(eva.score * `index`.weight) AS score,
+			max(eva.create_time) as createTiem
 		FROM
 			quality_evaluation AS eva
 		LEFT JOIN ts_user `user` ON eva.user_id = `user`.USID
@@ -26,7 +25,7 @@
 			valueType,
 			evaluationType,
 			process_node
-		ORDER BY modifyTime DESC,process_node ASC
+		ORDER BY createTiem DESC,process_node ASC
 
     </select>
 
@@ -36,6 +35,7 @@
 			resultType="com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation">
 
 		SELECT
+		DISTINCT
 			UNAME AS userName,
 			score,
 			reason,
@@ -48,7 +48,8 @@
 			`index`.one_index_title as oneIndexTitle,
 			`index`.two_index_title as twoIndexTitle,
 			`index`.three_index_title as threeIndexTitle,
-			`index`.weight as weight
+			`index`.weight as weight,
+			`index`.index_sort
 		FROM
 			quality_evaluation
 		LEFT JOIN ts_user `user` ON quality_evaluation.user_id = `user` .USID
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 5d0c2271..9c185c3e 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
@@ -63,6 +63,29 @@
         ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows
     </select>
 
+    <select id="getSarStandUnqualifiedExcel" 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 , 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'
+            <if test="ids != null and ids.size()>0 ">
+               and  sar_stand_unqualified.ID in
+                <foreach item="id" collection="ids" open="(" separator="," close=")" index="index">
+                    #{id}
+                </foreach>
+            </if>
+        order by sar_stand_unqualified.ID,sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc
+        )c
+        ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows
+    </select>
+
 
     <select id="getSarStandUnqualifiedCount" resultType="java.lang.Integer">
         SELECT