From 162ff90bafae549ba42cebaa9991049564cc4567 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 14:00:18 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
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 82cee9c..7635cac 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
@@ -284,8 +284,10 @@
}
}
}
+ if(record.getMemberType()!=null){
+ inoutRecordList.add(record);
+ }
}
- inoutRecordList.add(record);
}
}
@@ -942,7 +944,7 @@
carrecord.setCategoryId(carModel.getCateId());
carrecord.setCategoryName(carModel.getCateName());
carrecord.setCategoryParentId(carModel.getCatePId());
- carrecord.setCategoryParentName(carModel.getCatePName());
+ carrecord.setCategoryParentName(StringUtils.defaultString(carModel.getCatePName(),carModel.getCateName()));
carrecord.setType( Constants.RetentionMemberType.car);//鍙槸杞﹁締鐨勮褰�
if(carModel.getMemberId()!=null){
if(Constants.equalsInteger(carModel.getCompanyType(),Constants.ONE)){
@@ -1050,8 +1052,8 @@
carrecord.setCarBizType(Constants.RetentionCarType.fkCar);
Category category =findCategoryByBizType(Constants.RetentionCarType.fkCar,"璁垮杞﹁締","璁垮杞﹁締",categoryList);
carrecord.setCategoryId(category.getId());
- carrecord.setCategoryName(category.getName());
- carrecord.setCategoryParentName(category.getParentName());
+ carrecord.setCategoryName(StringUtils.defaultString(category.getName(),"璁垮杞﹁締"));
+ carrecord.setCategoryParentName(StringUtils.defaultString(category.getParentName(),"璁垮杞﹁締"));
carrecord.setCategoryParentId(category.getParentId());
for(Visits v :visitsList){
delMemberRetentionList.add(event.getMemberId());
@@ -1130,6 +1132,7 @@
if(carrecord.getInOrOut() !=null) {//濡傛灉鏄嚭鍏ヨ褰�
if(Constants.equalsInteger(carrecord.getCarBizType(),Constants.RetentionCarType.other)){
carrecord.setCategoryName("鏈煡杞﹁締");//榛樿鏈煡杞﹁締
+ carrecord.setCategoryParentName("鏈煡杞﹁締");//榛樿鏈煡杞﹁締
}
inoutRecordList.add(carrecord);//褰曞叆杞﹁締浠ュ強鎼哄甫浜哄憳鐨勫叆鍥槑缁嗚褰曪紙闈炶瀹級
}
@@ -1139,6 +1142,9 @@
if(categoryList!=null){
for(Category category :categoryList){
if(Constants.equalsInteger(carType,category.getBizType())){
+ if(StringUtils.isBlank(category.getParentName() )){
+ category.setParentName(category.getName());
+ }
return category;
}
}
--
Gitblit v1.9.3