sql="select a.id,a.jobtitlename as name from hrmjobtitles a inner join jcl_org_job b on a.id = b.ec_jobtitle and (b.delete_type is null or b.delete_type = 0) where b.ec_department = '"+departmentId+"' and b.ec_company='"+subcompanyid1+"'";
sql="select a.id,a.jobtitlename as name from hrmjobtitles a inner join jcl_org_job b on a.id = b.ec_jobtitle and (b.delete_type is null or b.delete_type = 0) where b.ec_department = '"+departmentId+"'";
}else{
rs.executeQuery("select subcompanyid from jcl_chart_department where departmentid = '"+departmentId+"' and versionid = "+versionId);
rs.next();
Stringsubcompanyid=rs.getString("subcompanyid");
sql="select jobid as id ,jobname as name from jcl_chart_job where departmentid = '"+departmentId+"' and subcompanyid = '"+subcompanyid+"' and versionid = "+versionId;
sql="select jobid as id ,jobname as name from jcl_chart_job where departmentid = '"+departmentId+"' and versionid = "+versionId;
}
rs.executeQuery(sql);
while(rs.next()){
@ -327,28 +299,19 @@ public class ChartServiceImpl extends Service implements ChartService {
// 遍历岗位、查询对应岗位下的人员
if(isRealTime){
if(isRealDimension){
sql="select a.id,a.lastname as name,a.belongto ,a.companyworkyear,a.dsporder,a.accounttype from hrmresource a where a.status in ("+statusValue+") and a.departmentid = ? and a.jobtitle = ?";
sql="select a.id,a.lastname as name ,a.belongto ,a.companyworkyear from hrmresource a where a.status < 4 and a.departmentid = ? and a.jobtitle = ?";
}else{
sql="select a.id,a.lastname as name ,a.belongto ,a.companyworkyear,a.accounttype from hrmresource a inner join hrmresourcevirtual b on a.id = b.resourceid where a.status in ("+statusValue+") and b.departmentid = ? and a.jobtitle = ?";
sql="select a.id,a.lastname as name ,a.belongto ,a.companyworkyear from hrmresource a inner join hrmresourcevirtual b on a.id = b.resourceid where a.status < 4 and b.departmentid = ? and a.jobtitle = ?";
}
}else{
sql="select a.resourceid as id,a.lastname as name ,a.belongto ,a.companyworkyear,a.accounttype from jcl_chart_resource a where a.status in ("+statusValue+") and a.departmentid = ? and a.jobtitleid = ? and versionid = "+versionId;
}
if(!isBelongTo){
sql+=" and (a.accounttype = 0 or a.accounttype is null)";
}
if(isRealTime){
sql+=" order by dsporder";
sql="select a.resourceid as id,a.lastname as name ,a.belongto ,a.companyworkyear from jcl_chart_resource a where a.status < 4 and a.departmentid = ? and a.jobtitleid = ? and versionid = "+versionId;
sql="select a.id,a.lastname as name ,a.belongto ,a.companyworkyear,a.accounttype,a.managerid from hrmresource a where a.status in ("+statusValue+") and a.departmentid = ? ";
sql="select a.id,a.lastname as name ,a.belongto ,a.companyworkyear from hrmresource a where a.status < 4 and a.departmentid = ? ";
}else{
sql="select a.id,a.lastname as name ,a.belongto ,a.companyworkyear,a.accounttype,b.managerid from hrmresource a inner join hrmresourcevirtual b on a.id = b.resourceid where a.status in ("+statusValue+") and b.departmentid = ? ";
sql="select a.id,a.lastname as name ,a.belongto ,a.companyworkyear from hrmresource a inner join hrmresourcevirtual b on a.id = b.resourceid where a.status < 4 and b.departmentid = ? ";
}
}else{
sql="select a.resourceid as id,a.lastname as name ,a.belongto ,a.companyworkyear,a.accounttype,a.manager as managerid from jcl_chart_resource a where a.status in ("+statusValue+") and a.departmentid = ? and versionid = "+versionId;
}
if(!isBelongTo){
sql+=" and (a.accounttype = 0 or a.accounttype is null)";
sql="select a.resourceid as id,a.lastname as name ,a.belongto ,a.companyworkyear from jcl_chart_resource a where a.status < 4 and a.departmentid = ? and versionid = "+versionId;
@ -465,32 +404,15 @@ public class ChartServiceImpl extends Service implements ChartService {
return"select companyvirtualid as id,companyname as name,'0' as type from "+COMPANY_TABLE+" where "+
" versionid = "+versionId+" and companyvirtualid = "+dimension;
}
}else{
StringnumSql=",a.job_num,a.staff_num";
if(!isRealDimension){
numSql="";
}
if(root.startsWith("d")){
root=root.replace("d","");
if(hasVirtualFields){
if(showVirtual){
return"select "+DEPARTMENT_ID+" as id,a.departmentname as name,'2' as type ,isvirtual as isvitual"+numSql+" from "+DEPARTMENT_TABLE+" a where (a.canceled is null or a.canceled != '1') and "+DEPARTMENT_ID+" = '"+root+"' and versionid = "+versionId;
}else{
return"select "+DEPARTMENT_ID+" as id,a.departmentname as name,'2' as type ,isvirtual as isvitual"+numSql+" from "+DEPARTMENT_TABLE+" a where (canceled is null or canceled != '1') and (isvirtual is null or isvirtual != '1') and "+DEPARTMENT_ID+" = '"+root+"' and versionid = "+versionId;
}
}else{
return"select "+DEPARTMENT_ID+" as id,a.departmentname as name,'2' as type"+numSql+" from "+DEPARTMENT_TABLE+" a where (canceled is null or canceled != '1') and "+DEPARTMENT_ID+" = '"+root+"' and versionid = "+versionId;
}
}else{
if(hasVirtualFields){
if(showVirtual){
return"select "+SUB_COMPANY_ID+" as id,subcompanyname as name,'1' as type,isvirtual as isvitual" +numSql+" from " +SUB_COMPANY_TABLE+" a where versionid = "+versionId+" and " +SUB_COMPANY_ID+" = " +root;
return"select "+SUB_COMPANY_ID+" as id,subcompanyname as name,'1' as type,isvirtual as isvitual,a.job_num,a.staff_num from "+SUB_COMPANY_TABLE+" a where versionid = "+versionId+" and subcompanyid = "+root;
}else{
return"select "+SUB_COMPANY_ID+" as id,subcompanyname as name,'1' as type,isvirtual as isvitual" +numSql+" from " +SUB_COMPANY_TABLE+" a where versionid = "+versionId+" and " +SUB_COMPANY_ID+" = " +root+" and (isvirtual is null or isvirtual != '1')";
return"select "+SUB_COMPANY_ID+" as id,subcompanyname as name,'1' as type,isvirtual as isvitual,a.job_num,a.staff_num from "+SUB_COMPANY_TABLE+" a where versionid = "+versionId+" and subcompanyid = "+root+" and (isvirtual is null or isvirtual != '1')";
}
}else{
return"select "+SUB_COMPANY_ID+" as id,subcompanyname as name,'1' as type"+numSql+" from "+SUB_COMPANY_TABLE+" a where versionid = "+versionId+" and "+SUB_COMPANY_ID+" = "+root;
}
return"select "+SUB_COMPANY_ID+" as id,subcompanyname as name,'1' as type,a.job_num,a.staff_num from "+SUB_COMPANY_TABLE+" a where versionid = "+versionId+" and subcompanyid = "+root;
}
}
}
@ -546,19 +468,6 @@ public class ChartServiceImpl extends Service implements ChartService {
@ -1399,18 +1272,6 @@ public class ChartServiceImpl extends Service implements ChartService {
return"select id,companyname as name,'0' as type from "+COMPANY_TABLE+" where id = '"+dimension+"'";
}
}else{
if(root.startsWith("d")){
root=root.replace("d","");
if(hasVirtualFields){
if(showVirtual){
return"select a.id,a.departmentname as name,'2' as type ,b.bmlx as isvitual,c.on_job_num,c.staff_num from "+DEPARTMENT_TABLE+" a left join "+DEPARTMENT_DEFINED_TABLE+" b on a.id = b.deptid left join jcl_org_onjob c on a.id=c.data_id and c.type=2 where (a.canceled is null or a.canceled != '1') and a.id = '"+root+"'";
}else{
return"select a.id,a.departmentname as name,'2' as type ,b.bmlx as isvitual,c.on_job_num,c.staff_num from "+DEPARTMENT_TABLE+" a left join hrmdepartmentdefined b on a.id = b.deptid left join jcl_org_onjob c on a.id=c.data_id and c.type=2 where (canceled is null or canceled != '1') and (b.bmlx is null or b.bmlx != '1') and a.id = '"+root+"'";
}
}else{
return"select a.id,a.departmentname as name,'2' as type,b.on_job_num,b.staff_num from "+DEPARTMENT_TABLE+" a left join jcl_org_onjob b on a.id=b.data_id and b.type=2 where (canceled is null or canceled != '1') and a.id = '"+root+"'";
}
}else{
if(hasVirtualFields){
if(showVirtual){
return"select a.id,a.subcompanyname as name,'1' as type ,b.fblx as isvitual,c.on_job_num,c.staff_num from "+SUB_COMPANY_TABLE+" a left join "+SUB_COMPANY_DEFINED_TABLE+" b on a.id = b.subcomid left join jcl_org_onjob c on a.id=c.data_id and c.type=1 where a.id = '"+root+"' order by showorder,id";
@ -1423,7 +1284,6 @@ public class ChartServiceImpl extends Service implements ChartService {
}
}
}
}
/**
*查询实时数据,子元素SQL
@ -1498,21 +1358,17 @@ public class ChartServiceImpl extends Service implements ChartService {
sql="select "+SUB_COMPANY_ID+" as id,a.subcompanyname as name,'1' as type ,isvirtual as isvitual" +numSql+" from " +SUB_COMPANY_TABLE+" a where (a.canceled is null or a.canceled != '1') and (a.supsubcompanyid is null or a.supsubcompanyid = '0') and versionid = "+versionId;
sql="select "+SUB_COMPANY_ID+" as id,a.subcompanyname as name,'1' as type ,isvirtual as isvitual,a.job_num,a.staff_num from " +SUB_COMPANY_TABLE+" a where (a.canceled is null or a.canceled != '1') and (a.supsubcompanyid is null or a.supsubcompanyid = '0') and versionid = "+versionId;
}else{
sql="select "+SUB_COMPANY_ID+" as id,a.subcompanyname as name,'1' as type ,isvirtual as isvitual" +numSql+" from " +SUB_COMPANY_TABLE+" a where (a.canceled is null or a.canceled != '1') and (a.supsubcompanyid is null or a.supsubcompanyid = '0') and (isvirtual is null or isvirtual != '1') and versionid = "+versionId;
sql="select "+SUB_COMPANY_ID+" as id,a.subcompanyname as name,'1' as type ,isvirtual as isvitual,a.job_num,a.staff_num from " +SUB_COMPANY_TABLE+" a where (a.canceled is null or a.canceled != '1') and (a.supsubcompanyid is null or a.supsubcompanyid = '0') and (isvirtual is null or isvirtual != '1') and versionid = "+versionId;
}
}else{
sql="select "+SUB_COMPANY_ID+" as id,a.subcompanyname as name,'1' as type" +numSql+" from " +SUB_COMPANY_TABLE+" a where (a.canceled is null or a.canceled != '1') and (a.supsubcompanyid is null or a.supsubcompanyid = '0') and versionid = "+versionId;
sql="select "+SUB_COMPANY_ID+" as id,a.subcompanyname as name,'1' as type,a.job_num,a.staff_num from " +SUB_COMPANY_TABLE+" a where (a.canceled is null or a.canceled != '1') and (a.supsubcompanyid is null or a.supsubcompanyid = '0') and versionid = "+versionId;
}
if(!isRealDimension){
sql+=" and companyid = "+fObjId;
@ -1521,26 +1377,26 @@ public class ChartServiceImpl extends Service implements ChartService {
case"1":
if(hasVirtualFields){
if(showVirtual){
sql="select "+SUB_COMPANY_ID+" as id,a.subcompanyname as name,'1' as type ,isvirtual as isvitual" +numSql+" from " +SUB_COMPANY_TABLE+" a where (a.canceled is null or a.canceled != '1') and a.supsubcompanyid = '"+fObjId+"' and versionid = "+versionId+
" union select "+DEPARTMENT_ID+" as id,a.departmentname as name,'2' as type ,isvirtual as isvitual" +numSql+" from " +DEPARTMENT_TABLE+" a where (a.canceled is null or a.canceled != '1') and (a.supdepartmentid is null or a.supdepartmentid = '0') and subcompanyid = '"+fObjId+"' and versionid = "+versionId;
sql="select "+SUB_COMPANY_ID+" as id,a.subcompanyname as name,'1' as type ,isvirtual as isvitual,a.job_num,a.staff_num from " +SUB_COMPANY_TABLE+" a where (a.canceled is null or a.canceled != '1') and a.supsubcompanyid = '"+fObjId+"' and versionid = "+versionId+
" union select "+DEPARTMENT_ID+" as id,a.departmentname as name,'2' as type ,isvirtual as isvitual,a.job_num,a.staff_num from " +DEPARTMENT_TABLE+" a where (a.canceled is null or a.canceled != '1') and (a.supdepartmentid is null or a.supdepartmentid = '0') and subcompanyid = '"+fObjId+"' and versionid = "+versionId;
}else{
sql="select "+SUB_COMPANY_ID+" as id,a.subcompanyname as name,'1' as type ,isvirtual as isvitual" +numSql+" from " +SUB_COMPANY_TABLE+" a where (a.canceled is null or a.canceled != '1') and (isvirtual is null or isvirtual != '1') and a.supsubcompanyid = '"+fObjId+"' and versionid = "+versionId+
" union select "+DEPARTMENT_ID+" as id,a.departmentname as name,'2' as type ,isvirtual as isvitual" +numSql+" from " +DEPARTMENT_TABLE+" a where (a.canceled is null or a.canceled != '1') and (a.supdepartmentid is null or a.supdepartmentid = '0') and (isvirtual is null or isvirtual != '1') and subcompanyid = '"+fObjId+"' and versionid = "+versionId;
sql="select "+SUB_COMPANY_ID+" as id,a.subcompanyname as name,'1' as type ,isvirtual as isvitual,a.job_num,a.staff_num from " +SUB_COMPANY_TABLE+" a where (a.canceled is null or a.canceled != '1') and (isvirtual is null or isvirtual != '1') and a.supsubcompanyid = '"+fObjId+"' and versionid = "+versionId+
" union select "+DEPARTMENT_ID+" as id,a.departmentname as name,'2' as type ,isvirtual as isvitual,a.job_num,a.staff_num from " +DEPARTMENT_TABLE+" a where (a.canceled is null or a.canceled != '1') and (a.supdepartmentid is null or a.supdepartmentid = '0') and (isvirtual is null or isvirtual != '1') and subcompanyid = '"+fObjId+"' and versionid = "+versionId;
}
}else{
sql="select "+SUB_COMPANY_ID+" as id,a.subcompanyname as name,'1' as type" +numSql+" from " +SUB_COMPANY_TABLE+" a where (canceled is null or canceled != '1') and supsubcompanyid = '"+fObjId+"' and versionid = "+versionId+
" union select "+DEPARTMENT_ID+" as id,a.departmentname as name,'2' as type" +numSql+" from " +DEPARTMENT_TABLE+" a where (canceled is null or canceled != '1') and (supdepid is null or supdepid = '0') and subcompanyid = '"+fObjId+"' and versionid = "+versionId;
sql="select "+SUB_COMPANY_ID+" as id,a.subcompanyname as name,'1' as type,a.job_num,a.staff_num from " +SUB_COMPANY_TABLE+" a where (canceled is null or canceled != '1') and supsubcompanyid = '"+fObjId+"' and versionid = "+versionId+
" union select "+DEPARTMENT_ID+" as id,a.departmentname as name,'2' as type,a.job_num,a.staff_num from " +DEPARTMENT_TABLE+" a where (canceled is null or canceled != '1') and (supdepid is null or supdepid = '0') and subcompanyid = '"+fObjId+"' and versionid = "+versionId;
}
break;
case"2":
if(hasVirtualFields){
if(showVirtual){
sql="select "+DEPARTMENT_ID+" as id,a.departmentname as name,'2' as type ,isvirtual as isvitual" +numSql+" from " +DEPARTMENT_TABLE+" a where (a.canceled is null or a.canceled != '1') and supdepartmentid = '"+fObjId+"' and versionid = "+versionId;
sql="select "+DEPARTMENT_ID+" as id,a.departmentname as name,'2' as type ,isvirtual as isvitual,a.job_num,a.staff_num from " +DEPARTMENT_TABLE+" a where (a.canceled is null or a.canceled != '1') and supdepartmentid = '"+fObjId+"' and versionid = "+versionId;
}else{
sql="select "+DEPARTMENT_ID+" as id,a.departmentname as name,'2' as type ,isvirtual as isvitual" +numSql+" from " +DEPARTMENT_TABLE+" a where (canceled is null or canceled != '1') and (isvirtual is null or isvirtual != '1') and a.supdepartmentid = '"+fObjId+"' and versionid = "+versionId;
sql="select "+DEPARTMENT_ID+" as id,a.departmentname as name,'2' as type ,isvirtual as isvitual,a.job_num,a.staff_num from " +DEPARTMENT_TABLE+" a where (canceled is null or canceled != '1') and (isvirtual is null or isvirtual != '1') and a.supdepartmentid = '"+fObjId+"' and versionid = "+versionId;
}
}else{
sql="select "+DEPARTMENT_ID+" as id,a.departmentname as name,'2' as type" +numSql+" from " +DEPARTMENT_TABLE+" a where (canceled is null or canceled != '1') and supdepid = '"+fObjId+"' and versionid = "+versionId;
sql="select "+DEPARTMENT_ID+" as id,a.departmentname as name,'2' as type,a.job_num,a.staff_num from " +DEPARTMENT_TABLE+" a where (canceled is null or canceled != '1') and supdepid = '"+fObjId+"' and versionid = "+versionId;
}
break;
default:
@ -1586,6 +1442,7 @@ public class ChartServiceImpl extends Service implements ChartService {
// sql = "select id from " + SUB_COMPANY_TABLE + " where (supsubcomid is null or supsubcomid = '0') and companyid = '" + fObjId + "'";
// break;
// case "1":
// if (hasVirtualFields && !showVirtual) {
// sql = "select a.id from " + SUB_COMPANY_TABLE + " a left join " + SUB_COMPANY_DEFINED_TABLE + " b on a.id = b.subcomid where (a.canceled is null or a.canceled != '1') and (b.fblx is null or b.fblx != '1') and a.supsubcomid = '" + fObjId + "' union select a.id from " + DEPARTMENT_TABLE + " a left join " + DEPARTMENT_DEFINED_TABLE + " b on a.id = b.deptid where (a.canceled is null or a.canceled != '1') and (a.supdepid is null or a.supdepid = '0') and (b.bmlx is null or b.bmlx != '1') and subcompanyid1 = '" + fObjId + "'";
// } else {
// sql = "select id from " + SUB_COMPANY_TABLE + " where (canceled is null or canceled != '1') and supsubcomid = '" + fObjId + "' union select id from " + DEPARTMENT_TABLE + " where (canceled is null or canceled != '1') and (supdepid is null or supdepid = '0') and subcompanyid1 = '" + fObjId + "'";
// }
// break;
// case "2":
// if (hasVirtualFields && !showVirtual) {
// sql = "select a.id from " + DEPARTMENT_TABLE + " a left join hrmdepartmentdefined b on a.id = b.deptid where (canceled is null or canceled != '1') and (b.bmlx is null or b.bmlx != '1') and a.supdepid = '" + fObjId + "'";
// } else {
// sql = "select id from " + DEPARTMENT_TABLE + " where (canceled is null or canceled != '1') and supdepid = '" + fObjId + "'";
// }
// break;
// default:
// break;
// }
//}
//if (StringUtils.isNotBlank(sql)) {
// RecordSet rs = new RecordSet();
// rs.executeQuery(sql);
// return rs.next();
//}
returnfalse;
}
@ -1672,6 +1558,9 @@ public class ChartServiceImpl extends Service implements ChartService {
*@return人员名称
*/
privateStringgetDepartmentLeader(Stringids){
if(!isRealTime){
returnids;
}
if(StringUtils.isBlank(ids)){
return"";
}
@ -1724,10 +1613,10 @@ public class ChartServiceImpl extends Service implements ChartService {
@ -1735,37 +1624,36 @@ public class ChartServiceImpl extends Service implements ChartService {
subCompany=subCompany.replace("d","");
if(isSearchCurrent){
sql="select "+dbType.concat("d","id")+"as id, id as value, departmentname as title, "+dbType.concat("d","supdepid")+" as pId from hrmdepartment where (canceled is null or canceled != '1') and "+dbType.ifNull("supdepid","0")+" = "+subCompany;
sql+=" order by showorder,id ";
if(isNotCurrentDimension){
if(isCurrentDimension){
sql="select "+dbType.concat("d","id")+"as id, id as value, departmentname as title, "+dbType.concat("d","supdepid")+" as pId from hrmdepartmentvirtual where (canceled is null or canceled != '1') and "+dbType.ifNull("supdepid","0")+" = "+subCompany;
}
sql+=" order by showorder,id ";
}else{
sql="select "+dbType.concat("d","departmentid")+"as id, departmentid as value, departmentname as title, "+dbType.concat("d","supdepartmentid")+" as pId from jcl_chart_department where (canceled is null or canceled != '1') and "+dbType.ifNull("supdepartmentid","0")+" = "+subCompany;
if(isNotCurrentDimension){
if(isCurrentDimension){
sql="select "+dbType.concat("d","departmentvirtualid")+"as id, departmentvirtualid as value, departmentname as title, "+dbType.concat("d","supdepid")+" as pId from jcl_chart_departmentvirtual where (canceled is null or canceled != '1') and "+dbType.ifNull("supdepid","0")+" = "+subCompany;
}
// 添加时间轴条件
sql+=" and versionid = "+versionId;
}
}else{
// TODO 分权
if(isSearchCurrent){
sql="select "+dbType.concat("","id")+" as id, id as value, subcompanyname as title, supsubcomid as pId, showorder from hrmsubcompany where (canceled is null or canceled != '1') and "+dbType.ifNull("supsubcomid","0")+" = "+subCompany+
" union select "+dbType.concat("d","id")+"as id, id as value, departmentname as title, subcompanyid1 as pId, showorder from hrmdepartment where (canceled is null or canceled != '1') and (supdepid is null or supdepid =0) and "+dbType.ifNull("subcompanyid1","0")+" = "+subCompany;
sql+=" order by showorder,id ";
if(isNotCurrentDimension){
if(isCurrentDimension){
sql="select id as id, id as value, subcompanyname as title, supsubcomid as pId from hrmsubcompanyvirtual where (canceled is null or canceled != '1') and "+dbType.ifNull("supsubcomid","0")+" = "+subCompany+" and companyid = '"+dimension+"' "+
" union select "+dbType.concat("d","id")+"as id, id as value, departmentname as title, subcompanyid1 as pId from hrmdepartmentvirtual where (canceled is null or canceled != '1') and (supdepid is null or supdepid =0) and"+dbType.ifNull("subcompanyid1","0")+" = "+subCompany;
}
sql+=" order by showorder,id ";
}else{
sql="select "+dbType.concat("","subcompanyid")+" as id, subcompanyid as value, subcompanyname as title, supsubcompanyid as pId from jcl_chart_subcompany where (canceled is null or canceled != '1') and "+dbType.ifNull("supsubcompanyid","0")+" = "+subCompany+" and versionid = "+versionId+
" union select "+dbType.concat("d","departmentid")+"as id, departmentid as value, departmentname as title, subcompanyid as pId from jcl_chart_department where (canceled is null or canceled != '1') and (supdepartmentid is null or supdepartmentid =0) and " +dbType.ifNull("subcompanyid","0")+" = "+subCompany+" and versionid = "+versionId;
if(isNotCurrentDimension){
sql="select "+dbType.concat("","subcompanyvirtualid")+" as id, subcompanyvirtualid as value, subcompanyname as title, supsubcompanyid as pId from jcl_chart_subcompanyvirtual where (canceled is null or canceled != '1') and "+dbType.ifNull("supsubcompanyid","0")+" = "+subCompany+" and companyid = '"+dimension+"' "+" and versionid = "+versionId+
" union select "+dbType.concat("d","departmentvirtualid")+"as id, departmentvirtualid as value, departmentname as title, subcompanyid as pId from jcl_chart_departmentvirtual where (canceled is null or canceled != '1') and (supdepid is null or supdepid =0) and"+dbType.ifNull("subcompanyid","0")+" = "+subCompany+" and versionid = "+versionId;
sql="select "+dbType.concat("","subcompanyid")+" as id, subcompanyid as value, subcompanyname as title, supsubcompanyid as pId from jcl_chart_subcompany where (canceled is null or canceled != '1') and "+dbType.ifNull("supsubcompanyid","0")+" = "+subCompany+
" union select "+dbType.concat("d","subcompanyid")+"as id, subcompanyid as value, departmentname as title, subcompanyid as pId from jcl_chart_department where (canceled is null or canceled != '1') and (supdepartmentid is null or supdepartmentid =0) and " +dbType.ifNull("subcompanyid","0")+" = "+subCompany;
if(isCurrentDimension){
sql="select "+dbType.concat("","subcompanyvirtualid")+" as id, subcompanyvirtualid as value, subcompanyname as title, supsubcompanyid as pId from jcl_chart_subcompanyvirtual where (canceled is null or canceled != '1') and "+dbType.ifNull("supsubcompanyid","0")+" = "+subCompany+" and companyid = '"+dimension+"' "+
" union select "+dbType.concat("d","departmentvirtualid")+"as id, departmentvirtualid as value, departmentname as title, subcompanyid as pId from jcl_chart_departmentvirtual where (canceled is null or canceled != '1') and (supdepid is null or supdepid =0) and"+dbType.ifNull("subcompanyid","0")+" = "+subCompany;
}
//// 添加时间轴条件
//sql += " and versionid = " + versionId;
// 添加时间轴条件
sql+=" and versionid = "+versionId;
}
}
returnsql;
@ -1787,7 +1675,7 @@ public class ChartServiceImpl extends Service implements ChartService {
//rs.executeUpdate("update jcl_org_job set parent_comp =?,ec_company =?,parent_dept =?,ec_department =? where ec_department =?", targetDepartment.getSubCompanyId1(), targetDepartment.getSubCompanyId1(), targetDepartment.getId(), targetEcDeptId, mergeParam.getId());
// 更新岗位组织架构图
//for (JobPO jobPO : firstChildJobList) {
// // 刷新组织架构图
// new JobTriggerRunnable(jobPO.getId()).run();
//}
// 更新当前部门下的人员
rs.executeUpdate("update hrmresource set SUBCOMPANYID1 =?,DEPARTMENTID =? where DEPARTMENTID =?",targetDepartment.getSubCompanyId1(),targetEcDeptId,mergeEcDeptId);
booleanexecuteUpdate=rs.executeUpdate("update HrmCompany set COMPANYNAME = ?,COMPANYDESC=?,COMPANYWEB=? where id = ?",companyname,companydesc,companyweb,id);
//TODO new GroupTriggerRunnable(params).run();
returnexecuteUpdate;
}
@ -93,10 +93,10 @@ public class GroupServiceImpl extends Service implements GroupService {
rs.executeQuery("select resourceid,workcode,lastname,sex,department,subcompany,jobtitle,mobile from jcl_chart_resource where status in (" +statusValue+") and departmentid = ? and versionid = ?",departmentId,versionId);
rs.executeQuery("select resourceid,workcode,lastname,sex,department,subcompany,jobtitle,mobile from jcl_chart_resource where departmentid = ? and versionid = ?",departmentId,versionId);
" from hrmresourcevirtual v inner join hrmresource h on v.resourceid = h.id and h.status in (" +statusValue+") and v.virtualtype = ? and v.departmentid = ?",dimension,departmentId);
" from hrmresourcevirtual v inner join hrmresource h on v.resourceid = h.id and v.virtualtype = ? and v.departmentid = ?",dimension,departmentId);
while(rs.next()){
ResourceChartPObuild=ResourceChartPO.builder()
.id((long)Util.getIntValue(rs.getString("id")))
@ -583,31 +515,17 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
Stringsql="select id as id, id as value, subcompanyname as title, supsubcomid as pId from hrmsubcompany where (canceled is null or canceled != '1') and "+DBType.get(newRecordSet().getDBType()).ifNull("supsubcomid","0")+" = '0'";
companyTree.add(CompanyTreePO.builder().id(rs.getString("id")).pId(rs.getString("pId")).value(rs.getString("value")).title(rs.getString("title")).isLeaf(judgeTreeLeaf("select id from hrmsubcompany where (canceled is null or canceled != '1') and supsubcomid = ?",rs.getString("id"))).build());
sql="select id as id, id as value, subcompanyname as title, supsubcomid as pId from hrmsubcompany where (canceled is null or canceled != '1') and "+DBType.get(newRecordSet().getDBType()).ifNull("supsubcomid","0")+" = ? ";
Chengliang