|
@@ -1151,7 +1151,10 @@ public class TaskController extends BladeController {
|
|
|
/*电签状态(始终只获取自己的电签任务状态信息)*/
|
|
|
TaskParallel taskParallel = taskParallelList.stream().filter(f -> ObjectUtil.isNotEmpty(f.getTaskUser()) && f.getTaskUser().equals(SecureUtil.getUserId().toString())).findAny().orElse(null);
|
|
|
if (taskParallel != null) {
|
|
|
- vo.setEVisaStatus(taskParallel.getEVisaContent() != null ? taskParallel.getEVisaContent() : "");
|
|
|
+// vo.setEVisaStatus((taskParallel.getEVisaContent() != null && !"null".equals(taskParallel.getEVisaContent())) ? taskParallel.getEVisaContent() : "");
|
|
|
+ if (taskParallel.getEVisaStatus() != null){
|
|
|
+ vo.setEVisaStatus(taskParallel.getEVisaStatus() == 1 ? "电签成功":(StringUtils.isBlank(taskParallel.getEVisaContent()) || "null".equals(taskParallel.getEVisaContent()))?"电签失败":taskParallel.getEVisaContent());
|
|
|
+ }
|
|
|
}
|
|
|
if (vo.getTaskStatusName().equals("已废除")) {
|
|
|
vo.setEVisaStatus("废除成功");
|