From 20381172d906c4092b9249a9aea2aec85c1bf4e4 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期六, 24 五月 2025 16:59:25 +0800 Subject: [PATCH] #逻辑删除 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java index bb58f96..f821c0d 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java @@ -62,13 +62,13 @@ * 浠诲姟鐘舵�� */ @ApiModelProperty(value= "浠诲姟鐘舵��") - private Short taskStatus; + private Integer taskStatus; /** * 浠诲姟绫诲瀷 */ @ApiModelProperty(value= "浠诲姟绫诲瀷") - private Short taskType; + private Integer taskType; /** * 婧愬簱浣� @@ -142,6 +142,7 @@ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚� */ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ") + @TableLogic private Integer deleted; /** @@ -186,7 +187,7 @@ public TaskLog() {} - public TaskLog(Long taskId,String taskCode,Short taskStatus,Short taskType,String orgLoc,String targLoc,String barcode,String robotCode,Short exceStatus,String expDesc,Short sort,String expCode,Date startTime,Date endTime,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) { + public TaskLog(Long taskId,String taskCode,Integer taskStatus,Integer taskType,String orgLoc,String targLoc,String barcode,String robotCode,Short exceStatus,String expDesc,Short sort,String expCode,Date startTime,Date endTime,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) { this.taskId = taskId; this.taskCode = taskCode; this.taskStatus = taskStatus; @@ -258,7 +259,7 @@ DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>() .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_TASK_TYPE) .eq(DictData::getValue, this.taskType)); - if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) { + if (Cools.isEmpty(dictDatas)) { return null; } return dictDatas.getLabel(); -- Gitblit v1.9.1