|
@@ -1502,6 +1502,14 @@ public class TaskController extends BladeController {
|
|
|
|
|
|
//解析page分页数据
|
|
|
IPage<BusinessTaskFailedPageVO> page = new Page<>(current, size);
|
|
|
+ if (resultList == null || resultList.size() == 0){
|
|
|
+ return R.data(page);
|
|
|
+ }
|
|
|
+ //获取节点pdf ,先获取formData集合
|
|
|
+ List<String> queryIds = resultList.stream().map(l -> l.getFormDataId()).collect(Collectors.toList());
|
|
|
+ String join = StringUtils.join(queryIds, ",");
|
|
|
+ Map<Long, String> query = jdbcTemplate.query("select id ,e_visa_pdf_url from u_information_query where is_deleted = 0 and id in ( "+join+")", new BeanPropertyRowMapper<>(InformationQuery.class)).stream().collect(Collectors.toMap(InformationQuery::getId, l-> StringUtils.isBlank(l.getEVisaPdfUrl())?"":l.getEVisaPdfUrl()));
|
|
|
+
|
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
List<BusinessTaskFailedPageVO> pageList = resultList.stream()
|
|
|
.map(task -> {
|
|
@@ -1513,6 +1521,7 @@ public class TaskController extends BladeController {
|
|
|
vo.setTaskStatusName(task.getStatus().equals(1) ? "待审批" : task.getStatus().equals(2) ? "已审批" : "已废除");
|
|
|
vo.setEVisaStatusName(eVisaStatus == 1 ? "电签失败" : "电签成功");
|
|
|
vo.setTaskReportUserName(nameMap.get(Long.parseLong(task.getReportUser())));
|
|
|
+ vo.setSigPdf(query.get(Long.parseLong(task.getFormDataId())));
|
|
|
List<TaskParallel> taskParallelList = finalTaskParallelGroupMap.get(task.getProcessInstanceId());
|
|
|
if (taskParallelList != null && taskParallelList.size() > 0) {
|
|
|
//判断签字人的验证 2=绿色 3=黄色 999=红色 其他代表=灰色
|