refactor(hjc): 发布时间/投标截止与开售/截止同义,仅保留 tenderOnsaleTime/tenderOffsaleTime 映射入库
- 撤销 HjcOneStopProjectPush 新增的 publishTime/deadlineTime 字段 - upsert 时 publishTime=tenderOnsaleTime, deadlineTime=tenderOffsaleTime(同一语义直接映射)
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user