From dd448977e5c770bf3ae600ee782e3445e8100d99 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 21 十月 2025 16:05:05 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java | 2 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 2 +-
admin/src/views/business/retention.vue | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/business/retention.vue b/admin/src/views/business/retention.vue
index a7b8a3c..93bd012 100644
--- a/admin/src/views/business/retention.vue
+++ b/admin/src/views/business/retention.vue
@@ -12,7 +12,7 @@
<el-form-item label="浜哄憳绫诲瀷" prop="queryUserType">
<el-select v-model="searchForm.type" placeholder="璇烽�夋嫨">
<el-option label="璁垮" value="1"></el-option>
- <el-option label="鐩搁暱鏈熷叧鏂�" value="4"></el-option>
+ <el-option label="鐩稿叧鏂逛汉鍛�" value="4"></el-option>
<el-option label="鍐呴儴鍛樺伐" value="2"></el-option>
<el-option label="璐ц繍鍙告満" value="5"></el-option>
</el-select>
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
index 8bc6458..732e66f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
@@ -72,7 +72,7 @@
@ExcelColumn(name="鐘舵�� 0姝ｅ父 1绂佺敤")
private Integer status;
@ApiModelProperty(value = "绫诲瀷 0鏁存墭鐩� 1鏁ｄ欢", example = "1")
- @ExcelColumn(name="绫诲瀷 0鏁ｄ欢 1鏁ｄ欢")
+ @ExcelColumn(name="绫诲瀷 0鏁存墭鐩� 1鏁ｄ欢")
private Integer type;
@ApiModelProperty(value = "鏈堝彴鐘舵�� 0-鏃犺溅 1-鏈夎溅 2-瓒呮椂鍋滈潬 3-閿欒鍋滈潬", example = "1")
@ExcelColumn(name="鏈堝彴鐘舵�� 0-鏃犺溅 1-鏈夎溅 2-瓒呮椂鍋滈潬 3-閿欒鍋滈潬")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index 5823fae..dd04be4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -2816,7 +2816,7 @@
// 3锛夊鑻ヤ笉婊¤冻浠ヤ笂涓ょ偣锛屽垯鑷姩鍒嗛厤鑷虫暎浠舵湀鍙拌繘琛屼綔涓氾紱
if(Constants.equalsInteger(platformGroup.getType(),Constants.ONE)){
//瑁呰揣鏈堝彴 - 鍑哄簱
- if(Objects.nonNull(platformJob.getWmsId())){
+ if(Constants.equalsInteger(platformJob.getOrigin(),Constants.ONE)){
// WM鎺ㄩ�佷换鍔�
List<PlatformWmsDetail> platformWmsDetailList = platformWmsDetailMapper.selectList(new QueryWrapper<PlatformWmsDetail>().lambda()
.eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)
--
Gitblit v1.9.3