|
|
@@ -114,12 +114,10 @@ public class AnnualPerfDetailReportListDataPlugin extends AbstractReportListData
|
|
|
QueryEntityType queryEntityType = (QueryEntityType) EntityMetadataCache.getDataEntityType("annualperfdetailquery");
|
|
|
DataSet dataSet = HRQueryEntityHelper.getInstance().getQueryDataSet(queryEntityType,queryFieldBuilder.buildSelect(), new QFilter[]{qFilter}, null);
|
|
|
|
|
|
- dataSet.print( true);
|
|
|
|
|
|
//过滤调实际结束实际之外的年份分录
|
|
|
DataSet withYearFields = dataSet.filter("year("+String.join(".", PerfManagerFormConstant.PERFMANAGERENTRY, PerfManagerFormConstant.NCKD_APPRAISALYEAR) +") " +
|
|
|
"<= year(CASE WHEN nckd_actendyear is not null THEN nckd_actendyear ELSE "+PerfManagerFormConstant.NCKD_ENDYEAR+" end)");
|
|
|
- withYearFields.print(true);
|
|
|
|
|
|
// 动态添加年份字段;行转列
|
|
|
int tempIndex = 1;
|