From e4c63c11d866f4dad001cbe76d83540fcac70d17 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期二, 30 四月 2024 13:43:43 +0800 Subject: [PATCH] 考核删除多余类 --- ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java | 72 +++++++++++++++++------------------ 1 files changed, 35 insertions(+), 37 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java index 448e871..1ead396 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java @@ -1,60 +1,58 @@ package com.ycl.platform.domain.vo; +import annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ycl.platform.base.AbsVo; -import com.ycl.platform.domain.entity.CheckResult; - -import java.math.BigDecimal; -import java.util.List; -import java.time.LocalDateTime; -import org.springframework.lang.NonNull; -import org.springframework.beans.BeanUtils; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.beans.BeanUtils; +import org.springframework.lang.NonNull; + +import java.math.BigDecimal; +import java.util.Date; /** - * 鑰冩牳缁撴灉灞曠ず - * - * @author xp - * @since 2024-03-07 + * @author gonghl */ @Data @Accessors(chain = true) -public class CheckResultVO extends AbsVo { +public class CheckResultVO { + private Long id; - /** 鑰冩牳瀵硅薄 */ - private Integer checkUnitId; - private String checkUnitName; + private Long unitId; - /** 鑰冩牳 */ - private String examineName; + @Excel(name = "鑰冩牳瀵硅薄") + private String unitName; - /** 鑰冩牳棰戠巼 */ - private String frequency; + private Long contractId; - /** 鑰冩牳鑼冨洿 */ - private String examineRange; + @Excel(name = "杩愮淮鍚堝悓") + private String contractName; - /** 鏈�缁堝垎鏁� */ - private BigDecimal checkScore; + private Long publishId; - /** 绯荤粺鎵撳垎 */ - private BigDecimal systemScore; + @Excel(name = "鑰冩牳鍒嗘暟", scale = 2) + private BigDecimal score; - /** 浜哄伐鎵撳垎 */ - private BigDecimal manualScore; - - /** 鑰冩牳鏃堕棿 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime checkTime; - - /** 鏄惁鍙戝竷 */ + @Excel(name = "鏄惁鍙戝竷", readConverterExp = "0=鏈彂甯�,1=宸插彂甯�") private Integer publish; + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "鑰冩牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd") + private Date checkTime; + + private String deleted; + + @JsonFormat(pattern = "yyyy-MM-dd") + private Date updateTime; + + @JsonFormat(pattern = "yyyy-MM-dd") + private Date createStartTime; + + @JsonFormat(pattern = "yyyy-MM-dd") + private Date createEndTime; + public static CheckResultVO getVoByEntity(@NonNull CheckResult entity, CheckResultVO vo) { - if(vo == null) { + if (vo == null) { vo = new CheckResultVO(); } BeanUtils.copyProperties(entity, vo); -- Gitblit v1.8.0