From 148396317ffe21457a68fb551b46d005054a180e Mon Sep 17 00:00:00 2001 From: gaoshuguang Date: Tue, 16 Jul 2024 15:43:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E7=9C=81=E5=AF=B9=E8=B4=A6901-925?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0DATEMARK=E5=AD=97=E6=AE=B5=E5=86=99=E5=85=A5?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nm/gsgl/entity/business/db/rec/DisputeExprov.java | 2 ++ .../gsgl/entity/business/db/rec/DisputePassprov.java | 3 ++- .../nm/gsgl/entity/business/db/rec/NoSplitS2Down.java | 10 ++++++++++ .../gsgl/entity/business/db/rec/NooutportResult.java | 2 ++ .../gsgl/entity/business/db/rec/NooutportS2Down.java | 8 ++++++++ .../nm/gsgl/entity/business/db/rec/NosplitResult.java | 6 ++++++ .../nm/gsgl/entity/business/db/rec/OvertimeExprov.java | 3 ++- .../gsgl/entity/business/db/rec/OvertimePassprov.java | 3 +++ .../com/nm/gsgl/service/impl/CreateDbServiceImpl.java | 9 +++++++++ 9 files changed, 44 insertions(+), 2 deletions(-) diff --git a/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/DisputeExprov.java b/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/DisputeExprov.java index 0cbd7447..c96c6f15 100644 --- a/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/DisputeExprov.java +++ b/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/DisputeExprov.java @@ -165,5 +165,7 @@ public class DisputeExprov { */ @TableField("BASICFILENAME") private String basicFilename; + @TableField(value = "DATEMARK", jdbcType = JdbcType.DATE, update = "to_date(#{DATEMARK},'yyyy-mm-dd hh24:mi:ss')") + private String dateMark; } diff --git a/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/DisputePassprov.java b/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/DisputePassprov.java index 745ed39e..429a659f 100644 --- a/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/DisputePassprov.java +++ b/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/DisputePassprov.java @@ -155,5 +155,6 @@ public class DisputePassprov { */ @TableField("BASICFILENAME") private String basicFilename; - + @TableField(value = "DATEMARK", jdbcType = JdbcType.DATE, update = "to_date(#{DATEMARK},'yyyy-mm-dd hh24:mi:ss')") + private String dateMark; } diff --git a/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/NoSplitS2Down.java b/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/NoSplitS2Down.java index 8137888b..709f6499 100644 --- a/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/NoSplitS2Down.java +++ b/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/NoSplitS2Down.java @@ -75,4 +75,14 @@ public class NoSplitS2Down { */ @TableField("BASICFILENAME") private String basicFilename; + + @TableField(value = "PROVENTIME",jdbcType = JdbcType.DATE,update = "to_date(#{PROVENTIME},'yyyy-mm-dd')") + private String provEnTime; + @TableField(value = "PROVEXTIME",jdbcType = JdbcType.DATE,update = "to_date(#{PROVEXTIME},'yyyy-mm-dd hh24:mi:ss')") + private String provExTime; + + @TableField(value = "DATEMARK", jdbcType = JdbcType.DATE, update = "to_date(#{DATEMARK},'yyyy-mm-dd hh24:mi:ss')") + private String dateMark; + @TableField("RESULT") + private Integer result; } diff --git a/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/NooutportResult.java b/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/NooutportResult.java index 51686a33..6a75fe2b 100644 --- a/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/NooutportResult.java +++ b/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/NooutportResult.java @@ -162,4 +162,6 @@ public class NooutportResult { private String basicFilename; @TableField(value = "DATEMARK", jdbcType = JdbcType.DATE, update = "to_date(#{DATEMARK},'yyyy-mm-dd hh24:mi:ss')") private String dateMark; + @TableField("ARBITRATEOPINION") + private String arbitrateOpinion; } diff --git a/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/NooutportS2Down.java b/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/NooutportS2Down.java index db4560c2..be5f4e0b 100644 --- a/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/NooutportS2Down.java +++ b/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/NooutportS2Down.java @@ -130,4 +130,12 @@ public class NooutportS2Down { */ @TableField("BASICFILENAME") private String basicFilename; + @TableField(value = "DATEMARK", jdbcType = JdbcType.DATE, update = "to_date(#{DATEMARK},'yyyy-mm-dd hh24:mi:ss')") + private String dateMark; + + @TableField("RESULT") + private Integer result; + + + } diff --git a/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/NosplitResult.java b/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/NosplitResult.java index 65bd22cb..96d4e3af 100644 --- a/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/NosplitResult.java +++ b/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/NosplitResult.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import org.apache.ibatis.type.JdbcType; +import java.util.Date; + /** * @author: shuguang * @date: 2023年02月08日 17:22 @@ -85,4 +87,8 @@ public class NosplitResult { */ @TableField("BASICFILENAME") private String basicFilename; + @TableField(value = "DATEMARK", jdbcType = JdbcType.DATE, update = "to_date(#{DATEMARK},'yyyy-mm-dd hh24:mi:ss')") + private String dateMark; + @TableField("ARBITRATEOPINION") + private String arbitrateOpinion; } diff --git a/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/OvertimeExprov.java b/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/OvertimeExprov.java index 71a6dbfe..b0cf6c8e 100644 --- a/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/OvertimeExprov.java +++ b/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/OvertimeExprov.java @@ -155,5 +155,6 @@ public class OvertimeExprov { */ @TableField("BASICFILENAME") private String basicFilename; - + @TableField(value = "DATEMARK", jdbcType = JdbcType.DATE, update = "to_date(#{DATEMARK},'yyyy-mm-dd hh24:mi:ss')") + private String dateMark; } diff --git a/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/OvertimePassprov.java b/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/OvertimePassprov.java index 703d8a84..62aecf1d 100644 --- a/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/OvertimePassprov.java +++ b/ParamDownload/src/main/java/com/nm/gsgl/entity/business/db/rec/OvertimePassprov.java @@ -155,5 +155,8 @@ public class OvertimePassprov { */ @TableField("BASICFILENAME") private String basicFilename; + @TableField(value = "DATEMARK", jdbcType = JdbcType.DATE, update = "to_date(#{DATEMARK},'yyyy-mm-dd hh24:mi:ss')") + private String dateMark; + } diff --git a/ParamDownload/src/main/java/com/nm/gsgl/service/impl/CreateDbServiceImpl.java b/ParamDownload/src/main/java/com/nm/gsgl/service/impl/CreateDbServiceImpl.java index c8ee3f27..3ebe0cc5 100644 --- a/ParamDownload/src/main/java/com/nm/gsgl/service/impl/CreateDbServiceImpl.java +++ b/ParamDownload/src/main/java/com/nm/gsgl/service/impl/CreateDbServiceImpl.java @@ -785,6 +785,7 @@ public class CreateDbServiceImpl implements CreateDbService { obj.setStartTime(StringUtils.isNotBlank(obj.getStartTime()) ? obj.getStartTime().replace(Constant.STR_T, Constant.STR_SPACE) : null); obj.setEndTime(StringUtils.isNotBlank(obj.getEndTime()) ? obj.getEndTime().replace(Constant.STR_T, Constant.STR_SPACE) : null); obj.setBasicFilename(fileName); + obj.setDateMark(DateTimeUtil.getFormateString(new Date(), Constant.YYYY_MM_DD_HH_MM_SS)); nosplitResultMapper.insert(obj); count++; //} else { @@ -972,6 +973,7 @@ public class CreateDbServiceImpl implements CreateDbService { obj.setExTime(StringUtils.isNotBlank(obj.getExTime()) ? obj.getExTime().replace(Constant.STR_T, Constant.STR_SPACE) : null); obj.setFinalDealTime(StringUtils.isNotBlank(obj.getFinalDealTime()) ? obj.getFinalDealTime().replace(Constant.STR_T, Constant.STR_SPACE) : null); obj.setBasicFilename(fileName); + obj.setDateMark(DateTimeUtil.getFormateString(new Date(), Constant.YYYY_MM_DD_HH_MM_SS)); disputeExprovMapper.insert(obj); count++; //} else { @@ -1010,6 +1012,7 @@ public class CreateDbServiceImpl implements CreateDbService { obj.setExInsertTime(StringUtils.isNotBlank(obj.getExInsertTime()) ? obj.getExInsertTime().replace(Constant.STR_T, Constant.STR_SPACE) : null); obj.setExTime(StringUtils.isNotBlank(obj.getExTime()) ? obj.getExTime().replace(Constant.STR_T, Constant.STR_SPACE) : null); obj.setBasicFilename(fileName); + obj.setDateMark(DateTimeUtil.getFormateString(new Date(), Constant.YYYY_MM_DD_HH_MM_SS)); overtimeExprovMapper.insert(obj); count++; //} else { @@ -1046,7 +1049,10 @@ public class CreateDbServiceImpl implements CreateDbService { boolean exists = noSplitS2DownMapper.exists(queryWrapper); if (!exists) { obj.setStartTime(StringUtils.isNotBlank(obj.getStartTime()) ? obj.getStartTime().replace(Constant.STR_T, Constant.STR_SPACE) : null); + obj.setProvEnTime(StringUtils.isNotBlank(obj.getProvEnTime()) ? obj.getProvEnTime().replace(Constant.STR_T, Constant.STR_SPACE) : null); + obj.setProvExTime(StringUtils.isNotBlank(obj.getProvExTime()) ? obj.getProvExTime().replace(Constant.STR_T, Constant.STR_SPACE) : null); obj.setBasicFilename(fileName); + obj.setDateMark(DateTimeUtil.getFormateString(new Date(), Constant.YYYY_MM_DD_HH_MM_SS)); noSplitS2DownMapper.insert(obj); count++; //} else { @@ -1115,6 +1121,7 @@ public class CreateDbServiceImpl implements CreateDbService { obj.setUpdateTime(StringUtils.isNotBlank(obj.getUpdateTime()) ? obj.getUpdateTime().replace(Constant.STR_T, Constant.STR_SPACE) : null); obj.setProvExTime(StringUtils.isNotBlank(obj.getProvExTime()) ? obj.getProvExTime().replace(Constant.STR_T, Constant.STR_SPACE) : null); obj.setBasicFilename(fileName); + obj.setDateMark(DateTimeUtil.getFormateString(new Date(), Constant.YYYY_MM_DD_HH_MM_SS)); nooutportS2DownMapper.insert(obj); count++; } @@ -1150,6 +1157,7 @@ public class CreateDbServiceImpl implements CreateDbService { obj.setExInsertTime(StringUtils.isNotBlank(obj.getExInsertTime()) ? obj.getExInsertTime().replace(Constant.STR_T, Constant.STR_SPACE) : null); obj.setExTime(StringUtils.isNotBlank(obj.getExTime()) ? obj.getExTime().replace(Constant.STR_T, Constant.STR_SPACE) : null); obj.setBasicFilename(fileName); + obj.setDateMark(DateTimeUtil.getFormateString(new Date(), Constant.YYYY_MM_DD_HH_MM_SS)); disputePassprovMapper.insert(obj); count++; //} else { @@ -1188,6 +1196,7 @@ public class CreateDbServiceImpl implements CreateDbService { obj.setExInsertTime(StringUtils.isNotBlank(obj.getExInsertTime()) ? obj.getExInsertTime().replace(Constant.STR_T, Constant.STR_SPACE) : null); obj.setExTime(StringUtils.isNotBlank(obj.getExTime()) ? obj.getExTime().replace(Constant.STR_T, Constant.STR_SPACE) : null); obj.setBasicFilename(fileName); + obj.setDateMark(DateTimeUtil.getFormateString(new Date(), Constant.YYYY_MM_DD_HH_MM_SS)); overtimePassprovMapper.insert(obj); count++; //} else {