任务BUG

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/vo/ArchiveTaskPageVO.java

@@ -38,7 +38,4 @@ public class ArchiveTaskPageVO implements Serializable {
     @ApiModelProperty(value = "电签状态")
     private String eVisaStatus;
 
-    @ApiModelProperty(value = "电签状态描述")
-    private String eVisaContents;
-
 }

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/BusinessTaskPageVO.java

@@ -38,9 +38,6 @@ public class BusinessTaskPageVO implements Serializable {
     @ApiModelProperty(value = "电签状态")
     private String eVisaStatus;
 
-    @ApiModelProperty(value = "电签状态描述")
-    private String eVisaContents;
-
     @ApiModelProperty(value = "上报类型")
     private Integer approvalType;
 

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveFileTaskController.java

@@ -309,15 +309,14 @@ public class ArchiveFileTaskController extends BladeController {
                     if (taskParallelList != null && taskParallelList.size() > 0) {
                         List<String> names = taskParallelList.stream().map(TaskParallel::getTaskUserName).collect(Collectors.toList());
                         if (names.size() > 0) {
-                            vo.setTaskApproveUserNames(StringUtils.join(names, ","));
+                            vo.setTaskApproveUserNames(StringUtils.join(names, "、"));
                         }
-                        Set<Integer> eVisaStatus = taskParallelList.stream().map(TaskParallel::getEVisaStatus).collect(Collectors.toSet());
-                        if (eVisaStatus.size() > 0) {
-                            vo.setEVisaStatus(StringUtils.join(eVisaStatus, "、"));
+                        List<String> contentsList = new LinkedList<>();
+                        for (TaskParallel taskParallel : taskParallelList) {
+                            contentsList.add("【" + taskParallel.getTaskUserName() + "】msg：" + (ObjectUtil.isNotEmpty(taskParallel.getEVisaContent()) ? taskParallel.getEVisaContent() : "null") + " code：" + (ObjectUtil.isNotEmpty(taskParallel.getEVisaStatus()) ? taskParallel.getEVisaStatus() : "null "));
                         }
-                        Set<String> eVisaContents = taskParallelList.stream().map(TaskParallel::getEVisaContent).collect(Collectors.toSet());
-                        if (eVisaContents.size() > 0) {
-                            vo.setEVisaContents(StringUtils.join(eVisaContents, "、"));
+                        if (contentsList.size() > 0) {
+                            vo.setEVisaStatus(StringUtils.join(contentsList, " 、"));
                         }
                     }
                     return vo;

blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -1233,15 +1233,14 @@ public class TaskController extends BladeController {
                     if (taskParallelList != null && taskParallelList.size() > 0) {
                         List<String> names = taskParallelList.stream().map(TaskParallel::getTaskUserName).collect(Collectors.toList());
                         if (names.size() > 0) {
-                            vo.setTaskApproveUserNames(StringUtils.join(names, ","));
+                            vo.setTaskApproveUserNames(StringUtils.join(names, "、"));
                         }
-                        Set<Integer> eVisaStatus = taskParallelList.stream().map(TaskParallel::getEVisaStatus).collect(Collectors.toSet());
-                        if (eVisaStatus.size() > 0) {
-                            vo.setEVisaStatus(StringUtils.join(eVisaStatus, "、"));
+                        List<String> contentsList = new LinkedList<>();
+                        for (TaskParallel taskParallel : taskParallelList) {
+                            contentsList.add("【" + taskParallel.getTaskUserName() + "】msg：" + (ObjectUtil.isNotEmpty(taskParallel.getEVisaContent()) ? taskParallel.getEVisaContent() : "null") + " code：" + (ObjectUtil.isNotEmpty(taskParallel.getEVisaStatus()) ? taskParallel.getEVisaStatus() : "null "));
                         }
-                        Set<String> eVisaContents = taskParallelList.stream().map(TaskParallel::getEVisaContent).collect(Collectors.toSet());
-                        if (eVisaContents.size() > 0) {
-                            vo.setEVisaContents(StringUtils.join(eVisaContents, "、"));
+                        if (contentsList.size() > 0) {
+                            vo.setEVisaStatus(StringUtils.join(contentsList, " 、"));
                         }
                     }
                     return vo;