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/TResultWorkEvaluateVO.java | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TResultWorkEvaluateVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TResultWorkEvaluateVO.java new file mode 100644 index 0000000..c378fef --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TResultWorkEvaluateVO.java @@ -0,0 +1,36 @@ +package com.ruoyi.system.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.system.model.TQaReportFile; +import com.ruoyi.system.model.TQaTestItemReport; +import com.ruoyi.system.model.TResultWorkEvaluate; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +@Data +@ApiModel(value = "实验员工作评定管理分页列表VO") +public class TResultWorkEvaluateVO 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 = "评定开始时间") + @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; + +} -- Gitblit v1.7.1