From 7289189c907038db99d41aefcd9e12dce5077d3e Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期一, 19 五月 2025 10:17:26 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/vo/TResultWorkEvaluateDetailVO.java | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TResultWorkEvaluateDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TResultWorkEvaluateDetailVO.java new file mode 100644 index 0000000..362caf4 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TResultWorkEvaluateDetailVO.java @@ -0,0 +1,43 @@ +package com.ruoyi.system.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.system.model.TResultWorkEvaluate; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + +@Data +@ApiModel(value = "实验员工作评定管理详情VO") +public class TResultWorkEvaluateDetailVO extends TResultWorkEvaluate { + + @ApiModelProperty(value = "项目组名称") + private String teamName; + @ApiModelProperty(value = "项目组总积分") + private Integer teamIntegral; + @ApiModelProperty(value = "工艺工程师总积分") + private Integer engineerIntegral; + @ApiModelProperty(value = "化验师总积分") + private Integer chemistIntegral; + @ApiModelProperty(value = "实验员总积分") + private Integer testerIntegral; + @ApiModelProperty(value = "实验终止次数") + private Integer termination; + @ApiModelProperty(value = "评定开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime startTime; + @ApiModelProperty(value = "评定结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime endTime; + + @ApiModelProperty(value = "工艺工程师内容评定") + private List<TResultWorkEvaluateDetailEngineerVO> engineerList; + @ApiModelProperty(value = "化验室内容评定") + private List<TResultWorkEvaluateDetailUserVO> chemistList; + @ApiModelProperty(value = "实验员内容评定") + private List<TResultWorkEvaluateDetailUserVO> testerList; + + +} -- Gitblit v1.7.1