From 9d188d304b4ea73a3e80210a1eeb3a5f5f664fee Mon Sep 17 00:00:00 2001 From: "weicw1996@qq.com" Date: Wed, 9 Sep 2026 17:10:17 +0800 Subject: [PATCH] =?UTF-8?q?refactor(hjc):=20=E5=8F=91=E5=B8=83=E6=97=B6?= =?UTF-8?q?=E9=97=B4/=E6=8A=95=E6=A0=87=E6=88=AA=E6=AD=A2=E4=B8=8E?= =?UTF-8?q?=E5=BC=80=E5=94=AE/=E6=88=AA=E6=AD=A2=E5=90=8C=E4=B9=89?= =?UTF-8?q?=EF=BC=8C=E4=BB=85=E4=BF=9D=E7=95=99=20tenderOnsaleTime/tenderO?= =?UTF-8?q?ffsaleTime=20=E6=98=A0=E5=B0=84=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 撤销 HjcOneStopProjectPush 新增的 publishTime/deadlineTime 字段 - upsert 时 publishTime=tenderOnsaleTime, deadlineTime=tenderOffsaleTime（同一语义直接映射） --- .../com/gxwebsoft/hjc/dto/HjcOneStopProjectPush.java | 6 ------ .../gxwebsoft/hjc/service/impl/HjcBizServiceImpl.java | 10 +++------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/gxwebsoft/hjc/dto/HjcOneStopProjectPush.java b/src/main/java/com/gxwebsoft/hjc/dto/HjcOneStopProjectPush.java index bfb656c..291c937 100644 --- a/src/main/java/com/gxwebsoft/hjc/dto/HjcOneStopProjectPush.java +++ b/src/main/java/com/gxwebsoft/hjc/dto/HjcOneStopProjectPush.java @@ -38,12 +38,6 @@ 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 250dfe9..21a387a 100644 --- a/src/main/java/com/gxwebsoft/hjc/service/impl/HjcBizServiceImpl.java +++ b/src/main/java/com/gxwebsoft/hjc/service/impl/HjcBizServiceImpl.java @@ -82,9 +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.setPublishTime(parseDateTime(push.getTenderOnsaleTime())); + project.setDeadlineTime(parseDateTime(push.getTenderOffsaleTime())); project.setSellingMethod(push.getSellingMethod()); project.setNeedSell(push.getNeedSellTender()); project.setDataSource("PUSH"); @@ -251,10 +251,6 @@ 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;