|
@@ -162,11 +162,12 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
|
|
|
*/
|
|
*/
|
|
|
String selectField1 = "id,billno,b_effectivedate,createtime,bb_em_tid,ba_em_empnumber,bb_po_position.boid,aposition.boid,bb_po_adminorg.boid,aorg.boid,aorg.belongcompany.id";
|
|
String selectField1 = "id,billno,b_effectivedate,createtime,bb_em_tid,ba_em_empnumber,bb_po_position.boid,aposition.boid,bb_po_adminorg.boid,aorg.boid,aorg.belongcompany.id";
|
|
|
QFilter qFilter12 = new QFilter("billstatus", QCP.equals, "C"); // 单据状态 = 已审核
|
|
QFilter qFilter12 = new QFilter("billstatus", QCP.equals, "C"); // 单据状态 = 已审核
|
|
|
|
|
+ QFilter qFilter17 = new QFilter("perchgstatus", QCP.equals, "99"); //同步成功
|
|
|
QFilter qFilter13 = new QFilter("b_effectivedate", QCP.large_equals, daysAgo); //实际调动日期
|
|
QFilter qFilter13 = new QFilter("b_effectivedate", QCP.large_equals, daysAgo); //实际调动日期
|
|
|
QFilter qFilter14 = new QFilter("b_effectivedate", QCP.less_equals, currentDate); //实际调动日期
|
|
QFilter qFilter14 = new QFilter("b_effectivedate", QCP.less_equals, currentDate); //实际调动日期
|
|
|
QFilter qFilter16 = new QFilter("aposition.nckd_paystdplan.name", QCP.equals, "江铜集团岗位绩效工资制");
|
|
QFilter qFilter16 = new QFilter("aposition.nckd_paystdplan.name", QCP.equals, "江铜集团岗位绩效工资制");
|
|
|
|
|
|
|
|
- DynamicObjectCollection transferDyns = QueryServiceHelper.query(FormConstant.HDM_TRANSFERAPPLY, selectField1,new QFilter[]{qFilter12,qFilter13,qFilter14,qFilter16});
|
|
|
|
|
|
|
+ DynamicObjectCollection transferDyns = QueryServiceHelper.query(FormConstant.HDM_TRANSFERAPPLY, selectField1,new QFilter[]{qFilter12,qFilter13,qFilter14,qFilter17,qFilter16});
|
|
|
|
|
|
|
|
Map<Long, DynamicObject> transferMap = (Map)transferDyns.stream().collect(Collectors.toMap((obj) -> {
|
|
Map<Long, DynamicObject> transferMap = (Map)transferDyns.stream().collect(Collectors.toMap((obj) -> {
|
|
|
return obj.getLong("id");
|
|
return obj.getLong("id");
|