Merge remote-tracking branch 'origin/master' into master

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

@@ -17,8 +17,8 @@ public class BusinessTaskFailedDTO implements Serializable {
     @ApiModelProperty(value = "合同段id")
     private String contractId;
 
-    @ApiModelProperty(value = "电签状态")
-    private String eVisaStatus;
+    @ApiModelProperty(value = "电签状态1电签失败2电签成功，默认显示失败")
+    private Integer visaStatus;
 
     @ApiModelProperty(value = "开始时间")
     private String startTimeValue;
@@ -35,4 +35,5 @@ public class BusinessTaskFailedDTO implements Serializable {
     @ApiModelProperty(value = "当前页码")
     private Integer current;
 
+
 }

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

@@ -1405,7 +1405,8 @@ public class TaskController extends BladeController {
 
         //封装入参SQL
         List<Object> params = new ArrayList<>();
-        StringBuilder sqlString = new StringBuilder("SELECT * FROM u_task WHERE 1=1 AND status = 1 AND approval_type != 4 AND contract_id = " + dto.getContractId()); //approval_type != 4 非档案的任务就是1填报资料，2工程文件，3日志资料
+        Integer eVisaStatus = dto.getVisaStatus();
+        StringBuilder sqlString = new StringBuilder("SELECT * FROM u_task WHERE 1=1 AND status = " + eVisaStatus + " AND approval_type != 4 AND contract_id = " + dto.getContractId()); //approval_type != 4 非档案的任务就是1填报资料，2工程文件，3日志资料
 
         if (StringUtils.isNotBlank(dto.getStartTimeValue()) && StringUtils.isNotBlank(dto.getEndTimeValue())) {
             if (dto.getStartTimeValue().equals(dto.getEndTimeValue())) {
@@ -1424,11 +1425,21 @@ public class TaskController extends BladeController {
             params.add("%" + dto.getQueryValue() + "%");
         }
 
-        if (StringUtils.isNotBlank(dto.getEVisaUserName())) {
-            sqlString.append(" AND EXISTS (SELECT 1 FROM u_task_parallel WHERE u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.e_visa_status = 99 AND u_task_parallel.status != 3 AND u_task_parallel.task_user_name LIKE ?)");
-            params.add("%" + dto.getEVisaUserName() + "%");
-        } else {
-            sqlString.append(" AND EXISTS (SELECT 1 FROM u_task_parallel WHERE u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.e_visa_status = 99 AND u_task_parallel.status != 3)");
+        //根据每个审批人的情况判断是否成功
+        if (eVisaStatus == 1) {
+            if (StringUtils.isNotBlank(dto.getEVisaUserName())) {
+                sqlString.append(" AND EXISTS (SELECT 1 FROM u_task_parallel WHERE u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.e_visa_status = 99 AND u_task_parallel.status != 3 AND u_task_parallel.task_user_name LIKE ?)");
+                params.add("%" + dto.getEVisaUserName() + "%");
+            } else {
+                sqlString.append(" AND EXISTS (SELECT 1 FROM u_task_parallel WHERE u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.e_visa_status = 99 AND u_task_parallel.status != 3)");
+            }
+        }else {
+            if (StringUtils.isNotBlank(dto.getEVisaUserName())) {
+                sqlString.append(" AND EXISTS (SELECT 1 FROM u_task_parallel WHERE u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.e_visa_status = 1 AND u_task_parallel.status = 2 AND u_task_parallel.task_user_name LIKE ?)");
+                params.add("%" + dto.getEVisaUserName() + "%");
+            } else {
+                sqlString.append(" AND EXISTS (SELECT 1 FROM u_task_parallel WHERE u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.e_visa_status = 1 AND u_task_parallel.status = 2)");
+            }
         }
 
         //总数量
@@ -1474,7 +1485,7 @@ public class TaskController extends BladeController {
                     vo.setStartTime(task.getStartTime());
                     vo.setEndTime(task.getEndTime());
                     vo.setTaskStatusName(task.getStatus().equals(1) ? "待审批" : task.getStatus().equals(2) ? "已审批" : "已废除");
-                    vo.setEVisaStatusName("电签失败");
+                    vo.setEVisaStatusName(eVisaStatus == 1 ? "电签失败" : "电签成功");
                     vo.setTaskReportUserName(nameMap.get(Long.parseLong(task.getReportUser())));
                     List<TaskParallel> taskParallelList = finalTaskParallelGroupMap.get(task.getProcessInstanceId());
                     if (taskParallelList != null && taskParallelList.size() > 0) {