From 03a9bc526bb4a420227ebea4e8feb04ba9cda0a5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 18 六月 2025 14:14:01 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 1 +
admin/src/views/business/visits.vue | 7 +++++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java | 8 ++++++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/business/visits.vue b/admin/src/views/business/visits.vue
index 87bfc92..32ad7a6 100644
--- a/admin/src/views/business/visits.vue
+++ b/admin/src/views/business/visits.vue
@@ -99,8 +99,11 @@
</el-table-column>
<el-table-column label="鍦ㄥ洯鐘舵��" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.status == 7 && row.retentionNum && row.retentionNum >0 ">鏄�</span>
- <span v-else >鍚�</span>
+ <div v-if="row.status == 7">
+ <span v-if="row.retentionNum && row.retentionNum >0 ">鏄�</span>
+ <span v-if="!row.retentionNum || row.retentionNum ==0 " >鍚�</span>
+ </div>
+ <div v-else >-</div>
</template>
</el-table-column>
<el-table-column prop="remark" label="涓嬪彂澶囨敞" min-width="100px"></el-table-column>
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 769318b..965101e 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -27,6 +27,7 @@
public static final int ONE = 1 ;
public static final int TWO = 2 ;
public static final String HK_PARAM ="HK_PARAM" ;
+ public static final String HK_WEBSITE_DOMAIN_URL ="HK_WEBSITE_DOMAIN_URL" ;
public static final String LED_CONTENT_SPEED ="LED_CONTENT_SPEED" ;
public static final String HK_HOST ="HK_HOST" ;
public static final String HK_APPKEY ="HK_APPKEY" ;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
index 9b0200c..74b5fc2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
@@ -34,6 +35,8 @@
public class HkSyncNoticeServiceImpl extends HkSyncBaseServiceImpl {
@Autowired
private NoticesJoinMapper noticesJoinMapper;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@Autowired
private MemberMapper memberMapper;
@@ -94,9 +97,8 @@
}
curPage++;
}
-
-
if(allHkList!=null && allHkList.size()>0){
+ String gotoUrl = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_WEBSITE_DOMAIN_URL).getCode();
List<Notices> list = new ArrayList<>();
for(GetTodoListResponse data :allHkList){
Member u = getFromUserList(data.getUserId(),userList);
@@ -130,6 +132,8 @@
notices.setParam3(data.getMsgCreateTime());
notices.setParam5(JSONObject.toJSONString(param));
notices.setType(Constants.noticesObjectType.hknotice);
+ notices.setRemark(gotoUrl+"dps/web/wxAuth/loginV2?oaId=atwl&redirectId=index");
+ notices.setRemark(gotoUrl+StringUtils.defaultString(data.getSegmentId(),"")+StringUtils.defaultString(data.getH5Url(),""));
list.add(notices);
}
if(list.size()>0){
--
Gitblit v1.9.3