|
@@ -1376,6 +1376,8 @@ public class TaskController extends BladeController {
|
|
|
}
|
|
|
sqlString.append(")");
|
|
|
}
|
|
|
+ //是否填报过
|
|
|
+ sqlString.append(" AND (SELECT COUNT(1) FROM u_information_query WHERE u_task.form_data_id = id and is_deleted=0) > 0");
|
|
|
|
|
|
//总数量
|
|
|
String sqlCount = sqlString.toString().replace("*", "count(1)");
|
|
@@ -1674,6 +1676,8 @@ public class TaskController extends BladeController {
|
|
|
}
|
|
|
sqlString.append(")");
|
|
|
}
|
|
|
+ //是否填报过
|
|
|
+ sqlString.append(" AND (SELECT COUNT(1) FROM u_information_query WHERE u_task.form_data_id = id and is_deleted=0) > 0");
|
|
|
|
|
|
//总数量
|
|
|
String sqlCount = sqlString.toString().replace("*", "count(1)");
|
|
@@ -1917,6 +1921,8 @@ public class TaskController extends BladeController {
|
|
|
"(SELECT COUNT(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 is_deleted=0)");
|
|
|
|
|
|
}
|
|
|
+ //是否填报过
|
|
|
+ sqlString.append(" AND (SELECT COUNT(1) FROM u_information_query WHERE u_task.form_data_id = id and is_deleted=0) > 0");
|
|
|
|
|
|
//总数量
|
|
|
String sqlCount = sqlString.toString().replace("*", "count(1)");
|