From f695b59337121fb6c93251e73bdfb3fc8e847cc8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 25 七月 2025 17:07:09 +0800
Subject: [PATCH] 调拔单功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java
index 2b5f9c3..6474f6e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java
@@ -71,6 +71,9 @@
@ApiModelProperty(value= "涓氬姟绫诲瀷")
private String wkType;
+ @ApiModelProperty("鐩樼偣绫诲瀷")
+ private Integer checkType;
+
/**
* 閫佽揣鏁伴噺
*/
@@ -228,11 +231,15 @@
}
public String getWkType$(){
+ String typeCode = DictTypeCode.DICT_SYS_BUSINESS_TYPE;
+ if (type.equals(OrderType.ORDER_CHECK.type)) {
+ typeCode = DictTypeCode.SYS_CHECK_ORDER_TYPE;
+ }
if (Cools.isEmpty(this.wkType)){
return "";
}
DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
- DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE).eq(DictData::getValue, this.wkType));
+ DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, typeCode).eq(DictData::getValue, this.wkType));
if (Objects.isNull(dictData)) {
return null;
}
@@ -240,11 +247,11 @@
}
public String getCheckType$(){
- if (Cools.isEmpty(this.wkType)){
+ if (Cools.isEmpty(this.checkType)){
return "";
}
DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
- DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.SYS_CHECK_ORDER_TYPE).eq(DictData::getValue, this.wkType));
+ DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.SYS_CHECK_TYPE).eq(DictData::getValue, this.checkType));
if (Objects.isNull(dictData)) {
return null;
}
--
Gitblit v1.9.1