|
@@ -92,14 +92,15 @@ public class BaseMedicalAllowanceServiceImpl implements BaseMedicalAllowanceServ
|
|
|
QFilter qFilter11 = new QFilter("iscurrentversion", QCP.equals, true); // 启用
|
|
QFilter qFilter11 = new QFilter("iscurrentversion", QCP.equals, true); // 启用
|
|
|
QFilter qFilter12 = new QFilter("datastatus", QCP.equals, "1"); // 启用
|
|
QFilter qFilter12 = new QFilter("datastatus", QCP.equals, "1"); // 启用
|
|
|
DataSet employeeDS = QueryServiceHelper.queryDataSet(this.getClass().getName(),"hrpi_employee", "id,number,name", new QFilter[]{qFilter1,qFilter11,qFilter12},null);
|
|
DataSet employeeDS = QueryServiceHelper.queryDataSet(this.getClass().getName(),"hrpi_employee", "id,number,name", new QFilter[]{qFilter1,qFilter11,qFilter12},null);
|
|
|
-
|
|
|
|
|
|
|
+ employeeDS.print(true);
|
|
|
/***
|
|
/***
|
|
|
* 获取员工档案 任职经历 岗位
|
|
* 获取员工档案 任职经历 岗位
|
|
|
*/
|
|
*/
|
|
|
QFilter qFilter2 = new QFilter("employee.id",QCP.in, employeeIDs);
|
|
QFilter qFilter2 = new QFilter("employee.id",QCP.in, employeeIDs);
|
|
|
QFilter qFilter21 = new QFilter("iscurrentdata", QCP.equals, true); // 启用
|
|
QFilter qFilter21 = new QFilter("iscurrentdata", QCP.equals, true); // 启用
|
|
|
- DataSet empOrgRelDS = QueryServiceHelper.queryDataSet(this.getClass().getName(),"hrpi_empposorgrel", "id,employee.id,company.id,company.name,position.id,position.number,position.name,adminorg.number", new QFilter[]{qFilter2,qFilter21},null);
|
|
|
|
|
-
|
|
|
|
|
|
|
+ QFilter qFilter22 = new QFilter("isprimary", QCP.equals, "1"); //主任职
|
|
|
|
|
+ DataSet empOrgRelDS = QueryServiceHelper.queryDataSet(this.getClass().getName(),"hrpi_empposorgrel", "id,employee.id,company.id,company.name,position.id,position.number,position.name,adminorg.number", new QFilter[]{qFilter2,qFilter21,qFilter22},null);
|
|
|
|
|
+ empOrgRelDS.print(true);
|
|
|
/***
|
|
/***
|
|
|
* 获取员工档案 雇佣信息 用工关系状态
|
|
* 获取员工档案 雇佣信息 用工关系状态
|
|
|
*/
|
|
*/
|
|
@@ -177,7 +178,7 @@ public class BaseMedicalAllowanceServiceImpl implements BaseMedicalAllowanceServ
|
|
|
/**
|
|
/**
|
|
|
* 公司领导班子成员:对应组织为集团本部-股份公司领导-公司领导和集团本部-集团公司领导在内的所有正式员工【4800/年】
|
|
* 公司领导班子成员:对应组织为集团本部-股份公司领导-公司领导和集团本部-集团公司领导在内的所有正式员工【4800/年】
|
|
|
*/
|
|
*/
|
|
|
- if(laborrelstatusNum.equals("1010_S") && adminorgNum.equals("01010201") && positionNum.equals("01010101")){
|
|
|
|
|
|
|
+ if(laborrelstatusNum.equals("1010_S") && (adminorgNum.equals("01010201") || adminorgNum.equals("01010101"))){
|
|
|
money = 4800;
|
|
money = 4800;
|
|
|
}
|
|
}
|
|
|
/**
|
|
/**
|