Merge branch 'dev' of http://219.151.181.73:3000/zhuwei/bladex into lihb

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

@@ -1377,6 +1377,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)");
@@ -1512,7 +1514,7 @@ public class TaskController extends BladeController {
                             task -> task));
         }
         //所有满足条件的日志 转map
-        String logQuery = "select business_id,create_user_name ,create_time, operation_type, save_data from u_operation_log where operation_type in (6,9,26,61,62)";
+        String logQuery = "select business_id,create_user_name ,create_time, operation_type, save_data from u_operation_log where operation_type in (6,9,12,15,18,21,24,26,61,62)";
         List<OperationLog> operationLogs = jdbcTemplate.query(logQuery, new BeanPropertyRowMapper<>(OperationLog.class));
         if(ObjectUtil.isNotEmpty(operationLogs)){
              operationLogMap = operationLogs.stream().collect(Collectors.groupingBy(OperationLog::getBusinessId));
@@ -1675,6 +1677,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)");
@@ -1918,6 +1922,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)");