电签状态

blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/BusinessTaskDTO.java

@@ -48,4 +48,7 @@ public class BusinessTaskDTO implements Serializable {
     @ApiModelProperty(value = "当前页码")
     private Integer current;
 
+    @ApiModelProperty(value = "App时间排序 1=倒叙 2=正序")
+    private Integer ordType;
+
 }

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

@@ -285,7 +285,7 @@ public class ArchiveFileTaskController extends BladeController {
             String resultIds = processInstanceIds.stream()
                     .map(id -> "'" + id + "'")
                     .collect(Collectors.joining(","));
-            taskParallelGroupMap = jdbcTemplate.query("select process_instance_id,task_user_name,e_visa_status,e_visa_content from u_task_parallel where process_instance_id in(" + resultIds + ") order by id", new BeanPropertyRowMapper<>(TaskParallel.class)).stream().collect(Collectors.groupingBy(TaskParallel::getProcessInstanceId));
+            taskParallelGroupMap = jdbcTemplate.query("select process_instance_id,task_user,task_user_name,e_visa_status,e_visa_content from u_task_parallel where process_instance_id in(" + resultIds + ") order by id", new BeanPropertyRowMapper<>(TaskParallel.class)).stream().collect(Collectors.groupingBy(TaskParallel::getProcessInstanceId));
         }
         Map<String, List<TaskParallel>> finalTaskParallelGroupMap = taskParallelGroupMap;
 
@@ -309,15 +309,26 @@ 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, ","));
                         }
-                        List<String> contentsList = new LinkedList<>();
+
+                        //电签状态（始终只获取自己的电签任务状态信息）
+                        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() : "");
+                        }
+                        if (vo.getTaskStatusName().equals("已废除")) {
+                            vo.setEVisaStatus("废除成功");
+                        }
+
+                        /*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 "));
                         }
                         if (contentsList.size() > 0) {
                             vo.setEVisaStatus(StringUtils.join(contentsList, " 、"));
-                        }
+                        }*/
+
                     }
                     return vo;
                 })

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

@@ -1186,7 +1186,19 @@ public class TaskController extends BladeController {
         int totalCount = totalCountOptional.orElse(0);
 
         //分页
-        sqlString.append(" ORDER BY create_time DESC LIMIT ? OFFSET ?");
+        if (ObjectUtil.isNotEmpty(dto.getOrdType())) {
+            //App端排序
+            if (dto.getOrdType() == 1) {
+                sqlString.append(" ORDER BY create_time DESC LIMIT ? OFFSET ?");
+            } else if (dto.getOrdType() == 2) {
+                sqlString.append(" ORDER BY create_time ASC LIMIT ? OFFSET ?");
+            } else {
+                sqlString.append(" ORDER BY create_time DESC LIMIT ? OFFSET ?");
+            }
+        } else {
+            //Web端默认倒叙
+            sqlString.append(" ORDER BY create_time DESC LIMIT ? OFFSET ?");
+        }
         params.add(size);
         params.add((current - 1) * size);
 
@@ -1205,7 +1217,7 @@ public class TaskController extends BladeController {
             String resultIds = processInstanceIds.stream()
                     .map(id -> "'" + id + "'")
                     .collect(Collectors.joining(","));
-            taskParallelGroupMap = jdbcTemplate.query("select process_instance_id,task_user_name,e_visa_status,e_visa_content from u_task_parallel where process_instance_id in(" + resultIds + ") order by id", new BeanPropertyRowMapper<>(TaskParallel.class)).stream().collect(Collectors.groupingBy(TaskParallel::getProcessInstanceId));
+            taskParallelGroupMap = jdbcTemplate.query("select process_instance_id,task_user,task_user_name,e_visa_status,e_visa_content from u_task_parallel where process_instance_id in(" + resultIds + ") order by id", new BeanPropertyRowMapper<>(TaskParallel.class)).stream().collect(Collectors.groupingBy(TaskParallel::getProcessInstanceId));
         }
 
         Map<String, List<TaskParallel>> finalTaskParallelGroupMap = taskParallelGroupMap;
@@ -1233,15 +1245,26 @@ 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, ","));
+                        }
+
+                        //电签状态（始终只获取自己的电签任务状态信息）
+                        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() : "");
                         }
-                        List<String> contentsList = new LinkedList<>();
+                        if (vo.getTaskStatusName().equals("已废除")) {
+                            vo.setEVisaStatus("废除成功");
+                        }
+
+                        /*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 "));
                         }
                         if (contentsList.size() > 0) {
                             vo.setEVisaStatus(StringUtils.join(contentsList, " 、"));
-                        }
+                        }*/
+
                     }
                     return vo;
                 })
@@ -1252,9 +1275,7 @@ public class TaskController extends BladeController {
         R<IPage<BusinessTaskPageVO>> iPageR = R.data(page);
 
         //待办推送
-        if (dto.getSelectedType().
-
-                equals(1)) {
+        if (dto.getSelectedType().equals(1)) {
             if (ObjectUtil.isNotEmpty(iPageR.getData()) && ObjectUtil.isNotEmpty(iPageR.getData().getRecords()) && ObjectUtil.isNotEmpty(dto.getContractIdValue()) && ObjectUtil.isNotEmpty(dto.getProjectIdValue())) {
                 this.sendsWebSocketCount(iPageR, 1, dto);
             } else if (ObjectUtil.isNotEmpty(dto.getContractIdValue()) && ObjectUtil.isNotEmpty(dto.getProjectIdValue())) {