jj/finance
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xxxx

Browse Source
This commit is contained in:
mmm8955405 2024-03-05 16:06:22 +08:00
parent a9e93f804e
commit c5e74d3262
3 changed files with 97 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/jj/tech/finance/biz/web/controller/ContractInfoController.java
View File

@ -160,10 +160,11 @@ public class ContractInfoController {
.map(ContractInfoStatuScribeStore::getTs_code) .map(ContractInfoStatuScribeStore::getTs_code)
.collect(Collectors.toList()); .collect(Collectors.toList());
if(!ids.isEmpty()) {
var f = var f =
selectDistinct(FutDailyDynamicSqlSupport.futDaily.allColumns()) selectDistinct(FutDailyDynamicSqlSupport.futDaily.allColumns())
.from(FutDailyDynamicSqlSupport.futDaily) .from(FutDailyDynamicSqlSupport.futDaily)
.where(FutDailyDynamicSqlSupport.ts_code,SqlBuilder.isIn(ids)) .where(FutDailyDynamicSqlSupport.ts_code,SqlBuilder.isIn(ids).filter(StringUtils::isNoneBlank))
.orderBy(FutDailyDynamicSqlSupport.trade_date.descending()) .orderBy(FutDailyDynamicSqlSupport.trade_date.descending())
; ;
var s = select(FutDailyDynamicSqlSupport.futDaily.allColumns()) var s = select(FutDailyDynamicSqlSupport.futDaily.allColumns())
@ -180,10 +181,10 @@ public class ContractInfoController {
futs.forEach(d->{ futs.forEach(d->{
if(i.getTs_code().equals(d.getTs_code())) { if(i.getTs_code().equals(d.getTs_code())) {
i.setFutDaily(d); i.setFutDaily(d);
return;
} }
}); });
}); });
}
//------ //------
@ -441,10 +442,11 @@ public class ContractInfoController {
.map(ContractInfoStatuScribeStore::getTs_code) .map(ContractInfoStatuScribeStore::getTs_code)
.collect(Collectors.toList()); .collect(Collectors.toList());
if(!ids.isEmpty()) {
var f = var f =
selectDistinct(FutDailyDynamicSqlSupport.futDaily.allColumns()) selectDistinct(FutDailyDynamicSqlSupport.futDaily.allColumns())
.from(FutDailyDynamicSqlSupport.futDaily) .from(FutDailyDynamicSqlSupport.futDaily)
.where(FutDailyDynamicSqlSupport.ts_code,SqlBuilder.isIn(ids)) .where(FutDailyDynamicSqlSupport.ts_code,SqlBuilder.isIn(ids).filter(StringUtils::isNoneBlank))
.orderBy(FutDailyDynamicSqlSupport.trade_date.descending()) .orderBy(FutDailyDynamicSqlSupport.trade_date.descending())
; ;
var s = select(FutDailyDynamicSqlSupport.futDaily.allColumns()) var s = select(FutDailyDynamicSqlSupport.futDaily.allColumns())
@ -464,6 +466,7 @@ public class ContractInfoController {
} }
}); });
}); });
}
//------ //------

4
src/main/java/jj/tech/finance/biz/webadmin/controller/ContractInfoManageController.java
View File

@ -137,10 +137,11 @@ public class ContractInfoManageController {
.map(ContractInfoStatuScribe::getTs_code) .map(ContractInfoStatuScribe::getTs_code)
.collect(Collectors.toList()); .collect(Collectors.toList());
if(!ids.isEmpty()) {
var f = var f =
selectDistinct(FutDailyDynamicSqlSupport.futDaily.allColumns()) selectDistinct(FutDailyDynamicSqlSupport.futDaily.allColumns())
.from(FutDailyDynamicSqlSupport.futDaily) .from(FutDailyDynamicSqlSupport.futDaily)
.where(FutDailyDynamicSqlSupport.ts_code,SqlBuilder.isIn(ids)) .where(FutDailyDynamicSqlSupport.ts_code,SqlBuilder.isIn(ids).filter(StringUtils::isNoneBlank))
.orderBy(FutDailyDynamicSqlSupport.trade_date.descending()) .orderBy(FutDailyDynamicSqlSupport.trade_date.descending())
; ;
var s = select(FutDailyDynamicSqlSupport.futDaily.allColumns()) var s = select(FutDailyDynamicSqlSupport.futDaily.allColumns())
@ -160,6 +161,7 @@ public class ContractInfoManageController {
} }
}); });
}); });
}
//------ //------

5
src/main/java/jj/tech/finance/biz/webadmin/controller/ContractInfoScribeController.java
View File

@ -37,6 +37,7 @@ import jakarta.validation.Valid;
import jj.tech.finance.biz.web.dao.ContractInfoSelectMapper; import jj.tech.finance.biz.web.dao.ContractInfoSelectMapper;
import jj.tech.finance.biz.webadmin.dao.SelectMapper; import jj.tech.finance.biz.webadmin.dao.SelectMapper;
import jj.tech.finance.biz.webadmin.vo.ContractInfoStatuScribe; 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.ScribeVo;
import jj.tech.finance.biz.webadmin.vo.parm.Contract; import jj.tech.finance.biz.webadmin.vo.parm.Contract;
import jj.tech.finance.biz.webadmin.vo.parm.Id; import jj.tech.finance.biz.webadmin.vo.parm.Id;
@ -142,10 +143,11 @@ public class ContractInfoScribeController {
.map(ContractInfoStatuScribe::getTs_code) .map(ContractInfoStatuScribe::getTs_code)
.collect(Collectors.toList()); .collect(Collectors.toList());
if(!ids.isEmpty()) {
var f = var f =
selectDistinct(FutDailyDynamicSqlSupport.futDaily.allColumns()) selectDistinct(FutDailyDynamicSqlSupport.futDaily.allColumns())
.from(FutDailyDynamicSqlSupport.futDaily) .from(FutDailyDynamicSqlSupport.futDaily)
.where(FutDailyDynamicSqlSupport.ts_code,SqlBuilder.isIn(ids)) .where(FutDailyDynamicSqlSupport.ts_code,SqlBuilder.isIn(ids).filter(StringUtils::isNoneBlank))
.orderBy(FutDailyDynamicSqlSupport.trade_date.descending()) .orderBy(FutDailyDynamicSqlSupport.trade_date.descending())
; ;
var s = select(FutDailyDynamicSqlSupport.futDaily.allColumns()) var s = select(FutDailyDynamicSqlSupport.futDaily.allColumns())
@ -165,6 +167,7 @@ public class ContractInfoScribeController {
} }
}); });
}); });
}
//------ //------