|
|
@@ -110,7 +110,7 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
|
|
|
/**
|
|
|
* 查询入职单
|
|
|
*/
|
|
|
- String selectField2 = "id,billno,b_effectivedate,ba_em_tid,ba_em_empnumber,ba_em_name,ba_po_position.masterid,ba_po_adminorg,ba_po_job.id,ajoblevel.id,ba_po_job.jobseq.id";
|
|
|
+ String selectField2 = "id,billno,b_effectivedate,createtime,ba_em_tid,ba_em_empnumber,ba_em_name,ba_po_position.masterid,ba_po_adminorg,ba_po_job.id,ajoblevel.id,ba_po_job.jobseq.id";
|
|
|
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);
|
|
|
@@ -156,6 +156,7 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
|
|
|
dyn.set("billstatus", "A"); ///待处理
|
|
|
dyn.set("nckd_employeefield", onhasonbrdDyn.getLong("ba_em_tid"));
|
|
|
dyn.set("nckd_changedate", onhasonbrdDyn.getDate("b_effectivedate"));
|
|
|
+ dyn.set("nckd_dodatetime", onhasonbrdDyn.getDate("createtime"));
|
|
|
dyn.set("nckd_salaryadjus", salaryTypeDyns.get(0).getLong("id")); //定调薪类型
|
|
|
dyn.set("nckd_newhradminorg", onhasonbrdDyn.getLong("ba_po_adminorg")); //部门
|
|
|
dyn.set("nckd_newposition", onhasonbrdDyn.getLong("ba_po_position.masterid")); //岗位
|
|
|
@@ -169,7 +170,7 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
|
|
|
/**
|
|
|
* 查询调动单
|
|
|
*/
|
|
|
- String selectField1 = "id,billno,b_effectivedate,bb_em_tid,ba_em_empnumber,bb_po_position.masterid,aposition.masterid,bb_po_adminorg.id,aorg.id,bb_po_job.jobseq.id,ajob.jobseq.id";
|
|
|
+ String selectField1 = "id,billno,b_effectivedate,createtime,bb_em_tid,ba_em_empnumber,bb_po_position.masterid,aposition.masterid,bb_po_adminorg.id,aorg.id,bb_po_job.jobseq.id,ajob.jobseq.id";
|
|
|
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); //实际调动日期
|
|
|
@@ -214,6 +215,7 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
|
|
|
dyn.set("billstatus", "A"); ///待处理
|
|
|
dyn.set("nckd_employeefield", employeeID);
|
|
|
dyn.set("nckd_changedate", transferDyn.getDate("b_effectivedate"));
|
|
|
+ dyn.set("nckd_dodatetime", transferDyn.getDate("createtime"));
|
|
|
dyn.set("nckd_salaryadjus", salaryTypeDyns.get(1).getLong("id")); //定调薪类型
|
|
|
/**
|
|
|
* 调动前
|