|
|
@@ -111,13 +111,14 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
|
|
|
/**
|
|
|
* 查询入职单
|
|
|
*/
|
|
|
- String selectField2 = "id,billno,b_effectivedate,createtime,ba_em_tid,ba_em_empnumber,ba_em_name,ba_po_position.boid,ba_po_adminorg";
|
|
|
+ String selectField2 = "id,billno,b_effectivedate,createtime,ba_em_tid,ba_em_empnumber,ba_em_name,ba_po_position.boid,ba_po_adminorg,ba_po_position.nckd_paystdplan.name";
|
|
|
QFilter qFilter1 = new QFilter("enrollstatus", QCP.equals, "3"); // 入职状态 = 已入职
|
|
|
QFilter qFilter2 = new QFilter("billstatus", QCP.equals, "C"); // 单据状态 = 已审核
|
|
|
QFilter qFilter3 = new QFilter("b_effectivedate", QCP.large_equals, daysAgo);
|
|
|
QFilter qFilter4 = new QFilter("b_effectivedate", QCP.less_equals, currentDate);
|
|
|
+ QFilter qFilter5 = new QFilter("ba_po_position.nckd_paystdplan.name", QCP.equals, "江铜集团岗位绩效工资制");
|
|
|
|
|
|
- DynamicObjectCollection onhasonbrdDyns = QueryServiceHelper.query(onhasonbrdEntityName, selectField2,new QFilter[]{qFilter1,qFilter2,qFilter3,qFilter4});
|
|
|
+ DynamicObjectCollection onhasonbrdDyns = QueryServiceHelper.query(onhasonbrdEntityName, selectField2,new QFilter[]{qFilter1,qFilter2,qFilter3,qFilter4,qFilter5});
|
|
|
|
|
|
Map<Long, DynamicObject> onhasonbrdMap = (Map)onhasonbrdDyns.stream().collect(Collectors.toMap((obj) -> {
|
|
|
return obj.getLong("id");
|
|
|
@@ -174,8 +175,9 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
|
|
|
QFilter qFilter12 = new QFilter("billstatus", QCP.equals, "C"); // 单据状态 = 已审核
|
|
|
QFilter qFilter13 = new QFilter("b_effectivedate", QCP.large_equals, daysAgo); //实际调动日期
|
|
|
QFilter qFilter14 = new QFilter("b_effectivedate", QCP.less_equals, currentDate); //实际调动日期
|
|
|
+ QFilter qFilter16 = new QFilter("aposition.nckd_paystdplan.name", QCP.equals, "江铜集团岗位绩效工资制");
|
|
|
|
|
|
- DynamicObjectCollection transferDyns = QueryServiceHelper.query(transferEntityName, selectField1,new QFilter[]{qFilter12,qFilter13,qFilter14});
|
|
|
+ DynamicObjectCollection transferDyns = QueryServiceHelper.query(transferEntityName, selectField1,new QFilter[]{qFilter12,qFilter13,qFilter14,qFilter16});
|
|
|
|
|
|
Map<Long, DynamicObject> transferMap = (Map)transferDyns.stream().collect(Collectors.toMap((obj) -> {
|
|
|
return obj.getLong("id");
|