|
@@ -138,6 +138,14 @@ public class TaskAnalysisDaoImpl extends BaseDaoImpl implements ITaskAnalysisDao
|
|
|
sql.append(" ) ");
|
|
|
sql.append(" AND to_char( T.create_date, 'yyyy' ) = :year ");
|
|
|
sql.append(" AND T.tstate NOT IN ( - 1, 0, 5, 6, 7 ) ");
|
|
|
+
|
|
|
+ Long gbTaskTypeId = ParameterUtil.getLong(param, "gbTaskTypeId");
|
|
|
+ if(gbTaskTypeId != null){
|
|
|
+ sql.append(" and T.tasktype_id = :gbTaskTypeId ");
|
|
|
+ }
|
|
|
+ if(param.get("gbResIds") != null){
|
|
|
+ sql.append(" and M.resource_id in ( :gbResIds) ");
|
|
|
+ }
|
|
|
sql.append(" ) T ");
|
|
|
param.put("jobType",TaskEnum.JobType.Task.getKey());
|
|
|
List<Map<String, Object>> result = getHibernateTpl().queryBySql(sql.toString(), param);
|
|
@@ -499,7 +507,14 @@ public class TaskAnalysisDaoImpl extends BaseDaoImpl implements ITaskAnalysisDao
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ //类型筛选
|
|
|
+ Long gbTaskTypeId = ParameterUtil.getLong(param, "gbTaskTypeId");
|
|
|
+ if (gbTaskTypeId != null) {
|
|
|
+ sql.append(" and t.tasktype_id = :gbTaskTypeId ");
|
|
|
+ }
|
|
|
+ if(param.get("gbResIds") != null){
|
|
|
+ sql.append(" and M.resource_id in ( :gbResIds) ");
|
|
|
+ }
|
|
|
sql.append(" GROUP BY M.resource_id,M.resource_type ");
|
|
|
sql.append(" ORDER BY \"count\" desc ");
|
|
|
param.put("jobType", TaskEnum.JobType.Task.getKey());
|