From 1aa8b8d4e4474374282d2fdc2991dd22f32fbae7 Mon Sep 17 00:00:00 2001 From: "weicw1996@qq.com" Date: Wed, 9 Sep 2026 17:04:41 +0800 Subject: [PATCH] =?UTF-8?q?fix(hjc):=20=E5=85=A5=E5=90=91=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E8=A1=A5=E5=86=99=E5=8F=91=E5=B8=83=E6=97=B6=E9=97=B4?= =?UTF-8?q?/=E6=8A=95=E6=A0=87=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4?= =?UTF-8?q?=EF=BC=88=E6=97=A0=E6=98=BE=E5=BC=8F=E5=AD=97=E6=AE=B5=E6=97=B6?= =?UTF-8?q?=E5=8F=96=E5=BC=80=E5=94=AE/=E6=88=AA=E6=AD=A2=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=85=9C=E5=BA=95=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - HjcOneStopProjectPush 新增可选 publishTime/deadlineTime - upsertFromPush: publishTime=显式publishTime||tenderOnsaleTime, deadlineTime=显式deadlineTime||tenderOffsaleTime --- .../java/com/gxwebsoft/hjc/dto/HjcOneStopProjectPush.java | 6 ++++++ .../com/gxwebsoft/hjc/service/impl/HjcBizServiceImpl.java | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/src/main/java/com/gxwebsoft/hjc/dto/HjcOneStopProjectPush.java b/src/main/java/com/gxwebsoft/hjc/dto/HjcOneStopProjectPush.java index 291c937..bfb656c 100644 --- a/src/main/java/com/gxwebsoft/hjc/dto/HjcOneStopProjectPush.java +++ b/src/main/java/com/gxwebsoft/hjc/dto/HjcOneStopProjectPush.java @@ -38,6 +38,12 @@ public class HjcOneStopProjectPush { @Schema(description = "截止时间/停售时间，yyyy-MM-dd HH:mm:ss") private String tenderOffsaleTime; + @Schema(description = "发布时间（可选，未传则取开售时间 tenderOnsaleTime 兜底）") + private String publishTime; + + @Schema(description = "投标截止时间（可选，未传则取截止时间 tenderOffsaleTime 兜底）") + private String deadlineTime; + @Schema(description = "公告标题") private String bulletinName; diff --git a/src/main/java/com/gxwebsoft/hjc/service/impl/HjcBizServiceImpl.java b/src/main/java/com/gxwebsoft/hjc/service/impl/HjcBizServiceImpl.java index 42437b3..250dfe9 100644 --- a/src/main/java/com/gxwebsoft/hjc/service/impl/HjcBizServiceImpl.java +++ b/src/main/java/com/gxwebsoft/hjc/service/impl/HjcBizServiceImpl.java @@ -82,6 +82,9 @@ public class HjcBizServiceImpl implements HjcBizService { project.setTenderFile(push.getFiles()); project.setOnsaleTime(parseDateTime(push.getTenderOnsaleTime())); project.setOffsaleTime(parseDateTime(push.getTenderOffsaleTime())); + // 发布时间/投标截止：一站式推送未单独下发时取「开售时间/截止时间」兜底；显式下发则优先 + project.setPublishTime(parseDateTime(firstNonBlank(push.getPublishTime(), push.getTenderOnsaleTime()))); + project.setDeadlineTime(parseDateTime(firstNonBlank(push.getDeadlineTime(), push.getTenderOffsaleTime()))); project.setSellingMethod(push.getSellingMethod()); project.setNeedSell(push.getNeedSellTender()); project.setDataSource("PUSH"); @@ -248,6 +251,10 @@ public class HjcBizServiceImpl implements HjcBizService { } } + private String firstNonBlank(String a, String b) { + return StrUtil.isNotBlank(a) ? a : b; + } + private String limitStr(String s, int max) { if (s == null) { return null;