From 70d16fc4f55cd2c2909b6aa23785d97e57088f5d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 16 五月 2025 14:00:44 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 2 ++
admin/src/views/business/retention.vue | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/admin/src/views/business/retention.vue b/admin/src/views/business/retention.vue
index 8581b83..4c1df05 100644
--- a/admin/src/views/business/retention.vue
+++ b/admin/src/views/business/retention.vue
@@ -76,12 +76,14 @@
<span v-else>璁垮</span>
</template>
</el-table-column>-->
+ <el-table-column label="澶囨敞" prop="remark" min-width="100px"></el-table-column>
<el-table-column label="杩涘満闂ㄧ" min-width="100px">
<template slot-scope="{ row }">
<!-- <span v-if="row.type === 1">-</span> -->
<span>{{ row.deviceName || '-' }}</span>
</template>
</el-table-column>
+ <el-table-column label="澶囨敞" prop="remark" min-width="120px"></el-table-column>
<el-table-column prop="eventDate" label="鏈�鍚庤繘鍦烘椂闂�" min-width="140px"></el-table-column>
<el-table-column label="浜鸿劯鐓х墖" min-width="100px">
<template slot-scope="{ row }">
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index a52f476..68651cf 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -1403,6 +1403,7 @@
retention.setDeviceName(request.getSrcName());
retention.setDeviceIndex(request.getSrcIndex());
retention.setCarNo(inoutRecord.getCarCode());
+ retention.setDeviceName(request.getData().getGateName()+request.getData().getRoadwayName());
retention.setRemark("璺熼殢杞﹁締銆�"+inoutRecord.getCarCode()+"銆戝叆鍥尯");
return retention;
}
@@ -1419,6 +1420,7 @@
retention.setCategoryName(carrecord.getCategoryName());
retention.setCategoryParentId(carrecord.getCategoryParentId());
retention.setCategoryParentName(carrecord.getCategoryParentName());
+ retention.setDeviceName(request.getData().getGateName()+request.getData().getRoadwayName());
// retention.setDeviceName(request.getSrcName());
// retention.setDeviceIndex(request.getSrcIndex());
--
Gitblit v1.9.3