diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml
index ffe1227..a4c160d 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml
@@ -219,6 +219,7 @@
         cat.start_time startTime,
         cat.end_time endTime,
         cat.`status`,
+        cat.dept_id AS deptId,
         "单位" as deptName,
         case
         when cat.status = 0 then '未开始'
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml
index 049b3da..e61673f 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml
@@ -35,23 +35,29 @@
     <select id="selectMyPage" parameterType="map"
             resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AnnualreviewTaskSupplierListVo">
         SELECT
-            csb.id supplierId,
-            csb.NAME,
-            cats.annualreview_task_id as annualreviewTaskId,
-            '单位' as deptName,
-            cats.review_result,
-            case when cats.review_result=1 then '合格'
-                 when cats.review_result=2 then '不合格' else '待审批' end as reviewResultName,
-            (select GROUP_CONCAT( DISTINCT cc.category_name SEPARATOR ', ' ) AS categoryName from cosco_access_supplier_category casc join cosco_category cc ON cc.id = casc.category_id where casc.del_flag = 'normal' and casc.supplier_id=csb.id) as category
+        csb.id supplierId,
+        csb.NAME,
+        cats.annualreview_task_id as annualreviewTaskId,
+        '单位' as deptName,
+        cc.category_name as categoryName,
+        cat.dept_id as deptId,
+        cats.review_result,
+        case when cats.review_result=1 then '合格'
+        when cats.review_result=2 then '不合格' else '待审批' end as reviewResultName,
+        (select GROUP_CONCAT( DISTINCT cc.category_name SEPARATOR ', ' ) AS categoryName from
+        cosco_access_supplier_category casc join cosco_category cc ON cc.id = casc.category_id where casc.del_flag =
+        'normal' and casc.supplier_id=csb.id) as category
         FROM
-            cosco_annualreview_task_supplier cats
-                JOIN cosco_supplier_base csb ON cats.supplier_id = csb.id
-        where   cats.del_flag='normal'
+        cosco_annualreview_task_supplier cats
+        join cosco_annualreview_task cat on cats.annualreview_task_id = cat.id
+        JOIN cosco_supplier_base csb ON cats.supplier_id = csb.id
+        left join cosco_category cc on cc.id = csb.category_id
+        where cats.del_flag='normal'
         <if test="vo.name!=null and vo.name!=''">
             and csb.name like concat('%',#{vo.name},'%')
         </if>
         <if test="vo.annualreviewTaskId!=null and vo.annualreviewTaskId!=''">
-           and cats.annualreview_task_id=#{vo.annualreviewTaskId}
+            and cats.annualreview_task_id=#{vo.annualreviewTaskId}
         </if>
         <if test="vo.reviewResult!=null">
             and cats.review_result=#{vo.reviewResult}
@@ -171,31 +177,33 @@
         </foreach>
     </update>
     <update id="deleteByTaskId" parameterType="string">
-        update cosco_annualreview_task_supplier set del_flag = 'deleted' where annualreview_task_id = #{taskId}
+        update cosco_annualreview_task_supplier
+        set del_flag = 'deleted'
+        where annualreview_task_id = #{taskId}
     </update>
     <select id="getSupplierAnnualReviewStatistics" parameterType="map"
             resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierAnnualReviewStatisticsVo">
         select
 
-            csb.name supplierName,
-            case when csb.supplier_type = 'ovs' then '境外'
-                 when csb.supplier_type = 'ovs' then '境内'
-                 else '境内' end as area ,
-            csb.id,
-            '准入单位' as accessUnit,
-            '准入部门' as accessDept,
-            case when cats.review_result = 1 then '合格'
-                 else '不合格' end as annualStatisticsResult,
+        csb.name supplierName,
+        case when csb.supplier_type = 'ovs' then '境外'
+        when csb.supplier_type = 'ovs' then '境内'
+        else '境内' end as area ,
+        csb.id,
+        '准入单位' as accessUnit,
+        '准入部门' as accessDept,
+        case when cats.review_result = 1 then '合格'
+        else '不合格' end as annualStatisticsResult,
         (select GROUP_CONCAT( DISTINCT cc.category_name SEPARATOR ', ' )
         from cosco_access_supplier_category casc
         join cosco_category cc
         ON cc.id = casc.category_id
         where casc.del_flag = 'normal' and casc.supplier_id=csb.id) as categoryName,
-            cat.annualreview_year
+        cat.annualreview_year
         from
-            cosco_annualreview_task_supplier cats
-                join  cosco_supplier_base csb on cats.supplier_id=csb.id
-                join cosco_annualreview_task cat on cat.id = cats.annualreview_task_id
+        cosco_annualreview_task_supplier cats
+        join cosco_supplier_base csb on cats.supplier_id=csb.id
+        join cosco_annualreview_task cat on cat.id = cats.annualreview_task_id
         <where>
             cats.del_flag = 'normal'
             <if test="vo.supplierName!=null and vo.supplierName!=''">
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierUserMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierUserMapper.xml
index 61b61f4..6671cc7 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierUserMapper.xml
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierUserMapper.xml
@@ -43,6 +43,7 @@
         SELECT
         catsu.id,
         csb.NAME,
+        cat.dept_id as deptId,
         cat.annualreview_theme,
         '单位' AS deptName,
         cat.start_time startTime,
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java
index f45b0c3..c1a8545 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java
@@ -208,6 +208,12 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS
     public IPage<CoscoAnnualreviewTaskListVo> getPage(CoscoAnnualreviewTaskListVo taskListVo) {
         IPage<CoscoAnnualreviewTaskListVo> p = new Page<>(taskListVo.getBasePageRequest().getPageNo(),
                 taskListVo.getBasePageRequest().getPageSize());
-        return coscoAnnualreviewTaskMapper.selectPage(p, taskListVo);
+        IPage<CoscoAnnualreviewTaskListVo> coscoAnnualreviewTaskListVoIPage = coscoAnnualreviewTaskMapper.selectPage(p, taskListVo);
+        List<String> deptIds = new ArrayList<>();
+        coscoAnnualreviewTaskListVoIPage.getRecords().forEach(ss -> {
+            deptIds.add(ss.getDeptId());
+        });
+        //根据部门id查询发起单位
+        return coscoAnnualreviewTaskListVoIPage;
     }
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierServiceImpl.java
index 4608fea..429586e 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierServiceImpl.java
@@ -1,5 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.impl;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -96,6 +97,13 @@ public class CoscoAnnualreviewTaskSupplierServiceImpl implements ICoscoAnnualrev
     public IPage<AnnualreviewTaskSupplierListVo> getPage(AnnualreviewTaskSupplierListVo supplierListVo) {
         IPage<CoscoEvaluateTemplateVo> p = new Page<>(supplierListVo.getBasePageRequest().getPageNo(),
                 supplierListVo.getBasePageRequest().getPageSize());
-        return coscoAnnualreviewTaskSupplierMapper.selectMyPage(p, supplierListVo);
+        IPage<AnnualreviewTaskSupplierListVo> annualreviewTaskSupplierListVoIPage =
+                coscoAnnualreviewTaskSupplierMapper.selectMyPage(p, supplierListVo);
+        List<String> deptIds=new ArrayList<>();
+        annualreviewTaskSupplierListVoIPage.getRecords().forEach(vo -> {
+            deptIds.add(vo.getDeptId());
+        });
+        //审查单位查询
+        return annualreviewTaskSupplierListVoIPage;
     }
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java
index 0da1ad9..b831a95 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java
@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -120,7 +121,13 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua
     public IPage<AnnualreviewTaskSupplierUserVo> getPage(AnnualreviewTaskSupplierUserVo userVo) {
         IPage<AnnualreviewTaskSupplierUserVo> p = new Page<>(userVo.getBasePageRequest().getPageNo(),
                 userVo.getBasePageRequest().getPageSize());
-        return coscoAnnualreviewTaskSupplierUserMapper.selectPage(p, userVo);
+        IPage<AnnualreviewTaskSupplierUserVo> annualreviewTaskSupplierUserVoIPage = coscoAnnualreviewTaskSupplierUserMapper.selectPage(p, userVo);
+        List<String> deptIds = new ArrayList<>();
+        annualreviewTaskSupplierUserVoIPage.getRecords().forEach(vo -> {
+            deptIds.add(vo.getDeptId());
+        });
+        //发起单位查询
+        return annualreviewTaskSupplierUserVoIPage;
     }
 
     /**
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java
index ef3cf60..f9f2d10 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java
@@ -15,6 +15,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -124,7 +125,13 @@ public class CoscoAnnualreviewTemplateServiceImpl implements ICoscoAnnualreviewT
     public IPage<CoscoAnnualreviewTemplate> getPage(CoscoAnnualreviewTemplate template) {
         IPage<CoscoEvaluateTemplateVo> p = new Page<>(template.getBasePageRequest().getPageNo(),
                 template.getBasePageRequest().getPageSize());
-        return coscoAnnualreviewTemplateMapper.selectMyPage(p, template);
+        IPage<CoscoAnnualreviewTemplate> coscoAnnualreviewTemplateIPage = coscoAnnualreviewTemplateMapper.selectMyPage(p, template);
+        List<String> creaters = new ArrayList<>();
+        coscoAnnualreviewTemplateIPage.getRecords().forEach(vo -> {
+            creaters.add(vo.getCreateBy());
+        });
+        //根据creaters获取创建部门创建单位
+        return coscoAnnualreviewTemplateIPage;
     }
 
     /**
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierListVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierListVo.java
index 6d21c13..313e14a 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierListVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierListVo.java
@@ -21,11 +21,13 @@ public class AnnualreviewTaskSupplierListVo {
     /**
      * 供应商品类
      */
-    private String category;
+    private String categoryName;
     /**
      * 审查单位
      */
     private String deptName;
+
+
     /**
      * 评分
      */
@@ -35,6 +37,8 @@ public class AnnualreviewTaskSupplierListVo {
      */
     private String reviewResultName;
 
+    private String deptId;
+
     @ApiModelProperty(value = "分页对象信息")
     private BasePageRequest basePageRequest;
 
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserVo.java
index da82f6d..9ed0cea 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserVo.java
@@ -76,6 +76,10 @@ public class AnnualreviewTaskSupplierUserVo {
      * 是否合格
      */
     private String qualified;
+    /**
+     * 部门id
+     */
+    private String deptId;
 
     @ApiModelProperty(value = "分页对象信息")
     private BasePageRequest basePageRequest;
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/CoscoAnnualreviewTaskListVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/CoscoAnnualreviewTaskListVo.java
index b68b209..7a9170d 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/CoscoAnnualreviewTaskListVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/CoscoAnnualreviewTaskListVo.java
@@ -32,6 +32,8 @@ public class CoscoAnnualreviewTaskListVo {
     private Long status;
     private String statusName;
 
+    private String deptId;
+
 
     @ApiModelProperty(value = "分页对象信息")
     private BasePageRequest basePageRequest;
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateScoringMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateScoringMapper.xml
index 118e651..f61a4d0 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateScoringMapper.xml
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateScoringMapper.xml
@@ -159,7 +159,7 @@
     <select id="selectTaskSubIndicatorVo" parameterType="string"
             resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskSubIndicatorVo">
         select ces.id,
-               ces.score as          scoreNum,
+               ces.score as          score,
                ces.remark,
                cetin.sub_indicator   subIndicator,
                cetin.is_star         starIndicator,
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml
index 7a2e670..eb1e0d0 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml
@@ -314,19 +314,23 @@
 
 
     <select id="selectTaskPage" parameterType="map"
-            resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTaskListVo">
+            resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskPageVo">
         select cet.id,
         cet.evaluate_theme as evaluateTheme,
         '单位' as tenantName,
+        cec.category_name as categoryName,
         cet.start_time as startTime,
         cet.end_time as endTime,
         cet.status,
+        cet.dept_id as deptId,
         case
         when cet.status = 0 then '待评价'
         when cet.status = 1 then '评价中'
         when cet.status = 2 then '已结束' end as statusName
         from cosco_evaluate_task cet
-        join cosco_evaluate_task_supplier_user cetsu on cet.id=cetsu.evaluate_task_id
+
+        left join cosco_evaluate_task_supplier_user cetsu on cet.id=cetsu.evaluate_task_id
+        left join cosco_category cec on cet.category_id=cec.id
         <where>
             and cet.del_flag='normal'
             <if test="vo.userId!=null">
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml
index bdb5745..eee052a 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml
@@ -19,6 +19,9 @@
         <result property="lastUpdateTime" column="last_update_time"/>
         <result property="levelName" column="level_name"/>
         <result property="ratingName" column="rating_name"/>
+        <result property="supplierName" column="supplier_name"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="categoryName" column="category_name"/>
     </resultMap>
 
     <sql id="selectCoscoEvaluateTaskSupplierVo">
@@ -42,23 +45,42 @@
     <select id="getPage"
             parameterType="map"
             resultMap="CoscoEvaluateTaskSupplierResult">
-        <include refid="selectCoscoEvaluateTaskSupplierVo"/>
+        select cets.id,
+        cets.evaluate_task_id,
+        cets.level_name,
+        cets.rating_name,
+        cets.supplier_id,
+        cets.review_score,
+        cets.review_result,
+        cets.del_flag,
+        cet.dept_id,
+        cets.create_by,
+        cets.create_time,
+        cets.update_by,
+        cets.update_time,
+        cc.category_name ,
+        cets.last_update_time,
+        csb.name as supplier_name
+        from cosco_evaluate_task_supplier cets
+        left join cosco_supplier_base csb on csb.id = cets.supplier_id
+        left join cosco_evaluate_task cet on cet.id = cets.evaluate_task_id
+        left join cosco_category cc on cc.id = cet.category_id
         <where>
-            and del_flag = 'normal'
+            and cets.del_flag = 'normal'
             <if test="vo.evaluateTaskId != null  and vo.evaluateTaskId != ''">
-                and evaluate_task_id = #{vo.evaluateTaskId}
+                and cets.evaluate_task_id = #{vo.evaluateTaskId}
             </if>
             <if test="vo.supplierId != null  and vo.supplierId != ''">
-                and supplier_id = #{vo.supplierId}
+                and cets.supplier_id = #{vo.supplierId}
             </if>
             <if test="vo.reviewScore != null ">
-                and review_score = #{vo.reviewScore}
+                and cets.review_score = #{vo.reviewScore}
             </if>
             <if test="vo.reviewResult != null ">
-                and review_result = #{vo.reviewResult}
+                and cets.review_result = #{vo.reviewResult}
             </if>
             <if test="vo.lastUpdateTime != null ">
-                and last_update_time = #{vo.lastUpdateTime}
+                and cets.last_update_time = #{vo.lastUpdateTime}
             </if>
         </where>
     </select>
@@ -201,11 +223,13 @@
         SELECT
         cetsu.id,
         csb.`name`,
-        cet.evaluate_theme,
-        cet.start_time,
-        cet.end_time,
+        cet.evaluate_theme evaluateTheme,
+        cet.start_time startTime,
+        cet.end_time endTime,
+        cc.category_name as categoryName,
         cet.STATUS ,
-        cetsu.review_status,
+        cet.dept_id as deptId,
+        cetsu.review_status reviewStatus,
         case when cet.STATUS=0 then '未开始'
         when cet.status =1 then '进行中'
         when cet.status =2 then '已结束' end as statusName,
@@ -221,6 +245,7 @@
         LEFT JOIN cosco_evaluate_task cet ON cetsu.evaluate_task_id = cet.id
         LEFT JOIN cosco_evaluate_task_supplier cets ON cets.evaluate_task_id = cet.id and cetsu.supplier_id=
         cets.supplier_id and cets.del_flag='normal'
+            left join cosco_category cc on cc.id = cet.category_id
         LEFT JOIN cosco_supplier_base csb ON cets.supplier_id = csb.id and csb.del_flag='normal'
         <where>
             and cetsu.del_flag = 'normal'
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTemplateMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTemplateMapper.xml
index 743460b..08d4c7a 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTemplateMapper.xml
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTemplateMapper.xml
@@ -58,6 +58,7 @@
         "部门" as deptName,
         cet.create_time as createTime,
         cet.status ,
+        cet.create_by as createBy,
         case status
         when 0 then '草稿'
         when 1 then '启用'
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/entity/CoscoEvaluateTaskSupplier.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/entity/CoscoEvaluateTaskSupplier.java
index 572f47e..76be345 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/entity/CoscoEvaluateTaskSupplier.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/entity/CoscoEvaluateTaskSupplier.java
@@ -62,6 +62,22 @@ public class CoscoEvaluateTaskSupplier extends BaseEntity {
 
     private Date createTime;
     private Date updateTime;
+    /**
+     * 供应商名称
+     */
+    private String supplierName;
+    /**
+     * 类目名称
+     */
+    private String categoryName;
+    /**
+     * 部门id
+     */
+    private String deptId;
+    /**
+     * 准入部门
+     */
+    private String deptName = "准入部门";
 
     @ApiModelProperty(value = "分页对象信息")
     private BasePageRequest basePageRequest;
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java
index aebb3f8..500fc57 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java
@@ -205,7 +205,13 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
     public IPage<TaskPageVo> getTaskPage(TaskPageVo taskListVo) {
         IPage<CoscoEvaluateTaskListVo> p = new Page<>(taskListVo.getBasePageRequest().getPageNo(),
                 taskListVo.getBasePageRequest().getPageSize());
-        return coscoEvaluateTaskMapper.selectTaskPage(p, taskListVo);
+        IPage<TaskPageVo> taskPageVoIPage = coscoEvaluateTaskMapper.selectTaskPage(p, taskListVo);
+        List<String> deptIds=new ArrayList<>();
+        taskPageVoIPage.getRecords().forEach(taskPageVo -> {
+            deptIds.add(taskPageVo.getDeptId());
+        });
+        //根据部门id查询发起单位
+        return taskPageVoIPage;
     }
 
     @Override
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierServiceImpl.java
index ae74003..4f76f15 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierServiceImpl.java
@@ -115,14 +115,26 @@ public class CoscoEvaluateTaskSupplierServiceImpl implements ICoscoEvaluateTaskS
     public IPage<SupplierDimensionVo> getSupplierDimension(SupplierDimensionVo vo) {
         IPage<SupplierDimensionVo> p = new Page<>(vo.getBasePageRequest().getPageNo(),
                 vo.getBasePageRequest().getPageSize());
-        return coscoEvaluateTaskSupplierMapper.selectSupplierDimensionPage(p, vo);
+        IPage<SupplierDimensionVo> supplierDimensionVoIPage = coscoEvaluateTaskSupplierMapper.selectSupplierDimensionPage(p, vo);
+        List<String> deptIds = new ArrayList<>();
+        supplierDimensionVoIPage.getRecords().forEach(item -> {
+            deptIds.add(item.getDeptId());
+        });
+        //根据部门id查询评价单位
+        return supplierDimensionVoIPage;
     }
 
     @Override
     public IPage<CoscoEvaluateTaskSupplier> getPage(CoscoEvaluateTaskSupplier taskListVo) {
         IPage<SupplierDimensionVo> p = new Page<>(taskListVo.getBasePageRequest().getPageNo(),
                 taskListVo.getBasePageRequest().getPageSize());
-        return coscoEvaluateTaskSupplierMapper.getPage(p, taskListVo);
+        IPage<CoscoEvaluateTaskSupplier> page = coscoEvaluateTaskSupplierMapper.getPage(p, taskListVo);
+        List<String> deptIds = new ArrayList<>();
+        page.getRecords().forEach(item -> {
+            deptIds.add(item.getDeptId());
+        });
+        //根据部门id查询发起单位
+        return page;
     }
 
     @Override
@@ -155,7 +167,7 @@ public class CoscoEvaluateTaskSupplierServiceImpl implements ICoscoEvaluateTaskS
                 vo.setStarIndicator(evaluateTemplateIndicatorNd.getIsStar());
                 List<CoscoEvaluateScoringResult> collect1 = coscoEvaluateScoringResults.stream().filter(scoring -> scoring.getIndicatorNdId().equals(evaluateTemplateIndicatorNd.getId())).collect(Collectors.toList());
                 if (collect1.size() > 0) {
-                    vo.setScoreNum(collect1.get(0).getIndicatorScore().toString());
+                    vo.setScore(collect1.get(0).getIndicatorScore().toString());
                 }
                 subIndicator.add(vo);
             }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateServiceImpl.java
index 8fc1d43..4dd78c4 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateServiceImpl.java
@@ -1,6 +1,7 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -42,10 +43,10 @@ public class CoscoEvaluateTemplateServiceImpl implements ICoscoEvaluateTemplateS
     @Override
     public AddCoscoEvaluateTemplateVo selectCoscoEvaluateTemplateById(String id) {
         CoscoEvaluateTemplate coscoEvaluateTemplate = coscoEvaluateTemplateMapper.selectCoscoEvaluateTemplateById(id);
-        if(coscoEvaluateTemplate!=null){
+        if (coscoEvaluateTemplate != null) {
             try {
-                AddCoscoEvaluateTemplateVo vo =new AddCoscoEvaluateTemplateVo();
-                BeanUtils.copyProperties(vo,coscoEvaluateTemplate);
+                AddCoscoEvaluateTemplateVo vo = new AddCoscoEvaluateTemplateVo();
+                BeanUtils.copyProperties(vo, coscoEvaluateTemplate);
                 //获取评价项数据
                 vo.setIndicatorStList(coscoEvaluateTemplateIndicatorStService.selectByTemplateId(id));
                 return vo;
@@ -135,7 +136,14 @@ public class CoscoEvaluateTemplateServiceImpl implements ICoscoEvaluateTemplateS
     public IPage<CoscoEvaluateTemplateVo> getPage(CoscoEvaluateTemplateVo template) {
         IPage<CoscoEvaluateTemplateVo> p = new Page<>(template.getBasePageRequest().getPageNo(),
                 template.getBasePageRequest().getPageSize());
-        return coscoEvaluateTemplateMapper.selectMyPage(p,template);
+        IPage<CoscoEvaluateTemplateVo> coscoEvaluateTemplateVoIPage = coscoEvaluateTemplateMapper.selectMyPage(p, template);
+        List<String> creaters = new ArrayList<>();
+        coscoEvaluateTemplateVoIPage.getRecords().forEach(vo -> {
+            creaters.add(vo.getCreateBy());
+        });
+        //根据creaters获取创建部门创建单位
+
+        return coscoEvaluateTemplateVoIPage;
 
     }
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTaskListVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTaskListVo.java
index 579257d..a0ad631 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTaskListVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTaskListVo.java
@@ -25,6 +25,8 @@ public class CoscoEvaluateTaskListVo {
      */
     private String tenantName;
 
+    private String deptId;
+
     /**
      * 评价开始时间
      */
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTemplateVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTemplateVo.java
index 7d3de58..f32e8d9 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTemplateVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTemplateVo.java
@@ -44,7 +44,10 @@ public class CoscoEvaluateTemplateVo {
      * 模板id
      */
     private String id;
-
+    /**
+     * 创建人
+     */
+    private String createBy;
 
     @ApiModelProperty(value = "分页对象信息")
     private BasePageRequest basePageRequest;
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/SupplierDimensionVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/SupplierDimensionVo.java
index 5ebb0e4..a250f45 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/SupplierDimensionVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/SupplierDimensionVo.java
@@ -17,6 +17,14 @@ public class SupplierDimensionVo {
      * 供应商名称
      */
     private String name;
+    /**
+     * 部门id
+     */
+    private String deptId;
+    /**
+     * 评价单位
+     */
+    private String deptName;
     /**
      * 评价主题
      */
@@ -65,6 +73,8 @@ public class SupplierDimensionVo {
      */
     private String suscore;
 
+    private String categoryName;
+
     @ApiModelProperty(value = "分页对象信息")
     private BasePageRequest basePageRequest;
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskPageVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskPageVo.java
index 1884bef..b6d6371 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskPageVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskPageVo.java
@@ -14,10 +14,15 @@ public class TaskPageVo {
      * 评价主题
      */
     private String evaluateTheme;
+    /**
+     * 品类添加
+     */
+    private String categoryName;
     /**
      * 发起单位
      */
     private String deptName;
+    private String deptId;
     /**
      * 开始时间
      */
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskSubIndicatorVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskSubIndicatorVo.java
index 6501ed1..bc20124 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskSubIndicatorVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskSubIndicatorVo.java
@@ -27,7 +27,7 @@ public class TaskSubIndicatorVo {
     /**
      * 评分
      */
-    private String scoreNum;
+    private String score;
     /**
      * 说明
      */