diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.java index 15d58981..456cc70b 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.java @@ -392,4 +392,13 @@ public class TocofsSaleoutDetailedEntity extends BaseEntity { */ private String tradesuccessat; + /** + * 明细行交易成功时间开始 + */ + private String tradeSuccessAt_start; + + /** + * 明细行交易成功时间结束 + */ + private String tradeSuccessAt_end; } \ No newline at end of file diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.xml index f5eee2ef..b72ae001 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.xml +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.xml @@ -293,6 +293,9 @@ and businessDate <= #{businessDateEnd} and successfulTradeDate >= #{successfultradedateStart} and successfulTradeDate <= #{successfultradedateEnd} + + and tradeSuccessAt >= #{tradeSuccessAt_start} + and tradeSuccessAt <= #{tradeSuccessAt_end} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java index da6dc4a8..c6cc1e85 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java @@ -459,14 +459,14 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { //1:中台->u8c TocofsSaleoutDetailedEntity tocofsSaleoutDetailedEntity = new TocofsSaleoutDetailedEntity(); if (startTime.length() == 19) { - tocofsSaleoutDetailedEntity.setSuccessfultradedateStart(startTime); + tocofsSaleoutDetailedEntity.setTradeSuccessAt_start(startTime); } else { - tocofsSaleoutDetailedEntity.setSuccessfultradedateStart(startTime + " 00:00:00"); + tocofsSaleoutDetailedEntity.setTradeSuccessAt_end(startTime + " 00:00:00"); } if (endTime.length() == 19) { - tocofsSaleoutDetailedEntity.setSuccessfultradedateEnd(endTime); + tocofsSaleoutDetailedEntity.setTradeSuccessAt_start(endTime); } else { - tocofsSaleoutDetailedEntity.setSuccessfultradedateEnd(endTime + " 23:59:59"); + tocofsSaleoutDetailedEntity.setTradeSuccessAt_end(endTime + " 23:59:59"); } tocofsSaleoutDetailedEntity.setBusinesstype("TOC_ORDER"); headerDetailsDtoList = queryTocOfsSaleoutDetailed(tocofsSaleoutDetailedEntity); diff --git a/service/src/main/java/com/hzya/frame/report/lets/dto/TobofsSaleoutDetailedDto.java b/service/src/main/java/com/hzya/frame/report/lets/dto/TobofsSaleoutDetailedDto.java index 0dd233f2..c6b35733 100644 --- a/service/src/main/java/com/hzya/frame/report/lets/dto/TobofsSaleoutDetailedDto.java +++ b/service/src/main/java/com/hzya/frame/report/lets/dto/TobofsSaleoutDetailedDto.java @@ -67,8 +67,10 @@ public class TobofsSaleoutDetailedDto { //库存 结束 //TOB交易红 开始 +// @ExcelProperty(value = "交易-O交易成功时间") +// private String successfulTradeDate; @ExcelProperty(value = "交易-O交易成功时间") - private String successfulTradeDate; + private String tradeSuccessAt; @ExcelProperty(value = "交易-推送状态") private String newstate4; diff --git a/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml b/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml index 060efa64..a95af29f 100644 --- a/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml +++ b/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml @@ -398,10 +398,10 @@ and a.businessDate <= #{businessdate_end} - and a.successfulTradeDate >= #{successfultradedate_start} + and a.tradeSuccessAt >= #{successfultradedate_start} - and a.successfulTradeDate <= #{successfultradedate_end} + and a.tradeSuccessAt <= #{successfultradedate_end} and b.code = #{headCode} @@ -474,6 +474,7 @@ + @@ -749,6 +750,7 @@ ,a.newSystemPrimary4 ,a.businessDate ,a.successfulTradeDate + ,a.tradeSuccessAt ,a.businessType ,a.def1 ,a.def2 @@ -903,10 +905,10 @@ and a.businessDate <= #{businessdate_end} - and a.successfulTradeDate >= #{successfultradedate_start} + and a.tradeSuccessAt >= #{successfultradedate_start} - and a.successfulTradeDate <= #{successfultradedate_end} + and a.tradeSuccessAt <= #{successfultradedate_end} and b.code = #{headCode} @@ -1126,10 +1128,10 @@ and businessDate <= #{businessdate_end} - and successfulTradeDate >= #{successfultradedate_start} + and tradeSuccessAt >= #{successfultradedate_start} - and successfultradedate_end <= #{successfultradedate_end} + and tradeSuccessAt <= #{successfultradedate_end} -- and sts='Y'