From c5e74d326253105b77df2221a840be5c03e0fdf8 Mon Sep 17 00:00:00 2001 From: mmm8955405 Date: Tue, 5 Mar 2024 16:06:22 +0800 Subject: [PATCH] xxxx --- .../controller/ContractInfoController.java | 93 ++++++++++--------- .../ContractInfoManageController.java | 46 ++++----- .../ContractInfoScribeController.java | 47 +++++----- 3 files changed, 97 insertions(+), 89 deletions(-) diff --git a/src/main/java/jj/tech/finance/biz/web/controller/ContractInfoController.java b/src/main/java/jj/tech/finance/biz/web/controller/ContractInfoController.java index 96f3a5c..bd9b8e7 100644 --- a/src/main/java/jj/tech/finance/biz/web/controller/ContractInfoController.java +++ b/src/main/java/jj/tech/finance/biz/web/controller/ContractInfoController.java @@ -160,30 +160,31 @@ public class ContractInfoController { .map(ContractInfoStatuScribeStore::getTs_code) .collect(Collectors.toList()); - var f = - selectDistinct(FutDailyDynamicSqlSupport.futDaily.allColumns()) - .from(FutDailyDynamicSqlSupport.futDaily) - .where(FutDailyDynamicSqlSupport.ts_code,SqlBuilder.isIn(ids)) - .orderBy(FutDailyDynamicSqlSupport.trade_date.descending()) - ; - var s = select(FutDailyDynamicSqlSupport.futDaily.allColumns()) - .from(f,"f") - .groupBy(FutDailyDynamicSqlSupport.ts_code.qualifiedWith("f")) - .build() - .render(RenderingStrategies.MYBATIS3); - - - List futs = - futDailyMapper.selectMany(s); - - list.forEach(i->{ - futs.forEach(d->{ - if(i.getTs_code().equals(d.getTs_code())) { - i.setFutDaily(d); - return; - } + if(!ids.isEmpty()) { + var f = + selectDistinct(FutDailyDynamicSqlSupport.futDaily.allColumns()) + .from(FutDailyDynamicSqlSupport.futDaily) + .where(FutDailyDynamicSqlSupport.ts_code,SqlBuilder.isIn(ids).filter(StringUtils::isNoneBlank)) + .orderBy(FutDailyDynamicSqlSupport.trade_date.descending()) + ; + var s = select(FutDailyDynamicSqlSupport.futDaily.allColumns()) + .from(f,"f") + .groupBy(FutDailyDynamicSqlSupport.ts_code.qualifiedWith("f")) + .build() + .render(RenderingStrategies.MYBATIS3); + + + List futs = + futDailyMapper.selectMany(s); + + list.forEach(i->{ + futs.forEach(d->{ + if(i.getTs_code().equals(d.getTs_code())) { + i.setFutDaily(d); + } + }); }); - }); + } //------ @@ -441,29 +442,31 @@ public class ContractInfoController { .map(ContractInfoStatuScribeStore::getTs_code) .collect(Collectors.toList()); - var f = - selectDistinct(FutDailyDynamicSqlSupport.futDaily.allColumns()) - .from(FutDailyDynamicSqlSupport.futDaily) - .where(FutDailyDynamicSqlSupport.ts_code,SqlBuilder.isIn(ids)) - .orderBy(FutDailyDynamicSqlSupport.trade_date.descending()) - ; - var s = select(FutDailyDynamicSqlSupport.futDaily.allColumns()) - .from(f,"f") - .groupBy(FutDailyDynamicSqlSupport.ts_code.qualifiedWith("f")) - .build() - .render(RenderingStrategies.MYBATIS3); - - - List futs = - futDailyMapper.selectMany(s); - - list.forEach(i->{ - futs.forEach(d->{ - if(i.getTs_code().equals(d.getTs_code())) { - i.setFutDaily(d); - } + if(!ids.isEmpty()) { + var f = + selectDistinct(FutDailyDynamicSqlSupport.futDaily.allColumns()) + .from(FutDailyDynamicSqlSupport.futDaily) + .where(FutDailyDynamicSqlSupport.ts_code,SqlBuilder.isIn(ids).filter(StringUtils::isNoneBlank)) + .orderBy(FutDailyDynamicSqlSupport.trade_date.descending()) + ; + var s = select(FutDailyDynamicSqlSupport.futDaily.allColumns()) + .from(f,"f") + .groupBy(FutDailyDynamicSqlSupport.ts_code.qualifiedWith("f")) + .build() + .render(RenderingStrategies.MYBATIS3); + + + List futs = + futDailyMapper.selectMany(s); + + list.forEach(i->{ + futs.forEach(d->{ + if(i.getTs_code().equals(d.getTs_code())) { + i.setFutDaily(d); + } + }); }); - }); + } //------ diff --git a/src/main/java/jj/tech/finance/biz/webadmin/controller/ContractInfoManageController.java b/src/main/java/jj/tech/finance/biz/webadmin/controller/ContractInfoManageController.java index 0139478..be24adf 100644 --- a/src/main/java/jj/tech/finance/biz/webadmin/controller/ContractInfoManageController.java +++ b/src/main/java/jj/tech/finance/biz/webadmin/controller/ContractInfoManageController.java @@ -137,29 +137,31 @@ public class ContractInfoManageController { .map(ContractInfoStatuScribe::getTs_code) .collect(Collectors.toList()); - var f = - selectDistinct(FutDailyDynamicSqlSupport.futDaily.allColumns()) - .from(FutDailyDynamicSqlSupport.futDaily) - .where(FutDailyDynamicSqlSupport.ts_code,SqlBuilder.isIn(ids)) - .orderBy(FutDailyDynamicSqlSupport.trade_date.descending()) - ; - var s = select(FutDailyDynamicSqlSupport.futDaily.allColumns()) - .from(f,"f") - .groupBy(FutDailyDynamicSqlSupport.ts_code.qualifiedWith("f")) - .build() - .render(RenderingStrategies.MYBATIS3); - - - List futs = - futDailyMapper.selectMany(s); - - list.forEach(i->{ - futs.forEach(d->{ - if(i.getTs_code().equals(d.getTs_code())) { - i.setFutDaily(d); - } + if(!ids.isEmpty()) { + var f = + selectDistinct(FutDailyDynamicSqlSupport.futDaily.allColumns()) + .from(FutDailyDynamicSqlSupport.futDaily) + .where(FutDailyDynamicSqlSupport.ts_code,SqlBuilder.isIn(ids).filter(StringUtils::isNoneBlank)) + .orderBy(FutDailyDynamicSqlSupport.trade_date.descending()) + ; + var s = select(FutDailyDynamicSqlSupport.futDaily.allColumns()) + .from(f,"f") + .groupBy(FutDailyDynamicSqlSupport.ts_code.qualifiedWith("f")) + .build() + .render(RenderingStrategies.MYBATIS3); + + + List futs = + futDailyMapper.selectMany(s); + + list.forEach(i->{ + futs.forEach(d->{ + if(i.getTs_code().equals(d.getTs_code())) { + i.setFutDaily(d); + } + }); }); - }); + } //------ diff --git a/src/main/java/jj/tech/finance/biz/webadmin/controller/ContractInfoScribeController.java b/src/main/java/jj/tech/finance/biz/webadmin/controller/ContractInfoScribeController.java index 55fffe0..4d098f3 100644 --- a/src/main/java/jj/tech/finance/biz/webadmin/controller/ContractInfoScribeController.java +++ b/src/main/java/jj/tech/finance/biz/webadmin/controller/ContractInfoScribeController.java @@ -37,6 +37,7 @@ import jakarta.validation.Valid; import jj.tech.finance.biz.web.dao.ContractInfoSelectMapper; import jj.tech.finance.biz.webadmin.dao.SelectMapper; import jj.tech.finance.biz.webadmin.vo.ContractInfoStatuScribe; +import jj.tech.finance.biz.webadmin.vo.ContractInfoStatuScribeStore; import jj.tech.finance.biz.webadmin.vo.ScribeVo; import jj.tech.finance.biz.webadmin.vo.parm.Contract; import jj.tech.finance.biz.webadmin.vo.parm.Id; @@ -142,29 +143,31 @@ public class ContractInfoScribeController { .map(ContractInfoStatuScribe::getTs_code) .collect(Collectors.toList()); - var f = - selectDistinct(FutDailyDynamicSqlSupport.futDaily.allColumns()) - .from(FutDailyDynamicSqlSupport.futDaily) - .where(FutDailyDynamicSqlSupport.ts_code,SqlBuilder.isIn(ids)) - .orderBy(FutDailyDynamicSqlSupport.trade_date.descending()) - ; - var s = select(FutDailyDynamicSqlSupport.futDaily.allColumns()) - .from(f,"f") - .groupBy(FutDailyDynamicSqlSupport.ts_code.qualifiedWith("f")) - .build() - .render(RenderingStrategies.MYBATIS3); - - - List futs = - futDailyMapper.selectMany(s); - - list.forEach(i->{ - futs.forEach(d->{ - if(i.getTs_code().equals(d.getTs_code())) { - i.setFutDaily(d); - } + if(!ids.isEmpty()) { + var f = + selectDistinct(FutDailyDynamicSqlSupport.futDaily.allColumns()) + .from(FutDailyDynamicSqlSupport.futDaily) + .where(FutDailyDynamicSqlSupport.ts_code,SqlBuilder.isIn(ids).filter(StringUtils::isNoneBlank)) + .orderBy(FutDailyDynamicSqlSupport.trade_date.descending()) + ; + var s = select(FutDailyDynamicSqlSupport.futDaily.allColumns()) + .from(f,"f") + .groupBy(FutDailyDynamicSqlSupport.ts_code.qualifiedWith("f")) + .build() + .render(RenderingStrategies.MYBATIS3); + + + List futs = + futDailyMapper.selectMany(s); + + list.forEach(i->{ + futs.forEach(d->{ + if(i.getTs_code().equals(d.getTs_code())) { + i.setFutDaily(d); + } + }); }); - }); + } //------