diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/AnnualreviewTaskConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/AnnualreviewTaskConstant.java
index 59a2305..fd35b22 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/AnnualreviewTaskConstant.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/AnnualreviewTaskConstant.java
@@ -1,6 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.base.constant;
 
-public interface AnnualreviewTaskConstant {
+public final class AnnualreviewTaskConstant {
     /**
      * 待审批
      */
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java
index 1994d52..b551b8c 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java
@@ -1,6 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.base.constant;
 
-public interface CoscoCategoryConstant {
+public final class CoscoCategoryConstant {
     /**
      * 删除标识
      */
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ErrorMessageConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ErrorMessageConstant.java
index 4b648f9..a5fd2bf 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ErrorMessageConstant.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ErrorMessageConstant.java
@@ -3,7 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.base.constant;
 /**
  * 错误信息常量
  */
-public interface ErrorMessageConstant {
+public final class ErrorMessageConstant {
     /**
      * "id不能为空"
      */
@@ -20,4 +20,24 @@ public interface ErrorMessageConstant {
      * "请选择正确的父级分类"
      */
     public static final String PLEASE_SELECT_THE_CORRECT_PARENT_CATEGORY = "请选择正确的父级分类";
+    /**
+     * "未找到对应的审批单"
+     */
+    public static final String NO_APPROVAL_ORDER_FOUND = "未找到对应的审批单";
+    /**
+     * "等级名称不能为空"
+     */
+    public static final String LEVEL_NAME_CANNOT_BE_EMPTY = "等级名称不能为空";
+    /**
+     * "开始值不能为空"
+     */
+    public static final String START_VALUE_CANNOT_BE_EMPTY = "开始值不能为空";
+    /**
+     * "结束值不能为空"
+     */
+    public static final String END_VALUE_CANNOT_BE_EMPTY = "结束值不能为空";
+    /**
+     * "开始值不能大于结束值"
+     */
+    public static final String START_VALUE_CANNOT_BE_GREATER_THAN_END_VALUE = "开始值不能大于结束值";
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/EvaluateTaskConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/EvaluateTaskConstant.java
index 05bf6c0..551d70a 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/EvaluateTaskConstant.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/EvaluateTaskConstant.java
@@ -1,6 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.base.constant;
 
-public interface EvaluateTaskConstant {
+public final class EvaluateTaskConstant {
     /**
      * 评价结束状态
      */
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/EvaluateTemplateConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/EvaluateTemplateConstant.java
index 814b628..dd5fe17 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/EvaluateTemplateConstant.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/EvaluateTemplateConstant.java
@@ -1,6 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.base.constant;
 
-public interface EvaluateTemplateConstant {
+public final class EvaluateTemplateConstant {
     /**
      * 启用
      */
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/MessageConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/MessageConstant.java
deleted file mode 100644
index 7b14ef7..0000000
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/MessageConstant.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.chinaunicom.zyhy.ebtp.supplier.base.constant;
-
-public class MessageConstant {
-    /**
-     * 黑名单到期提醒
-     */
-    public static final String BLACKLIST_EXPIRE = "blacklist_expires";
-}
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ReviewTemplateConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ReviewTemplateConstant.java
index eddb3a5..0e73935 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ReviewTemplateConstant.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ReviewTemplateConstant.java
@@ -1,7 +1,7 @@
 package com.chinaunicom.zyhy.ebtp.supplier.base.constant;
 
 
-public interface ReviewTemplateConstant {
+public final class ReviewTemplateConstant {
 
     /**
      * 启用状态
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/SupplierUserConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/SupplierUserConstant.java
index e51f6d9..ceedec6 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/SupplierUserConstant.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/SupplierUserConstant.java
@@ -1,9 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.base.constant;
 
-import lombok.Data;
-
-
-public interface SupplierUserConstant {
+public final class SupplierUserConstant {
     /**
      * 打分状态  已打分
      */
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/MessageType.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/MessageType.java
index 818ba5b..6059fe2 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/MessageType.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/MessageType.java
@@ -40,4 +40,9 @@ public class MessageType {
     //评审人员消息
     public static final String MESSAGETYPE_PSRY = "MESSAGETYPE_PSRY";
 
+    /**
+     * 黑名单到期提醒
+     */
+    public static final String BLACKLIST_EXPIRE = "blacklist_expires";
+
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTemplateController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTemplateController.java
index 59d298f..8657d54 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTemplateController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTemplateController.java
@@ -96,7 +96,7 @@ public class CoscoAnnualreviewTemplateController extends BaseController {
     @PostMapping("/up")
     public BaseResponse up(@RequestBody AddCoscoAnnualreviewTemplateVo coscoAnnualreviewTemplate) {
         if (coscoAnnualreviewTemplate.getId() == null) {
-            return BaseResponse.fail("id不能为空");
+            return BaseResponse.fail(ErrorMessageConstant.ID_NOT_NULL);
         }
         coscoAnnualreviewTemplateService.up(coscoAnnualreviewTemplate.getId());
         return BaseResponse.success();
@@ -107,7 +107,7 @@ public class CoscoAnnualreviewTemplateController extends BaseController {
     @PostMapping("/down")
     public BaseResponse down(@RequestBody AddCoscoAnnualreviewTemplateVo coscoAnnualreviewTemplate) {
         if (coscoAnnualreviewTemplate.getId() == null) {
-            return BaseResponse.fail("id不能为空");
+            return BaseResponse.fail(ErrorMessageConstant.ID_NOT_NULL);
         }
         coscoAnnualreviewTemplateService.down(coscoAnnualreviewTemplate.getId());
         return BaseResponse.success();
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 467cda2..10dcc48 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
@@ -237,6 +237,7 @@
                 and cat.status = #{vo.status}
             </if>
         </where>
+        order by cat.create_time desc
     </select>
 
     <update id="updateNOTask">
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 6731ae3..4123075 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
@@ -65,6 +65,7 @@
         <if test="vo.startTime!=null and vo.endTime!=null">
             and cats.last_update_time between #{vo.startTime} and #{vo.endTime}
         </if>
+        order by cat.create_time desc
     </select>
 
     <select id="selectCoscoAnnualreviewTaskSupplierList"
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 1ef67d1..a10621c 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
@@ -88,9 +88,10 @@
                 and catsu.start_time between #{vo.startTime} and #{vo.endTime}
             </if>
             <if test="vo.annualreviewTheme!=null and vo.annualreviewTheme!=''">
-                and catsu.annualreview_theme like concat('%',#{vo.annualreviewTheme},'%')
+                and cat.annualreview_theme like concat('%',#{vo.annualreviewTheme},'%')
             </if>
         </where>
+        order by cat.start_time desc
     </select>
 
     <select id="selectCoscoAnnualreviewTaskSupplierUserList"
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 49a14cd..7e10b9c 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
@@ -56,8 +56,9 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS
      */
     @Override
     public AddTaskVo selectCoscoAnnualreviewTaskById(String id) {
-        //获取基础信息
+        //根据任务id获取基础信息
         CoscoAnnualreviewTask coscoAnnualreviewTask = coscoAnnualreviewTaskMapper.selectCoscoAnnualreviewTaskById(id);
+        //返回数据添加基础信息
         AddTaskVo vo = new AddTaskVo();
         vo.setId(coscoAnnualreviewTask.getId());
         vo.setAnnualreviewTheme(coscoAnnualreviewTask.getAnnualreviewTheme());
@@ -69,13 +70,13 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS
         vo.setCategoryLimitation(coscoAnnualreviewTask.getCategoryLimitation());
         vo.setStatus(coscoAnnualreviewTask.getStatus());
         List<SupplierPeopleVo> list = new ArrayList<>();
+        //根据任务id获取添加供应商信息
         CoscoAnnualreviewTaskSupplier coscoAnnualreviewTaskSupplier = new CoscoAnnualreviewTaskSupplier();
         coscoAnnualreviewTaskSupplier.setAnnualreviewTaskId(coscoAnnualreviewTask.getId());
-        //获取添加供应商信息
         List<CoscoAnnualreviewTaskSupplier> coscoAnnualreviewTaskSuppliers = coscoAnnualreviewTaskSupplierMapper.selectCoscoAnnualreviewTaskSupplierList(coscoAnnualreviewTaskSupplier);
+        //根据任务id获取供应商用户信息
         CoscoAnnualreviewTaskSupplierUser coscoAnnualreviewTaskSupplierUser = new CoscoAnnualreviewTaskSupplierUser();
         coscoAnnualreviewTaskSupplierUser.setAnnualreviewTaskId(coscoAnnualreviewTask.getId());
-        //获取供应商用户信息
         List<CoscoAnnualreviewTaskSupplierUser> coscoAnnualreviewTaskSupplierUsers = coscoAnnualreviewTaskSupplierUserMapper.selectCoscoAnnualreviewTaskSupplierUserList(coscoAnnualreviewTaskSupplierUser);
         //获取用户信息
         List<UserVo> user1 = userService.getUser(new SelectUserVo());
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 e9d2d9f..af34c10 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
@@ -50,11 +50,11 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua
      */
     @Override
     public AnnualreviewTaskSupplierUserInfoVo selectCoscoAnnualreviewTaskSupplierUserById(String id) {
-        //获取人员信息
+        //使用人员id获取人员信息
         CoscoAnnualreviewTaskSupplierUser coscoAnnualreviewTaskSupplierUser = coscoAnnualreviewTaskSupplierUserMapper.selectCoscoAnnualreviewTaskSupplierUserById(id);
-        //获取供应商信息
+        //使用供应商id获取供应商信息
         BaseCategoryNameVo baseCategoryNameVo = coscoSupplierBaseMapper.selectNameAndCategoryName(coscoAnnualreviewTaskSupplierUser.getSupplierId());
-        //获取任务信息
+        //使用任务id获取任务信息
         CoscoAnnualreviewTask coscoAnnualreviewTask = coscoAnnualreviewTaskMapper.selectCoscoAnnualreviewTaskById(coscoAnnualreviewTaskSupplierUser.getAnnualreviewTaskId());
         //返回封装
         AnnualreviewTaskSupplierUserInfoVo vo = new AnnualreviewTaskSupplierUserInfoVo();
@@ -143,6 +143,7 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua
             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 88537e6..d2d8f4f 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
@@ -88,7 +88,7 @@ public class CoscoAnnualreviewTemplateServiceImpl implements ICoscoAnnualreviewT
     @Override
     public int updateCoscoAnnualreviewTemplate(AddCoscoAnnualreviewTemplateVo coscoAnnualreviewTemplate) {
         coscoAnnualreviewTemplate.setUpdateTime(new Date());
-        coscoAnnualreviewTemplate.setUpdateBy("admin");
+        coscoAnnualreviewTemplate.setUpdateBy(SupplierUserConstant.USER_NAME);
         coscoAnnualreviewTemplateMapper.updateCoscoAnnualreviewTemplate(coscoAnnualreviewTemplate);
         coscoAnnualreviewTemplateIndicatorService.batchInsertCoscoAnnualreviewTemplateIndicator(coscoAnnualreviewTemplate);
         return 1;
@@ -132,6 +132,7 @@ public class CoscoAnnualreviewTemplateServiceImpl implements ICoscoAnnualreviewT
             creaters.add(vo.getCreateBy());
         });
         //根据creaters获取创建部门创建单位
+        //封装创建部门
         return coscoAnnualreviewTemplateIPage;
     }
 
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml
index ee33cb7..f083e55 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml
@@ -210,15 +210,15 @@
     <select id="selectPage" resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackListVo"
             parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackListVo">
         SELECT cb.id,
-               '发起部门'            AS deptName,
-               '发起单位'            as unitName,
-               cb.create_time        as createTime,
-               cb.approve_status     as approveStatus,
+               '发起部门'                AS deptName,
+               '发起单位'                as unitName,
+               cb.create_time            as createTime,
+               cb.approve_status         as approveStatus,
                cb.restore_approve_status as restoreApproveStatus,
                case
                    when cb.approve_status is null then '未开始'
                    when cb.approve_status = 0 then '进行中'
-                   else '已结束' end as approveStatusName,
+                   else '已结束' end     as approveStatusName,
                concat((select csb.name
                        from cosco_blacklist_supplier cbs
                                 join cosco_supplier_base csb on cbs.supplier_id = csb.id
@@ -226,8 +226,9 @@
 	(case when cb.backlist_type = 0 then '黑名单申请'
 	else '灰名单申请' end )
 	)
-                                     as themeName
+                                         as themeName
         FROM cosco_blacklist cb
+        order by cb.create_time desc
     </select>
 
     <select id="selectBecomeDue" resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BecomeDueVo">
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml
index c17a8a5..6ed75d0 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml
@@ -203,6 +203,7 @@
         <result column="approveResult" property="approveResult"/>
         <result column="snumber" property="snumber"/>
         <result column="remark" property="remark"/>
+        <result column="create_time" property="createTime"/>
     </resultMap>
     <select id="selectLibraryPage" parameterType="map"
             resultMap="CoscoCategoryLibraryVoMap">
@@ -216,6 +217,7 @@
         ccl.term_of_validity AS termOfValidity,
         ccl.approve_status AS approveStatus,
         ccl.last_update_time as approveTime,
+        ccl.create_time,
         ccl.remark,
         CASE
         WHEN ccl.approve_status = 0 AND ccl.work_flow_id IS NULL THEN '未开始'
@@ -245,6 +247,9 @@
             <if test="vo.approveStatus!=null">
                 AND ccl.approve_status = #{vo.approveStatus}
             </if>
+            <if test="vo.startTime!=null and vo.endTime!=null">
+                AND ccl.create_time between #{vo.startTime} and #{vo.endTime}
+            </if>
         </where>
         GROUP BY
         ccl.id
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java
index afd2914..9e15be8 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoCategoryConstant;
+import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ErrorMessageConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrarAttachmentsMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibraryMapper;
@@ -247,7 +248,7 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
     public int synchronousCategroyLibraryApproval(CoscoCategoryLibrary coscoCategoryLibrary) {
         CoscoCategoryLibrary coscoCategoryLibrary1 = coscoCategoryLibraryMapper.selectByWorkFlowId(coscoCategoryLibrary.getWorkFlowId());
         if (coscoCategoryLibrary1 == null) {
-            throw new RuntimeException("未找到对应的审批单");
+            throw new RuntimeException(ErrorMessageConstant.NO_APPROVAL_ORDER_FOUND);
         }
         coscoCategoryLibrary1.setApproveStatus(coscoCategoryLibrary.getApproveStatus());
         coscoCategoryLibrary1.setRemark(coscoCategoryLibrary.getRemark());
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/CoscoCategoryLibraryVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/CoscoCategoryLibraryVo.java
index 9d33de6..e5be909 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/CoscoCategoryLibraryVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/CoscoCategoryLibraryVo.java
@@ -73,4 +73,7 @@ public class CoscoCategoryLibraryVo implements Serializable {
      * 供应商id
      */
     private String supplierId;
+
+    private Date startTime;
+    private Date endTime;
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateLevelController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateLevelController.java
index 3979770..c9b36de 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateLevelController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateLevelController.java
@@ -2,6 +2,8 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.controller;
 
 import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
+import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ErrorMessageConstant;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.response.LevelResponse;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateLevel;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateLevelService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,40 +42,25 @@ public class CoscoEvaluateLevelController extends BaseController {
      */
     @PostMapping
     public BaseResponse add(@RequestBody CoscoEvaluateLevel coscoEvaluateLevel) {
-        if(coscoEvaluateLevel.getLevelName()==null){
-            return BaseResponse.fail("等级名称不能为空");
-        }
-        if(coscoEvaluateLevel.getBeginValue()==null){
-            return BaseResponse.fail("开始值不能为空");
-        }
-        if(coscoEvaluateLevel.getEndValue()==null){
-            return BaseResponse.fail("结束值不能为空");
-        }
-        if(coscoEvaluateLevel.getBeginValue()>coscoEvaluateLevel.getEndValue()){
-            return BaseResponse.fail("开始值不能大于结束值");
+        BaseResponse<String> levelNameCannotBeEmpty = LevelResponse.getStringByTaskLevel(coscoEvaluateLevel);
+        if (levelNameCannotBeEmpty != null) {
+            return levelNameCannotBeEmpty;
         }
         return BaseResponse.success(coscoEvaluateLevelService.insertCoscoEvaluateLevel(coscoEvaluateLevel));
     }
 
+
     /**
      * 修改【供应商评价_评价结果等级规则表】
      */
     @PutMapping
     public BaseResponse edit(@RequestBody CoscoEvaluateLevel coscoEvaluateLevel) {
-        if(coscoEvaluateLevel.getId()==null){
-            return BaseResponse.fail("id不能为空");
+        if (coscoEvaluateLevel.getId() == null) {
+            return BaseResponse.fail(ErrorMessageConstant.ID_NOT_NULL);
         }
-        if(coscoEvaluateLevel.getLevelName()==null){
-            return BaseResponse.fail("等级名称不能为空");
-        }
-        if(coscoEvaluateLevel.getBeginValue()==null){
-            return BaseResponse.fail("开始值不能为空");
-        }
-        if(coscoEvaluateLevel.getEndValue()==null){
-            return BaseResponse.fail("结束值不能为空");
-        }
-        if(coscoEvaluateLevel.getBeginValue()>coscoEvaluateLevel.getEndValue()){
-            return BaseResponse.fail("开始值不能大于结束值");
+        BaseResponse<String> idNotNull = LevelResponse.getStringByTaskLevel(coscoEvaluateLevel);
+        if (idNotNull != null) {
+            return idNotNull;
         }
         return BaseResponse.success(coscoEvaluateLevelService.updateCoscoEvaluateLevel(coscoEvaluateLevel));
     }
@@ -81,7 +68,7 @@ public class CoscoEvaluateLevelController extends BaseController {
     /**
      * 删除【供应商评价_评价结果等级规则表】
      */
-	@DeleteMapping("/{id}")
+    @DeleteMapping("/{id}")
     public BaseResponse<Integer> remove(@PathVariable String id) {
         return BaseResponse.success(coscoEvaluateLevelService.deleteCoscoEvaluateLevelById(id));
     }
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 45f1516..01e68a9 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
@@ -381,6 +381,7 @@
             </if>
         </where>
         group by id
+        order by cet.create_time desc
     </select>
     <select id="selectMyPage"
             resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTaskListVo">
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 acdb78a..24fa0eb 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
@@ -130,6 +130,7 @@
                 and cets.level_name = #{vo.levelName}
             </if>
         </where>
+        order by cets.create_time desc
     </select>
 
     <select id="selectCoscoEvaluateTaskSupplierList"
@@ -303,13 +304,13 @@
                 and cets.start_time between #{vo.startTime} and #{vo.endTime}
             </if>
             <if test="vo.status !=null ">
-                and cets.status = #{vo.status}
+                and cet.status = #{vo.status}
             </if>
             <if test="vo.userId != null and vo.userId != ''">and cetsu.user_id= #{vo.userId}</if>
             <if test="vo.taskId!=null and vo.taskId!=null">and cet.id= #{vo.taskId}</if>
             <if test="vo.supplierId!=null and vo.supplierId!=null">and cets.supplier_id= #{vo.supplierId}</if>
         </where>
-
+        order by cet.create_time desc
     </select>
 
     <update id="deleteByTaskId" parameterType="string">
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 08d4c7a..ee8c96b 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
@@ -75,6 +75,7 @@
                 and cet.category_id = #{vo.categoryId}
             </if>
         </where>
+        order by cet.create_time desc
     </select>
 
     <select id="selectCoscoEvaluateTemplateList"
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/response/LevelResponse.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/response/LevelResponse.java
new file mode 100644
index 0000000..2be45ee
--- /dev/null
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/response/LevelResponse.java
@@ -0,0 +1,24 @@
+package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.response;
+
+import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
+import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ErrorMessageConstant;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateLevel;
+
+public class LevelResponse {
+
+    public  static BaseResponse<String> getStringByTaskLevel(CoscoEvaluateLevel coscoEvaluateLevel) {
+        if (coscoEvaluateLevel.getLevelName() == null) {
+            return BaseResponse.fail(ErrorMessageConstant.LEVEL_NAME_CANNOT_BE_EMPTY);
+        }
+        if (coscoEvaluateLevel.getBeginValue()==null) {
+            return BaseResponse.fail(ErrorMessageConstant.START_VALUE_CANNOT_BE_EMPTY);
+        }
+        if (coscoEvaluateLevel.getEndValue() == null) {
+            return BaseResponse.fail(ErrorMessageConstant.END_VALUE_CANNOT_BE_EMPTY);
+        }
+        if (coscoEvaluateLevel.getBeginValue()>coscoEvaluateLevel.getEndValue()) {
+            return BaseResponse.fail(ErrorMessageConstant.START_VALUE_CANNOT_BE_GREATER_THAN_END_VALUE);
+        }
+        return null;
+    }
+}
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateLevelServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateLevelServiceImpl.java
index 7557ff7..f4f6e13 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateLevelServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateLevelServiceImpl.java
@@ -55,7 +55,6 @@ public class CoscoEvaluateLevelServiceImpl implements ICoscoEvaluateLevelService
         coscoEvaluateLevel.setCreateBy(SupplierUserConstant.USER_NAME);
         coscoEvaluateLevel.setCreateTime(new Date());
         coscoEvaluateLevel.setId(PropertyUtils.getSnowflakeId());
-
         coscoEvaluateLevel.setUpdateBy(SupplierUserConstant.USER_NAME);
         coscoEvaluateLevel.setUpdateTime(new Date());
         return coscoEvaluateLevelMapper.insertCoscoEvaluateLevel(coscoEvaluateLevel);
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskAssignDeptServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskAssignDeptServiceImpl.java
index dccf962..7017b13 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskAssignDeptServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskAssignDeptServiceImpl.java
@@ -89,12 +89,18 @@ public class CoscoEvaluateTaskAssignDeptServiceImpl implements ICoscoEvaluateTas
         return coscoEvaluateTaskAssignDeptMapper.deleteCoscoEvaluateTaskAssignDeptById(id);
     }
 
+    /**
+     * 添加供应商评价_分派下级单位完善评价人
+     * @param addCoscoEvaluateTaskVo
+     */
     @Override
     public void insertAssignDept(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) {
         CoscoEvaluateTaskAssignDept dept = new CoscoEvaluateTaskAssignDept();
         dept.setEvaluateTaskId(addCoscoEvaluateTaskVo.getId());
         dept.setParentDeptId(SupplierUserConstant.DEPT_ID);
+        //获取是否已经拥有权限，如果拥有权限不添加
         List<CoscoEvaluateTaskAssignDept> coscoEvaluateTaskAssignDepts = coscoEvaluateTaskAssignDeptMapper.selectCoscoEvaluateTaskAssignDeptList(dept);
+        //如果没有权限添加
         if (coscoEvaluateTaskAssignDepts.isEmpty()) {
             dept.setId(PropertyUtils.getSnowflakeId());
             dept.setStatus(addCoscoEvaluateTaskVo.getTaskStatus());
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 df333af..b59a0a0 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
@@ -137,7 +137,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
                 vos.add(vo);
             });
             List<String> supplierIds = list.stream().map(TaskSupplierVo::getId).collect(Collectors.toList());
-            Map<String, List<String>> suppMap = list.stream().collect(Collectors.toMap(TaskSupplierVo::getId, TaskSupplierVo::getUserIds,(existing, replacement) -> existing));
+            Map<String, List<String>> suppMap = list.stream().collect(Collectors.toMap(TaskSupplierVo::getId, TaskSupplierVo::getUserIds, (existing, replacement) -> existing));
             Map<String, UserVo> userMap = userService.getUser(new SelectUserVo()).stream().collect(Collectors.toMap(UserVo::getUserId, userVo -> userVo));
             List<BlackSupplierVo> blackSupplierVos = coscoSupplierBaseMapper.selectSupplierByIds(supplierIds);
             blackSupplierVos.forEach(blackSupplierVo -> {
@@ -149,7 +149,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
                     vo.setName(userMap.get(userId).getUserName());
                     vo.setUserDept(userMap.get(userId).getUserDept());
                     vo.setUserDeptId(userMap.get(userId).getUserDeptId());
-                    vo.setIsSelected( true);
+                    vo.setIsSelected(true);
                     taskUserVos.add(vo);
                 });
                 blackSupplierVo.setUserList(taskUserVos);
@@ -253,15 +253,19 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
         IPage<CoscoEvaluateTaskListVo> coscoEvaluateTaskListVoIPage = coscoEvaluateTaskMapper.selectMyPage(p, taskListVo);
         //根据分页数据获取是否显示分工
         List<String> taskIds = coscoEvaluateTaskListVoIPage.getRecords().stream().map(CoscoEvaluateTaskListVo::getId).collect(Collectors.toList());
+        //获取本部门id
         taskListVo.setDeptId(SupplierUserConstant.DEPT_ID);
         taskListVo.setTaskIds(taskIds);
+        //获取上级部门id
         taskListVo.setParentDeptId(SupplierUserConstant.PARENT_DEPT_ID);
+        //获取上级部门开放分工参数
         List<DivisionVo> vos = coscoEvaluateTaskMapper.selectDivisionVo(taskListVo);
         //根据分工参数获取内容
         Map<String, String> map = vos.stream().collect(Collectors.toMap(DivisionVo::getTaskId, DivisionVo::getDivision));
+        //根据分工参数赋值
         coscoEvaluateTaskListVoIPage.getRecords().forEach(task -> {
-            task.setIsEditor(task.getDeptId().equals(taskListVo.getDeptId()) ? "1" : "0");
-            task.setDivision(map.get(task.getId()) == null ? "2" : map.get(task.getId()));
+            task.setIsEditor(task.getDeptId().equals(taskListVo.getDeptId()) ? "1" : "0"); //1表示可修改 0不可修改
+            task.setDivision(map.get(task.getId()) == null ? "2" : map.get(task.getId())); //2表示未分工 1表示已分工
         });
         return coscoEvaluateTaskListVoIPage;
     }
@@ -276,12 +280,14 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
     public IPage<TaskPageVo> getTaskPage(TaskPageVo taskListVo) {
         IPage<CoscoEvaluateTaskListVo> p = new Page<>(taskListVo.getBasePageRequest().getPageNo(),
                 taskListVo.getBasePageRequest().getPageSize());
+        //获取分页数据
         IPage<TaskPageVo> taskPageVoIPage = coscoEvaluateTaskMapper.selectTaskPage(p, taskListVo);
         List<String> deptIds = new ArrayList<>();
         taskPageVoIPage.getRecords().forEach(taskPageVo -> {
             deptIds.add(taskPageVo.getDeptId());
         });
         //根据部门id查询发起单位
+        //给与部门信息赋值
         return taskPageVoIPage;
     }
 
@@ -310,9 +316,12 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
     @Override
     @MessageLog(messageType = MessageType.MESSAGETYPE_GYSJYSH)
     public ApproveVo evaluateApprove(AddCoscoEvaluateTaskVo vo) {
+        //根据工作流id查询任务信息
         CoscoEvaluateTask coscoEvaluateTask = coscoEvaluateTaskMapper.selectByWorkFlowId(vo.getWorkFlowId());
         coscoEvaluateTask.setApproveStatus(vo.getApproveStatus());
+        //修改任务信息
         coscoEvaluateTaskMapper.updateCoscoEvaluateTask(coscoEvaluateTask);
+        //消息信息赋值
         ApproveVo aVo = new ApproveVo();
         aVo.setResult(vo.getApproveStatus());
         aVo.setCreateBy(coscoEvaluateTask.getCreateBy());
@@ -320,6 +329,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
         aVo.setTaskName(coscoEvaluateTask.getEvaluateTheme());
         CoscoEvaluateTaskSupplier coscoEvaluateTaskSupplier = new CoscoEvaluateTaskSupplier();
         coscoEvaluateTaskSupplier.setEvaluateTaskId(coscoEvaluateTask.getId());
+        //获取当前任务功行赏id信息
         List<CoscoEvaluateTaskSupplier> coscoEvaluateTaskSuppliers = coscoEvaluateTaskSupplierMapper.selectCoscoEvaluateTaskSupplierList(coscoEvaluateTaskSupplier);
         List<String> supplierIds = coscoEvaluateTaskSuppliers.stream().map(CoscoEvaluateTaskSupplier::getSupplierId).collect(Collectors.toList());
         aVo.setSupplierIds(supplierIds);
@@ -344,14 +354,15 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
     @Transactional(rollbackFor = Exception.class)
     public int addTask(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) {
         try {
-            //添加主表信息
+            //添加主表信息 根据id判断是添加还是修改
             if (addCoscoEvaluateTaskVo.getId() == null) {
                 addCoscoEvaluateTaskVo(addCoscoEvaluateTaskVo);
             } else {
                 updateCoscoEvaluateTask(addCoscoEvaluateTaskVo);
             }
+            //删除任务信息
             deleteAll(addCoscoEvaluateTaskVo);
-
+            //添加任务信息详情
             addEvalTaskInfo(addCoscoEvaluateTaskVo);
         } catch (Exception e) {
             throw new RuntimeException(e);
@@ -388,6 +399,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
             supplierIds.add(supplierId.getId());
             supplierUserIds.put(supplierId.getId(), supplierId.getUserIds());
         }
+        //添加供应商列表信息
         List<CoscoEvaluateTaskSupplier> list = new ArrayList<>();
         for (String supplierId : supplierIds) {
             CoscoEvaluateTaskSupplier coscoEvaluateTaskSupplier = new CoscoEvaluateTaskSupplier();
@@ -460,9 +472,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
         coscoEvaluateScoringMapper.batchCoscoEvaluateScoring(coscoEvaluateScorings);
         coscoEvaluateTaskSupplierUserMapper.batchCoscoEvaluateTaskSupplierUser(coscoEvaluateTaskSupplierUsers);
         coscoEvaluateTaskUserIndicatorMapper.batchCoscoEvaluateTaskUserIndicator(coscoEvaluateTaskSupplierUserIndicators);
-        /**
-         * 添加评价是否可以下级提交
-         */
+        //添加评价是否可以下级提交人员信息 修改不可添加
         if (addCoscoEvaluateTaskVo.getTaskStatus() != null) {
             coscoEvaluateTaskAssignDeptService.insertAssignDept(addCoscoEvaluateTaskVo);
         }
@@ -480,6 +490,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
 
     /**
      * 人员信息封装
+     *
      * @param userMap
      * @param vo
      * @param coscoEvaluateTemplateIndicatorNds
@@ -487,22 +498,21 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
     public void adduserMap(Map<String, List<String>> userMap, AdduserIndicatorVo vo,
                            List<CoscoEvaluateTemplateIndicatorNd> coscoEvaluateTemplateIndicatorNds) {
         Map<String, String> map = new HashMap<>();
+        //获取二级信息项数据
         coscoEvaluateTemplateIndicatorNds.forEach(coscoEvaluateTemplateIndicatorNd -> {
             map.put(coscoEvaluateTemplateIndicatorNd.getId(), coscoEvaluateTemplateIndicatorNd.getIndicatorStId());
         });
-        //一级项信息
-        //Map<String, String> stIdMap = new HashMap<>();
-        //二级项信息
+        //二级项信息判断是否是全量添加还是选择添加
         Map<String, String> ndIdMap = new HashMap<>();
+        //选择添加逻辑
         if (CoscoCategoryConstant.CATEGORY_LEVEL_TOP.equals(vo.getType())) {
             coscoEvaluateTemplateIndicatorNds.forEach(coscoEvaluateTemplateIndicatorNd -> {
-                //stIdMap.put(coscoEvaluateTemplateIndicatorNd.getIndicatorStId(), coscoEvaluateTemplateIndicatorNd.getIndicatorStId());
                 ndIdMap.put(coscoEvaluateTemplateIndicatorNd.getId(), coscoEvaluateTemplateIndicatorNd.getId());
             });
+            //全部添加逻辑
         } else {
             List<String> indicatorIds = vo.getIndicatorIds();
             indicatorIds.forEach(indicatorId -> {
-                //stIdMap.put(map.get(indicatorId), map.get(indicatorId));
                 ndIdMap.put(indicatorId, indicatorId);
             });
         }
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 f48c977..f6a5399 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
@@ -157,21 +157,22 @@ public class CoscoEvaluateTaskSupplierServiceImpl implements ICoscoEvaluateTaskS
         CoscoEvaluateTask coscoEvaluateTask = coscoEvaluateTaskMapper.selectCoscoEvaluateTaskById(coscoEvaluateTaskSupplier.getEvaluateTaskId());
         //获取供应商名称和品类名称
         BaseCategoryNameVo baseCategoryNameVo = coscoSupplierBaseMapper.selectNameAndCategoryName(coscoEvaluateTaskSupplier.getSupplierId());
+        //封装返回值信息
         TaskIndicatorBaseVo taskIndicatorBaseVo = new TaskIndicatorBaseVo();
         taskIndicatorBaseVo.setName(baseCategoryNameVo.getName());
         taskIndicatorBaseVo.setCategory(baseCategoryNameVo.getCategoryName());
         List<TaskIndicatorVo> taskIndicatorVo = new ArrayList<>();
+        //根据供应商任务id获取评分数据
         CoscoEvaluateScoringResult result = new CoscoEvaluateScoringResult();
         result.setEvaluateTaskSupplierId(id);
-        //获取评分数据
         List<CoscoEvaluateScoringResult> coscoEvaluateScoringResults = coscoEvaluateScoringResultMapper.selectCoscoEvaluateScoringResultList(result);
+        //根据模板id获取评分二级节点数据
         CoscoEvaluateTemplateIndicatorNd coscoEvaluateTemplateIndicatorNd = new CoscoEvaluateTemplateIndicatorNd();
         coscoEvaluateTemplateIndicatorNd.setTemplateId(coscoEvaluateTask.getTemplateId());
-        //获取评分二级节点数据
         List<CoscoEvaluateTemplateIndicatorNd> coscoEvaluateTemplateIndicatorNds = coscoEvaluateTemplateIndicatorNdMapper.selectCoscoEvaluateTemplateIndicatorNdList(coscoEvaluateTemplateIndicatorNd);
+        //根据模板id获取评分一级节点数据
         CoscoEvaluateTemplateIndicatorSt coscoEvaluateTemplateIndicatorSt = new CoscoEvaluateTemplateIndicatorSt();
         coscoEvaluateTemplateIndicatorSt.setTemplateId(coscoEvaluateTask.getTemplateId());
-        //获取评分一级节点数据
         List<CoscoEvaluateTemplateIndicatorSt> coscoEvaluateTemplateIndicatorSts =
                 coscoEvaluateTemplateIndicatorStMapper.selectCoscoEvaluateTemplateIndicatorStList(coscoEvaluateTemplateIndicatorSt);
         //根据一级节点封装数据
@@ -191,7 +192,7 @@ public class CoscoEvaluateTaskSupplierServiceImpl implements ICoscoEvaluateTaskS
                 }
                 subIndicator.add(vo);
             }
-            //一级节点封装
+            //一级节点封装返回值
             TaskIndicatorVo vo = new TaskIndicatorVo();
             vo.setBaseIndicator(st.getBaseIndicator());
             vo.setIndicatorDesc(st.getDescIndicator());
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierUserServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierUserServiceImpl.java
index 916999a..77e107a 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierUserServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierUserServiceImpl.java
@@ -1,22 +1,27 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl;
 
+import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.CoscoEvaluateScoringMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.CoscoEvaluateTaskMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.CoscoEvaluateTaskSupplierUserMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.CoscoEvaluateTemplateIndicatorStMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateScoring;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTask;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskSupplierUser;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTemplateIndicatorSt;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskSupplierUserService;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.*;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.BaseCategoryNameVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
-import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.*;
-import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.*;
-import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.*;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.BaseCategoryNameVo;
-import org.checkerframework.checker.units.qual.C;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskSupplierUserService;
-
 /**
  * 【供应商评价_评价任务供应商对应评审人表】Service业务层处理
  *
@@ -34,8 +39,6 @@ public class CoscoEvaluateTaskSupplierUserServiceImpl implements ICoscoEvaluateT
     @Autowired
     private CoscoEvaluateTemplateIndicatorStMapper coscoEvaluateTemplateIndicatorStMapper;
     @Autowired
-    private CoscoEvaluateTemplateIndicatorNdMapper coscoEvaluateTemplateIndicatorNdMapper;
-    @Autowired
     private CoscoEvaluateTaskMapper coscoEvaluateTaskMapper;
 
     /**
@@ -108,21 +111,21 @@ public class CoscoEvaluateTaskSupplierUserServiceImpl implements ICoscoEvaluateT
 
     @Override
     public TaskIndicatorBaseVo getIndicator(String id) {
-        //获取人员信息
+        //根据用户打分id获取打分人信息
         CoscoEvaluateTaskSupplierUser coscoEvaluateTaskSupplierUser = coscoEvaluateTaskSupplierUserMapper.selectCoscoEvaluateTaskSupplierUserById(id);
-        //获取项目信息
+        //根据项目id获取项目信息
         CoscoEvaluateTask coscoEvaluateTask = coscoEvaluateTaskMapper.selectCoscoEvaluateTaskById(coscoEvaluateTaskSupplierUser.getEvaluateTaskId());
-        //项目信息
+        //根据项目id获取供应商信息和分类信息
         BaseCategoryNameVo baseCategoryNameVo = coscoSupplierBaseMapper.selectNameAndCategoryName(coscoEvaluateTaskSupplierUser.getSupplierId());
         TaskIndicatorBaseVo taskIndicatorBaseVo = new TaskIndicatorBaseVo();
         taskIndicatorBaseVo.setName(baseCategoryNameVo.getName());
         taskIndicatorBaseVo.setCategory(baseCategoryNameVo.getCategoryName());
         List<TaskIndicatorVo> taskIndicatorVo=new ArrayList<>();
-        //查询添加的项目评价指标
+        //根据用户id查询添加的项目评价指标
         List<TaskSubIndicatorVo> coscoEvaluateScorings = coscoEvaluateScoringMapper.selectTaskSubIndicatorVo(id);
+        //根据评价模板id获取二级项目信息
         CoscoEvaluateTemplateIndicatorSt coscoEvaluateTemplateIndicatorSt=new CoscoEvaluateTemplateIndicatorSt();
         coscoEvaluateTemplateIndicatorSt.setTemplateId(coscoEvaluateTask.getTemplateId());
-        //获取二级项目信息
         List<CoscoEvaluateTemplateIndicatorSt> coscoEvaluateTemplateIndicatorSts =
                 coscoEvaluateTemplateIndicatorStMapper.selectCoscoEvaluateTemplateIndicatorStList(coscoEvaluateTemplateIndicatorSt);
         //根据人员信息进行封装
@@ -149,7 +152,7 @@ public class CoscoEvaluateTaskSupplierUserServiceImpl implements ICoscoEvaluateT
     public void getScore(AddScoreVo vo) {
         //打分结果添加
         int i =0;
-        //修改列表
+        //修改打分表信息
         List<ScoreVo> scoreVoList = vo.getScoreVoList();
         for (ScoreVo voVo : scoreVoList){
             if(voVo.getScore()!=null && !voVo.getScore().equals("")){
@@ -161,7 +164,7 @@ public class CoscoEvaluateTaskSupplierUserServiceImpl implements ICoscoEvaluateT
                 i++;
             }
         }
-        //批量修改数据
+        //修改人员打分状态
         if(i>0){
             CoscoEvaluateTaskSupplierUser user=new CoscoEvaluateTaskSupplierUser();
             user.setId(vo.getId());
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 051e307..15f5e1a 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
@@ -86,9 +86,7 @@ public class CoscoEvaluateTemplateServiceImpl implements ICoscoEvaluateTemplateS
         templateVo.setCreateBy(SupplierUserConstant.USER_NAME);
         templateVo.setUpdateBy(SupplierUserConstant.USER_NAME);
         coscoEvaluateTemplateMapper.insertCoscoEvaluateTemplate(templateVo);
-        /**
-         * 添加一级二级评价想信息
-         */
+        // 添加一级二级评价想信息
         coscoEvaluateTemplateIndicatorStService.batchInsert(templateVo);
         return 1;
     }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java
index 3bd6c06..00bd0f0 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java
@@ -2,7 +2,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl;
 
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.base.constant.EvaluateTaskConstant;
-import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.base.service.impl.UserService;
 import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SelectUserVo;
 import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo;
@@ -257,8 +256,8 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService {
             CoscoMessage coscoMessage = new CoscoMessage();
             coscoMessage.setId(PropertyUtils.getSnowflakeId());
             coscoMessage.setReceiverId(becomeDueVo.getCreater());
-            coscoMessage.setContent("您准入的" + becomeDueVo.getName() + "供应商黑名单时效到期，请及时提交解除申请：");
-            coscoMessage.setType(MessageConstant.BLACKLIST_EXPIRE);
+            coscoMessage.setContent("您准入的" + becomeDueVo.getName() + "供应商黑名单时效到期，请及时提交解除申请。");
+            coscoMessage.setType(MessageType.BLACKLIST_EXPIRE);
             coscoMessage.setCreateTime(new Date());
             coscoMessage.setUpdateTime(new Date());
             coscoMessages.add(coscoMessage);
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml
index ef65d07..14f80dd 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml
@@ -1041,7 +1041,9 @@
         <if test="vo.categoryId!=null and vo.categoryId!=''">
             and category_info.categoryId like concat('%',#{vo.categoryId},'%')
         </if>
-
+        <if test="vo.levelName!=null and vo.levelName!=''">
+            and cetss.level_name = #{vo.levelName}
+        </if>
 
         GROUP BY
         csb.id