liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'v3' (#186) from feature/cl into develop 

Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/186
This commit is contained in:
liang.cheng 2023-07-11 16:08:30 +08:00
parent 914649a35b 54abf562a4
commit 4e5eacfb38
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/engine/organization/service/impl/ChartServiceImpl.java
View File

@ -329,15 +329,24 @@ public class ChartServiceImpl extends Service implements ChartService {
* 获取历史顶部元素sql * 获取历史顶部元素sql
* @param root * @param root
* @param dimension 维度ID * @param dimension 维度ID
* @param id * @param vesionId
* @return * @return
*/ */
private String getLastTimeTopSql(String root, String dimension, String id) { private String getLastTimeTopSql(String root, String dimension, String vesionId) {
if ("0".equals(root)) { if ("0".equals(root)) {
//查询集团维度历史数据 //查询集团维度历史版本
if ("0".equals(dimension)) {
//组织维度
return "select id,companyname as name,'0' as type from hrmcompany";
} else {
//查询其他维度集团版本信息
return "select id,companyname as name,'0' as type from jcl_chart_companyvirtual where " +
" versionid = "+vesionId+" and companyvirtualid = "+dimension;
}
}else {
return "select id,subcompanyname as name,'1' as type from jcl_chart_subcompanyvirtual where " +
" versionid= "+vesionId+" and subcompanyvirtualid"+root;
} }
return null;
} }
/** /**