|
|
@@ -85,8 +85,8 @@ public class KeyBeHavEvalReptQueryPlugin extends AbstractReportListDataPlugin im
|
|
|
RequestContext.get().getCurrUserId(), "nckd_psmsfile", PositionStructureConstant.PERSONPOSFILE_ENTITYID,
|
|
|
PermItemConst.ITEM_VIEW, new HashMap<>());
|
|
|
if (dataRule != null) {
|
|
|
- Object value = dataRule.getValue();
|
|
|
- qFilter.and(String.join(".",FormConstant.NCKD_PERSON,FormConstant.HRPI_EMPPOSORGREL, FormConstant.ADMINORG), QCP.in, value);
|
|
|
+// Object value = dataRule.getValue();
|
|
|
+ qFilter.and(dataRule);
|
|
|
}
|
|
|
|
|
|
processFastFilter(reportQueryParam, qFilter);
|
|
|
@@ -94,6 +94,7 @@ public class KeyBeHavEvalReptQueryPlugin extends AbstractReportListDataPlugin im
|
|
|
processFilter(reportQueryParam, qFilter);
|
|
|
|
|
|
DataSet mainTableDataSet = queryMainTableDataSet(qFilter);
|
|
|
+ mainTableDataSet.print(true);
|
|
|
|
|
|
// 6. 关联主表和行转列结果
|
|
|
DataSet finalResultDataSet = joinMainAndPivotData(mainTableDataSet, pivotResultDataSet);
|
|
|
@@ -287,6 +288,8 @@ public class KeyBeHavEvalReptQueryPlugin extends AbstractReportListDataPlugin im
|
|
|
* 查询主表数据
|
|
|
*/
|
|
|
private DataSet queryMainTableDataSet(QFilter qFilter) {
|
|
|
+
|
|
|
+
|
|
|
QueryFieldBuilder queryFieldBuilder = buildQueryFieldBuilder();
|
|
|
return QueryServiceHelper.queryDataSet("KeyBeHavEvalReptQueryPlugin",
|
|
|
PositionStructureConstant.KEYBEHAVEVAL_ENTITYID,
|