From c731084698d89c12c23180f57598d521abb97a23 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 12 五月 2025 14:15:32 +0800 Subject: [PATCH] 质检功能优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java index 5954226..34fb5c3 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java @@ -3,6 +3,7 @@ import java.text.SimpleDateFormat; import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.fasterxml.jackson.annotation.JsonFormat; import com.vincent.rsf.server.system.constant.DictTypeCode; @@ -22,6 +23,7 @@ import com.vincent.rsf.server.system.service.UserService; import com.vincent.rsf.server.system.entity.User; import java.io.Serializable; +import java.util.Map; import java.util.Objects; @Data @@ -130,11 +132,18 @@ @ApiModelProperty(value= "鍨嬪彿") private String model; + @ApiModelProperty("璐ㄦ鐘舵��") + private Short isptResult; + /** * 瀛楁绱㈠紩 */ @ApiModelProperty(value= "瀛楁绱㈠紩") private String fieldsIndex; + + @ApiModelProperty("鎵╁睍瀛楁") + @TableField(exist = false) + private Map<String, String> extendFields; /** * 鐘舵�� 1: 姝e父 0: 鍐荤粨 @@ -244,6 +253,20 @@ return dictDatas.getLabel(); } + public String getIsptResult$(){ + if (Cools.isEmpty(this.isptResult)){ + return null; + } + DictDataService dictDataService = SpringUtils.getBean(DictDataService.class); + DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>() + .eq(DictData::getDictTypeCode, DictTypeCode.DICT_INSPECT_RESULT) + .eq(DictData::getValue, this.isptResult)); + if (Objects.isNull(dictData)) { + return null; + } + return dictData.getLabel(); + } + public String getStatus$(){ if (null == this.status){ return null; } switch (this.status){ -- Gitblit v1.9.1