|
@@ -29,6 +29,7 @@ public class TaskTypeSettingDaoImpl extends BaseDaoImpl implements ITaskTypeSett
|
|
|
sql.append(" inner join task_summary ts on ts.id = tts.reference_id ");
|
|
|
sql.append(" left join task_type_setting tts1 on (tts.reference_id = tts1.reference_id and tts1.type_id = -1) ");
|
|
|
sql.append(" where tts.type_id != -1 ");
|
|
|
+ sql.append(" and ts.tstate != 7 ");
|
|
|
sql.append(" and to_char(ts.create_date,'yyyy') = :year ");
|
|
|
sql.append(" group by tts.type_id ");
|
|
|
return getHibernateTpl().queryBySql(sql.toString(), param);
|
|
@@ -44,7 +45,8 @@ public class TaskTypeSettingDaoImpl extends BaseDaoImpl implements ITaskTypeSett
|
|
|
sql.append(" sum(CASE WHEN tts.type_id = -1 and tts.type_state is not null THEN tts.type_state END) as caseProportionSum ");
|
|
|
sql.append(" from task_type_setting tts ");
|
|
|
sql.append(" inner join task_summary ts on ts.id = tts.reference_id ");
|
|
|
- sql.append(" and to_char(ts.create_date,'yyyy') = :year ");
|
|
|
+ sql.append(" where to_char(ts.create_date,'yyyy') = :year ");
|
|
|
+ sql.append(" and ts.tstate != 7 ");
|
|
|
return getHibernateTpl().queryBySql(sql.toString(), param);
|
|
|
}
|
|
|
}
|