From e3313142ed3d8661fcf54cc2ef3a2fb17fde9290 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 30 May 2022 13:34:53 +0800 Subject: [PATCH] =?UTF-8?q?people-=E5=90=8C=E6=AD=A5=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsCollectManifestEOServiceImpl.java | 2 +- .../com/jero/modules/system/entity/PPEmployee.java | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index cc2e8edd3..9ea023013 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -785,7 +785,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl list = list(queryWrapper); int collectFinishNumber = (int) list.stream().filter(e->CollectManifestStateEnum.SYNC_REPORT.getValue().equals(e.getState())).count(); - if (collectFinishNumber == list.size()) { + if (collectFinishNumber == list.size() && list.size() > 0) { map.put("finish", true); map.put("time", list.get(0).getUpdateTime()); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java index 54538a10a..0890cb30b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java @@ -73,4 +73,17 @@ public class PPEmployee { private String phone_device_type; // Mobile/Landline private String formatted_phone_number; + public void setCreation_time(Date creation_time) { + long timeStamp = creation_time.getTime(); + long longTimeStamp = new Long(timeStamp * 1000); // 精确到毫秒的时间戳 + Date time = new Date(longTimeStamp); + this.creation_time = time; + } + + public void setUpdate_time(Date update_time) { + long timeStamp = update_time.getTime(); + long longTimeStamp = new Long(timeStamp * 1000); // 精确到毫秒的时间戳 + Date time = new Date(longTimeStamp); + this.update_time = time; + } }