From 7cdea6d16a8b9f74800792ea412ad8b51c4df7f4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 十月 2024 17:48:38 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 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 ebad326..23383bc 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
@@ -519,7 +519,8 @@
     private Retention getRetentionModelByVisitRequest(Visits visits, String happentTime,String srcType) {
         Retention retention = new Retention();
         retention.setIsdeleted(Constants.ZERO);
-        retention.setCreateDate(DateUtil.getISO8601DateByStr(happentTime));
+        retention.setCreateDate(DateUtil.getISO8601DateByStr2(happentTime));
+        retention.setCreateDate(retention.getCreateDate() == null?new Date():retention.getCreateDate());
         retention.setClasses(visits.getClasses());
         retention.setCode(visits.getCode());
         retention.setIdcardNo(visits.getIdcardNo());
@@ -561,7 +562,8 @@
         event.setStartTime(request.getData().getVisitorInvoices().getBeginTime());
         event.setSrcType(request.getSrcType());
         event.setSrcParentIndex(request.getSrcParentIndex());
-        event.setSrcName(request.getSrcName());
+        event.setSrcName((request.getData()!=null &&request.getData().getParamValues()!=null)?
+                request.getData().getParamValues().getSrcName():request.getSrcName());
         event.setSrcIndex(request.getSrcIndex());
         event.setSex(detail.getSex());
         event.setPurpose(request.getData().getVisitorInvoices().getVisitReason());

--
Gitblit v1.9.3