|
|
@@ -32,6 +32,7 @@ import nckd.jxccl.base.common.utils.QueryFieldBuilder;
|
|
|
import nckd.jxccl.base.common.utils.ShowOperExecuteResult;
|
|
|
import nckd.jxccl.base.entity.helper.EntityHelper;
|
|
|
import nckd.jxccl.base.hrpi.helper.EmpPosOrgRelHelper;
|
|
|
+import nckd.jxccl.base.orm.helper.QFilterCommonHelper;
|
|
|
import nckd.jxccl.swc.mas.common.MasConstant;
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
@@ -308,9 +309,7 @@ public class SubCoHeadServiceListPlugin extends AbstractListPlugin implements Pl
|
|
|
.add(MasConstant.ENDDATE)
|
|
|
.addIdNumberName(FormConstant.NCKD_EMPPOSORGREL,FormConstant.EMPLOYEE_KEY)
|
|
|
.addIdNumberName(MasConstant.NCKD_LAWENTITY);
|
|
|
- QFilter legalPostFilter = new QFilter(MasConstant.STARTDATE, QCP.less_equals, endOfYear)
|
|
|
- .and(new QFilter(MasConstant.ENDDATE, QCP.is_null,null)
|
|
|
- .or(MasConstant.ENDDATE, QCP.large_equals, startOfYear))
|
|
|
+ QFilter legalPostFilter = QFilterCommonHelper.getValidDateFilter(MasConstant.STARTDATE, MasConstant.ENDDATE)
|
|
|
.and(FormConstant.NCKD_EMPPOSORGREL,QCP.in, empPosOrgRelIds);
|
|
|
DynamicObjectCollection legalPostQuery = QueryServiceHelper.query(FormConstant.NCKD_HRPI_LEGALPOST, legalPostFieldBuilder.buildSelect(), new QFilter[]{legalPostFilter});
|
|
|
Map<Long, DynamicObject> legalPostMap = legalPostQuery.stream()
|