|
@@ -1550,7 +1550,7 @@ public class TaskController extends BladeController {
|
|
|
//封装入参SQL
|
|
|
List<Object> params = new ArrayList<>();
|
|
|
Integer eVisaStatus = dto.getVisaStatus();
|
|
|
- StringBuilder sqlString = new StringBuilder("SELECT * FROM u_task WHERE approval_type != 4 AND contract_id = " + dto.getContractId()); //approval_type != 4 非档案的任务就是1填报资料,2工程文件,3日志资料
|
|
|
+ StringBuilder sqlString = new StringBuilder("SELECT * FROM u_task WHERE approval_type != 4 AND status != 3 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())) {
|
|
@@ -1650,6 +1650,9 @@ public class TaskController extends BladeController {
|
|
|
for (TaskParallel taskPa : taskParallelList) {
|
|
|
if (taskPa.getStatus() == 2 && ObjectUtil.isNotEmpty(taskPa.getEVisaStatus()) && taskPa.getEVisaStatus() == 1) {
|
|
|
taskPa.setEVisaStatus(2);
|
|
|
+ if (taskPa.getEVisaContent().contains("请等待") && ObjectUtil.isEmpty(eVisaFailedInfo)) {
|
|
|
+ eVisaFailedInfo = taskPa.getEVisaContent();
|
|
|
+ }
|
|
|
} else if (taskPa.getStatus() == 3 && taskPa.getTaskUser().equals(SecureUtil.getUserId().toString())) {
|
|
|
taskPa.setEVisaStatus(3);
|
|
|
} else if (ObjectUtil.isNotEmpty(taskPa.getEVisaStatus()) && taskPa.getEVisaStatus() == 99) {
|