From fbea052fa2235791fd478297bde8e4aaafe64fb4 Mon Sep 17 00:00:00 2001
From: YY <1272464982@qq.com>
Date: Tue, 15 Jul 2025 13:07:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E6=9C=9F=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CoscoAnnualreviewTaskSupplierUserServiceImpl.java  | 10 +++++++++-
 .../vo/AnnualreviewTaskSupplierUserInfoVo.java         |  7 +++++--
 .../supplier/coscoEvaluate/vo/SupplierDimensionVo.java |  5 +++++
 .../mapper/CoscoEvaluateTaskSupplierMapper.xml         |  1 +
 4 files changed, 20 insertions(+), 3 deletions(-)

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 01768e9..f69981a 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
@@ -64,8 +64,16 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua
         BaseCacheUser currentUser = TokenUtil.getCurrentUser();
         //TODO 待完善，部门名称
         vo.setDeptName(currentUser.getOrganizationId());
-        vo.setThemName(coscoAnnualreviewTask.getAnnualreviewTheme());
+        vo.setAnnualreviewTheme(coscoAnnualreviewTask.getAnnualreviewTheme());
         vo.setReviewerName(currentUser.getUserId());
+
+        if(coscoAnnualreviewTaskSupplierUser.getReviewStatus().equals(AnnualreviewTaskConstant.WAIT_APPROVE)){
+            vo.setReviewStatusName("待评审");
+        }
+        if(coscoAnnualreviewTaskSupplierUser.getReviewStatus().equals(AnnualreviewTaskConstant.APPROVE_PASS)){
+            vo.setReviewStatusName("已评审");
+        }
+
         vo.setStartTime(coscoAnnualreviewTask.getStartTime());
         vo.setEndTime(coscoAnnualreviewTask.getEndTime());
         vo.setCategory(baseCategoryNameVo.getCategoryName());
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserInfoVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserInfoVo.java
index 357f208..04e9968 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserInfoVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserInfoVo.java
@@ -1,6 +1,5 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo;
 
-import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
@@ -24,7 +23,7 @@ public class AnnualreviewTaskSupplierUserInfoVo implements Serializable {
     /**
      * 审查主题
      */
-    private String themName;
+    private String annualreviewTheme;
     /**
      * 所属部门
      */
@@ -33,6 +32,10 @@ public class AnnualreviewTaskSupplierUserInfoVo implements Serializable {
      * 审查人
      */
     private String reviewerName;
+    /**
+     * 审查状态
+     */
+    private String reviewStatusName;
     /**
      * 开始时间
      */
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 40a587e..a682d78 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
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 供应商维度评价
@@ -55,6 +56,10 @@ public class SupplierDimensionVo implements Serializable {
      * 提交状态名称
      */
     private String reviewStatusName;
+    /**
+     * 提交时间
+     */
+    private Date reviewTime;
 
     /**
      * 人员id
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml
index 2e3f635..70fa302 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml
@@ -289,6 +289,7 @@
         cet.STATUS ,
         cet.dept_id as deptId,
         cetsu.review_status reviewStatus,
+        cetsu.review_time reviewTime,
         case when cet.STATUS=0 then '未开始'
         when cet.status =1 then '进行中'
         when cet.status =2 then '已结束' end as statusName,