From 476cd8d1cb410f90d1a6fcafbf84f1bf7d9da403 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 07 五月 2025 09:34:32 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 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..77df037 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()); @@ -1063,10 +1066,10 @@ 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 +1125,9 @@ inoutDayCount.setOutMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutMemberNum())+1); } } - inoutRecordList.add(carrecord);//褰曞叆杞﹁締浠ュ強鎼哄甫浜哄憳鐨勫叆鍥槑缁嗚褰曪紙闈炶瀹級 + if(carrecord.getInOrOut() !=null) {//濡傛灉鏄嚭鍏ヨ褰� + inoutRecordList.add(carrecord);//褰曞叆杞﹁締浠ュ強鎼哄甫浜哄憳鐨勫叆鍥槑缁嗚褰曪紙闈炶瀹級 + } } private Category findCategoryByBizType(Integer carType,String tempname, String pName,List<Category> categoryList) { -- Gitblit v1.9.3