From 94fdc01dacf7a3bc185ca99e98d0864594d34ef1 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 07 五月 2025 10:34:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 0806679..c4ddc1f 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
@@ -255,6 +255,7 @@
}
}
if(member !=null){
+ record.setMemberId(member.getId());
record.setMemberName(member.getName());
record.setObjId(member.getId());
record.setObjType(Constants.ONE);
@@ -569,6 +570,7 @@
record.setIsdeleted(Constants.ZERO);
record.setMemberName(visits.getName());
record.setObjId(visits.getId());
+ record.setMemberId(visits.getMemberId());
record.setObjType(Constants.TWO);
record.setMemberPhone(visits.getPhone());
record.setCompanyName(visits.getCompanyName());
@@ -927,6 +929,7 @@
carrecord.setMemberName(carModel.getMemberName());//鍙告満
carrecord.setMemberPhone(carModel.getMemberPhone());//鍙告満
carrecord.setObjId(carModel.getId());
+ carrecord.setMemberId(carModel.getMemberId());
carrecord.setObjType(Constants.ZERO);
carrecord.setFaceImg(carModel.getFaceImg());
carrecord.setIdcardDecode(carModel.getIdcardDecode());
@@ -1122,7 +1125,12 @@
inoutDayCount.setOutMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutMemberNum())+1);
}
}
- inoutRecordList.add(carrecord);//褰曞叆杞﹁締浠ュ強鎼哄甫浜哄憳鐨勫叆鍥槑缁嗚褰曪紙闈炶瀹級
+ if(carrecord.getInOrOut() !=null) {//濡傛灉鏄嚭鍏ヨ褰�
+ if(Constants.equalsInteger(carrecord.getCarBizType(),Constants.RetentionCarType.other)){
+ carrecord.setCategoryName("鏈煡杞﹁締");//榛樿鏈煡杞﹁締
+ }
+ inoutRecordList.add(carrecord);//褰曞叆杞﹁締浠ュ強鎼哄甫浜哄憳鐨勫叆鍥槑缁嗚褰曪紙闈炶瀹級
+ }
}
private Category findCategoryByBizType(Integer carType,String tempname, String pName,List<Category> categoryList) {
--
Gitblit v1.9.3