|
@@ -145,6 +145,8 @@ public class InformationWriteQueryController extends BladeController {
|
|
|
|
|
|
private final WbsParamClient wbsParamClient;
|
|
|
|
|
|
+ private final ExcelTabClient excelTabClient;
|
|
|
+
|
|
|
@Autowired
|
|
|
StringRedisTemplate RedisTemplate;
|
|
|
|
|
@@ -1378,9 +1380,8 @@ public R<Object> batchTask(@RequestBody StartTaskVO startTaskVO) {
|
|
|
ids = queryList.stream().map(InformationQuery::getId).map(String::valueOf).toArray(String[]::new);
|
|
|
}
|
|
|
|
|
|
- Map<String, String> queryMap = new HashMap<>();
|
|
|
- queryList.forEach(query -> queryMap.put(query.getId().toString(), query.getName()));
|
|
|
-
|
|
|
+ Map<String, InformationQuery> queryMap = new HashMap<>();
|
|
|
+ queryList.forEach(query -> queryMap.put(query.getId().toString(), query));
|
|
|
boolean var = false;
|
|
|
|
|
|
try {
|
|
@@ -1404,8 +1405,8 @@ public R<Object> batchTask(@RequestBody StartTaskVO startTaskVO) {
|
|
|
taskVO.setFixedFlowId(startTaskVO.getFixedFlowId());
|
|
|
}
|
|
|
//设置任务名称
|
|
|
- if (StringUtils.isNotEmpty(queryMap.get(id))) {
|
|
|
- taskVO.setTaskName(queryMap.get(id));
|
|
|
+ if (StringUtils.isNotEmpty(queryMap.get(id).toString())) {
|
|
|
+ taskVO.setTaskName(queryMap.get(id).getName());
|
|
|
}
|
|
|
//设置数据源指向
|
|
|
taskVO.setFormDataId(id);
|
|
@@ -1453,6 +1454,7 @@ public R<Object> batchTask(@RequestBody StartTaskVO startTaskVO) {
|
|
|
jdbcTemplate.execute(sql);
|
|
|
}
|
|
|
var = true;
|
|
|
+ getPdfs(queryMap.get(id));
|
|
|
} else {
|
|
|
return R.fail("创建主流程失败");
|
|
|
}
|
|
@@ -4491,5 +4493,9 @@ public R<Object> customAddContractNode(@RequestBody CustomAddContractNodeDTO dto
|
|
|
return R.fail("未获取到当前选择节点信息");
|
|
|
}
|
|
|
|
|
|
+ @Async
|
|
|
+ private R getPdfs(InformationQuery query) throws IOException{
|
|
|
+ return excelTabClient.getPdfS(query.getWbsId() + "", query.getClassify() + "", query.getContractId() + "");
|
|
|
+ }
|
|
|
|
|
|
}
|