|
|
@@ -76,7 +76,7 @@ public class PrintPerfDetailReportListDataPlugin extends AbstractReportListDataP
|
|
|
/*QFilter qFilter = new QFilter(PerfManagerFormConstant.NCKD_BEGINYEAR, QCP.less_equals, endDate)
|
|
|
.and(new QFilter(PerfManagerFormConstant.NCKD_ENDYEAR, QCP.large_equals, beginDate));*/
|
|
|
QFilter qFilter = QFilter.of("1=1");
|
|
|
-// qFilter.and(String.join(".", FormConstant.NCKD_EMPPOSORGREL, FormConstant.EMPLOYEE_KEY, FormConstant.EMP_NUMBER_KEY),QCP.equals,"999999");
|
|
|
+ qFilter.and(String.join(".", FormConstant.HRPI_EMPPOSORGREL, FormConstant.POS_STATUS,FormConstant.POST_STATE_CLS, FormConstant.NUMBER_KEY),QCP.equals,"1010_S");
|
|
|
|
|
|
// 处理快速过滤条件
|
|
|
processFastFilter(reportQueryParam, qFilter);
|
|
|
@@ -120,7 +120,7 @@ public class PrintPerfDetailReportListDataPlugin extends AbstractReportListDataP
|
|
|
String.join(".", FormConstant.HRPI_EMPPOSORGREL, FormConstant.ADMINORG, FormConstant.NCKD_FOURTHORG, FormConstant.ID_KEY),
|
|
|
String.join(".", FormConstant.HRPI_EMPPOSORGREL, FormConstant.ADMINORG, FormConstant.NCKD_FIFTHORG, FormConstant.ID_KEY),
|
|
|
String.join(".", FormConstant.HRPI_EMPPOSORGREL, FormConstant.ADMINORG, FormConstant.NCKD_SIXTHORG, FormConstant.ID_KEY),
|
|
|
- String.join(".", FormConstant.HRPI_EMPPOSORGREL, FormConstant.POS_STATUS, FormConstant.ID_KEY),
|
|
|
+ String.join(".", FormConstant.HRPI_EMPENTREL, FormConstant.LABOR_REL_STATUS, FormConstant.ID_KEY),
|
|
|
String.join(".", FormConstant.NCKD_PERSON, FormConstant.NCKD_JOINWORKTIME),
|
|
|
String.join(".", FormConstant.NCKD_PERSON, FormConstant.BIRTHDAY),
|
|
|
String.join(".", FormConstant.NCKD_PERSON, FormConstant.GENDER,FormConstant.NAME_KEY),
|
|
|
@@ -338,7 +338,7 @@ public class PrintPerfDetailReportListDataPlugin extends AbstractReportListDataP
|
|
|
.add(String.join(".", FormConstant.NCKD_PERSON, FormConstant.BIRTHDAY))
|
|
|
.add(String.join(".", FormConstant.NCKD_PERSON, FormConstant.GENDER,FormConstant.NAME_KEY))
|
|
|
.add(String.join(".", FormConstant.HRPI_PEREDUEXP, FormConstant.EDUCATION_KEY,FormConstant.NAME_KEY))
|
|
|
- .addIdNumberName(FormConstant.HRPI_EMPPOSORGREL,FormConstant.POS_STATUS)
|
|
|
+ .addIdNumberName(FormConstant.HRPI_EMPENTREL,FormConstant.LABOR_REL_STATUS)
|
|
|
.addIdNumberName(FormConstant.HRPI_EMPPOSORGREL,FormConstant.ADMINORG,FormConstant.NCKD_FIRSTORG)
|
|
|
.addIdNumberName(FormConstant.HRPI_EMPPOSORGREL,FormConstant.ADMINORG,FormConstant.NCKD_SECONDORG)
|
|
|
.addIdNumberName(FormConstant.HRPI_EMPPOSORGREL,FormConstant.ADMINORG,FormConstant.NCKD_THIRDORG)
|