|
@@ -5186,6 +5186,19 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
|
|
|
keyMap.forEach((key, value) -> {
|
|
|
setFirstData(doc,value,baseInfo.getValueByKey(key),reData,isCancelList);
|
|
|
});
|
|
|
+ if (record != null && record.getStandardId() != null && record.getStandardInfoIds() != null) {
|
|
|
+ String[] split = record.getStandardInfoIds().split(",");
|
|
|
+ if (split.length > 0) {
|
|
|
+ // 技术指标
|
|
|
+ List<Map<String, Object>> mapList = jdbcTemplate.queryForList("SELECT concat(a.symbol,a.name) symbolName,b.col_key,b.col_name from u_standard_info a, u_standard_info_private_join b WHERE a.id = b.standard_info_id and " +
|
|
|
+ "a.standard_id = ? and b.private_id = ? and a.is_deleted = 0 and b.is_deleted = 0 " +
|
|
|
+ "and (SELECT count(1) from u_standard_info_join WHERE standard_info_right_id in ( "+ record.getStandardInfoIds() +" ) and standard_info_left_id = a.id and is_deleted = 0) = ?"
|
|
|
+ , record.getStandardId() , wbsTreePrivate.getPKeyId(), split.length);
|
|
|
+ mapList.forEach(e -> {
|
|
|
+ setFirstData(doc,e.get("col_name").toString(),e.get("symbolName").toString(),reData,isCancelList);
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
private TrialBaseInfo buildTrialBaseInfo(TrialSampleInfo sampleInfo, EntrustInfo entrustInfo,TrialSelfInspectionRecord record, TrialSeleInspectionRecordBaseInfoDTO baseInfoDTO) {
|
|
|
TrialBaseInfo trialBaseInfo = new TrialBaseInfo();
|