From c3aaf28f7316cce12eec007a9f85a96cbcddeec2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 10:34:20 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 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 d33e14b..82cee9c 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
@@ -239,14 +239,14 @@
record.setCreateDate(DateUtil.getISO8601DateByStr2(request.getHappenTime()));
record.setTimeInfo(Utils.Date.getStart(record.getCreateDate()));
record.setType(Constants.ONE);//浜哄憳
- record.setMemberType(Constants.ZERO);//榛樿涓烘湭鐭ヤ汉鍛橈紙璁垮锛�
+ record.setMemberType(Constants.RetentionMemberType.fk);//榛樿涓烘湭鐭ヤ汉鍛橈紙璁垮锛�
record.setIsdeleted(Constants.ZERO);
- record.setInOrOut(Constants.ZERO);
record.setHkEventId(request.getEventId());
record.setHkId(userNo);
if(d!=null && Constants.equalsInteger(d.getIsEntrance(),Constants.ONE)){
if(Constants.formatIntegerNum(request.getData().getExtEventInOut()) != Constants.ONE){
//濡傛灉鏄繘闂紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
+ record.setInOrOut(Constants.ZERO);
inoutDayCount.setInMemberNum(Constants.formatIntegerNum(inoutDayCount.getInMemberNum())+1);//鍏ュ満浜烘
}else{
//濡傛灉鏄嚭闂�
@@ -255,10 +255,11 @@
}
}
if(member !=null){
+ record.setMemberId(member.getId());
record.setMemberName(member.getName());
+ record.setMemberPhone(member.getPhone());
record.setObjId(member.getId());
record.setObjType(Constants.ONE);
- record.setMemberPhone(member.getPhone());
record.setCompanyId(member.getCompanyId());
record.setCompanyName(member.getCompanyNamePath());
if(d!=null && Constants.equalsInteger(d.getIsEntrance(),Constants.ONE)){
@@ -267,16 +268,18 @@
//濡傛灉鏄繘闂紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
retentionList.add(getRetentionModelByRequest(member,request));
if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
- record.setMemberType(Constants.ONE);
+ record.setMemberType(Constants.RetentionMemberType.internalMember);
inoutDayCount.setInSelfMemberNum(Constants.formatIntegerNum(inoutDayCount.getInSelfMemberNum())+1);//鍐呴儴浜哄憳鍏ュ満浜烘
}else{
- record.setMemberType(Constants.TWO);
+ record.setMemberType(Constants.RetentionMemberType.relMember);
inoutDayCount.setInOtherMemberNum(Constants.formatIntegerNum(inoutDayCount.getInOtherMemberNum())+1);//鐩稿叧鏂瑰叆鍦轰汉娆�
}
}else{
if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
+ record.setMemberType(Constants.RetentionMemberType.internalMember);
inoutDayCount.setOutSelfMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutSelfMemberNum())+1);//鍐呴儴浜哄憳鍑哄満浜烘
}else{
+ record.setMemberType(Constants.RetentionMemberType.relMember);
inoutDayCount.setOutOtherMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutOtherMemberNum())+1);//鐩稿叧鏂瑰嚭鍦轰汉娆�
}
}
@@ -569,6 +572,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 +931,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());
@@ -938,7 +943,7 @@
carrecord.setCategoryName(carModel.getCateName());
carrecord.setCategoryParentId(carModel.getCatePId());
carrecord.setCategoryParentName(carModel.getCatePName());
- carrecord.setMemberType( Constants.RetentionMemberType.car);//鍙槸杞﹁締鐨勮褰�
+ carrecord.setType( Constants.RetentionMemberType.car);//鍙槸杞﹁締鐨勮褰�
if(carModel.getMemberId()!=null){
if(Constants.equalsInteger(carModel.getCompanyType(),Constants.ONE)){
//鍐呴儴缁勭粐
@@ -976,7 +981,7 @@
carrecord.setObjType(Constants.FOUR);
carrecord.setCompanyId(carTypeJob.getCompanyId());
carrecord.setCompanyName(carTypeJob.getCompanyNamePath());
- carrecord.setMemberType(Constants.RetentionMemberType.car);
+ carrecord.setType(Constants.RetentionMemberType.car);
if(carModel.getMemberPhone()!=null || StringUtils.isNotBlank(carModel.getMemberName())){
//璐ц繍鍙告満(濡傛灉鍙告満鎵嬫満鍙锋垨鑰呭鍚嶄笉涓虹┖锛�
carrecord.setMemberType(Constants.RetentionMemberType.driver);
@@ -1056,17 +1061,17 @@
copyObj.setMemberName(v.getName());
copyObj.setMemberPhone(v.getPhone());
copyObj.setCompanyName(v.getCompanyName());
- copyObj.setMemberType(Constants.ZERO);
+ copyObj.setType(Constants.ONE);
copyObj.setRemark(carrecord.getCarCode());
copyObj.setCarCode(index>=0?null:carrecord.getCarCode());
copyObj.setMemberType(Constants.RetentionMemberType.fk);
inoutRecordList.add(copyObj);
index++;
if(Constants.equalsInteger(carrecord.getInOrOut(),Constants.ONE)){
- //濡傛灉鏄溅杈嗗嚭鍥尯锛岃瀹㈢敵璇疯嚜鍔ㄧ绂�
- //缁熻璁垮杩涘叆鏁�
+ //濡傛灉鏄溅杈嗗嚭鍥尯 缁熻璁垮杩涘叆鏁�
inoutDayCount.setOutVisitorNum(Constants.formatIntegerNum(inoutDayCount.getOutVisitorNum())+1);
try {
+ //璁垮鐢宠鑷姩绛剧
visitsService.visitLevelForCarOut(v);
//缁熻绛剧鏁�
inoutDayCount.setLeaveVisitorNum(Constants.formatIntegerNum(inoutDayCount.getLeaveVisitorNum())+1);
@@ -1122,7 +1127,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