From b037931cfedfca3f85fbb789025585a1219947ef Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期二, 01 四月 2025 12:58:46 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java
index 7cd2470..8a811bc 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java
@@ -54,6 +54,9 @@
@ApiModelProperty("璐ㄦ鐘舵��")
private String isptStatus;
+ @ApiModelProperty("璐ㄦ缁撴灉")
+ private Short isptResult;
+
/**
* 涓氬姟绫诲瀷
*/
@@ -176,7 +179,7 @@
if (null == this.isptStatus) {return null;}
DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
- .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_TASK_TYPE)
+ .eq(DictData::getDictTypeCode, DictTypeCode.DICT_QLY_INSPECT_STATUS)
.eq(DictData::getValue, this.isptStatus));
if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
return null;
--
Gitblit v1.9.1