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

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

@ -160,30 +160,31 @@ public class ContractInfoController {
.map(ContractInfoStatuScribeStore::getTs_code) .map(ContractInfoStatuScribeStore::getTs_code)
.collect(Collectors.toList()); .collect(Collectors.toList());
var f = if(!ids.isEmpty()) {
selectDistinct(FutDailyDynamicSqlSupport.futDaily.allColumns()) var f =
.from(FutDailyDynamicSqlSupport.futDaily) selectDistinct(FutDailyDynamicSqlSupport.futDaily.allColumns())
.where(FutDailyDynamicSqlSupport.ts_code,SqlBuilder.isIn(ids)) .from(FutDailyDynamicSqlSupport.futDaily)
.orderBy(FutDailyDynamicSqlSupport.trade_date.descending()) .where(FutDailyDynamicSqlSupport.ts_code,SqlBuilder.isIn(ids).filter(StringUtils::isNoneBlank))
; .orderBy(FutDailyDynamicSqlSupport.trade_date.descending())
var s = select(FutDailyDynamicSqlSupport.futDaily.allColumns()) ;
.from(f,"f") var s = select(FutDailyDynamicSqlSupport.futDaily.allColumns())
.groupBy(FutDailyDynamicSqlSupport.ts_code.qualifiedWith("f")) .from(f,"f")
.build() .groupBy(FutDailyDynamicSqlSupport.ts_code.qualifiedWith("f"))
.render(RenderingStrategies.MYBATIS3); .build()
.render(RenderingStrategies.MYBATIS3);
List<FutDaily> futs = List<FutDaily> futs =
futDailyMapper.selectMany(s); futDailyMapper.selectMany(s);
list.forEach(i->{ list.forEach(i->{
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,29 +442,31 @@ public class ContractInfoController {
.map(ContractInfoStatuScribeStore::getTs_code) .map(ContractInfoStatuScribeStore::getTs_code)
.collect(Collectors.toList()); .collect(Collectors.toList());
var f = if(!ids.isEmpty()) {
selectDistinct(FutDailyDynamicSqlSupport.futDaily.allColumns()) var f =
.from(FutDailyDynamicSqlSupport.futDaily) selectDistinct(FutDailyDynamicSqlSupport.futDaily.allColumns())
.where(FutDailyDynamicSqlSupport.ts_code,SqlBuilder.isIn(ids)) .from(FutDailyDynamicSqlSupport.futDaily)
.orderBy(FutDailyDynamicSqlSupport.trade_date.descending()) .where(FutDailyDynamicSqlSupport.ts_code,SqlBuilder.isIn(ids).filter(StringUtils::isNoneBlank))
; .orderBy(FutDailyDynamicSqlSupport.trade_date.descending())
var s = select(FutDailyDynamicSqlSupport.futDaily.allColumns()) ;
.from(f,"f") var s = select(FutDailyDynamicSqlSupport.futDaily.allColumns())
.groupBy(FutDailyDynamicSqlSupport.ts_code.qualifiedWith("f")) .from(f,"f")
.build() .groupBy(FutDailyDynamicSqlSupport.ts_code.qualifiedWith("f"))
.render(RenderingStrategies.MYBATIS3); .build()
.render(RenderingStrategies.MYBATIS3);
List<FutDaily> futs = List<FutDaily> futs =
futDailyMapper.selectMany(s); futDailyMapper.selectMany(s);
list.forEach(i->{ list.forEach(i->{
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);
} }
});
}); });
}); }
//------ //------

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

@ -137,29 +137,31 @@ public class ContractInfoManageController {
.map(ContractInfoStatuScribe::getTs_code) .map(ContractInfoStatuScribe::getTs_code)
.collect(Collectors.toList()); .collect(Collectors.toList());
var f = if(!ids.isEmpty()) {
selectDistinct(FutDailyDynamicSqlSupport.futDaily.allColumns()) var f =
.from(FutDailyDynamicSqlSupport.futDaily) selectDistinct(FutDailyDynamicSqlSupport.futDaily.allColumns())
.where(FutDailyDynamicSqlSupport.ts_code,SqlBuilder.isIn(ids)) .from(FutDailyDynamicSqlSupport.futDaily)
.orderBy(FutDailyDynamicSqlSupport.trade_date.descending()) .where(FutDailyDynamicSqlSupport.ts_code,SqlBuilder.isIn(ids).filter(StringUtils::isNoneBlank))
; .orderBy(FutDailyDynamicSqlSupport.trade_date.descending())
var s = select(FutDailyDynamicSqlSupport.futDaily.allColumns()) ;
.from(f,"f") var s = select(FutDailyDynamicSqlSupport.futDaily.allColumns())
.groupBy(FutDailyDynamicSqlSupport.ts_code.qualifiedWith("f")) .from(f,"f")
.build() .groupBy(FutDailyDynamicSqlSupport.ts_code.qualifiedWith("f"))
.render(RenderingStrategies.MYBATIS3); .build()
.render(RenderingStrategies.MYBATIS3);
List<FutDaily> futs = List<FutDaily> futs =
futDailyMapper.selectMany(s); futDailyMapper.selectMany(s);
list.forEach(i->{ list.forEach(i->{
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);
} }
});
}); });
}); }
//------ //------

41
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,29 +143,31 @@ public class ContractInfoScribeController {
.map(ContractInfoStatuScribe::getTs_code) .map(ContractInfoStatuScribe::getTs_code)
.collect(Collectors.toList()); .collect(Collectors.toList());
var f = if(!ids.isEmpty()) {
selectDistinct(FutDailyDynamicSqlSupport.futDaily.allColumns()) var f =
.from(FutDailyDynamicSqlSupport.futDaily) selectDistinct(FutDailyDynamicSqlSupport.futDaily.allColumns())
.where(FutDailyDynamicSqlSupport.ts_code,SqlBuilder.isIn(ids)) .from(FutDailyDynamicSqlSupport.futDaily)
.orderBy(FutDailyDynamicSqlSupport.trade_date.descending()) .where(FutDailyDynamicSqlSupport.ts_code,SqlBuilder.isIn(ids).filter(StringUtils::isNoneBlank))
; .orderBy(FutDailyDynamicSqlSupport.trade_date.descending())
var s = select(FutDailyDynamicSqlSupport.futDaily.allColumns()) ;
.from(f,"f") var s = select(FutDailyDynamicSqlSupport.futDaily.allColumns())
.groupBy(FutDailyDynamicSqlSupport.ts_code.qualifiedWith("f")) .from(f,"f")
.build() .groupBy(FutDailyDynamicSqlSupport.ts_code.qualifiedWith("f"))
.render(RenderingStrategies.MYBATIS3); .build()
.render(RenderingStrategies.MYBATIS3);
List<FutDaily> futs = List<FutDaily> futs =
futDailyMapper.selectMany(s); futDailyMapper.selectMany(s);
list.forEach(i->{ list.forEach(i->{
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);
} }
});
}); });
}); }
//------ //------