添加日期返回
This commit is contained in:
@ -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());
|
||||
|
@ -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;
|
||||
/**
|
||||
* 开始时间
|
||||
*/
|
||||
|
@ -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
|
||||
|
@ -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,
|
||||
|
Reference in New Issue
Block a user