xuxy
/
jucailin_eb_product
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

编制

This commit is contained in:
liuliang 2025-07-28 15:03:27 +08:00
parent fea05c7574
commit 01b799da7a
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/common/service/impl/CommonServiceImpl.java
View File

@ -8,9 +8,12 @@ import com.weaver.ebuilder.datasource.api.query.dto.dw.QueryDto;
import com.weaver.ebuilder.datasource.api.query.dto.dw.TableQuery;
import com.weaver.ebuilder.datasource.api.service.DataSetService;
import com.weaver.seconddev.jcl.common.service.CommonService;
import com.weaver.seconddev.jcl.organization.service.impl.AuthorizedStrengthServiceImpl;
import com.weaver.seconddev.jcl.organization.util.CommonUtils;
import com.weaver.seconddev.jcl.organization.util.DatabaseUtils;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -19,7 +22,7 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
@Slf4j
@Service
public class CommonServiceImpl implements CommonService {
@ -28,6 +31,8 @@ public class CommonServiceImpl implements CommonService {
@Autowired
private DataSetService dsSetService;
private static final Logger log = LoggerFactory.getLogger(CommonServiceImpl.class);
@Override
public Map<String, Object> updateCommon(Map<String, Object> param) {
@ -112,7 +117,7 @@ public class CommonServiceImpl implements CommonService {
tableQuery.setGroupId(groupId);
tableQuery.setName(sourceName);
List<Map<String, Object>> dataSets = dsSetService.getDataSets(tableQuery);
log.info("dataSets :[{}]",dataSets);
log.error("dataSets:[{}]",dataSets);
if (dataSets.size() > 0){
String tableId = CommonUtils.null2String(dataSets.get(0).get("id"));
QueryDto queryDto = new QueryDto();

15
jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/AuthorizedStrengthServiceImpl.java
View File

@ -9,6 +9,8 @@ import com.weaver.seconddev.jcl.organization.util.CommonUtils;
import com.weaver.seconddev.jcl.organization.util.DatabaseUtils;
import com.weaver.seconddev.jcl.organization.util.DateUtil;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -16,7 +18,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Slf4j
@Service
public class AuthorizedStrengthServiceImpl implements AuthorizedStrengthService {
@Autowired
@ -24,11 +26,14 @@ public class AuthorizedStrengthServiceImpl implements AuthorizedStrengthService
@Autowired
private CommonService commonService;
private static final Logger log = LoggerFactory.getLogger(AuthorizedStrengthServiceImpl.class);
@Override
public Map<String, Object> getDepartmentAuthorizedStrength(Map<String, String> params) {
String sql = "select * from hr_est_cfg where org_id=? and plan_id=? and cfg_year=?";
log.error("params: [{}]",params);
String sql = "select * from e10_other_business.hr_est_cfg where org_id=? and plan_id=? and cfg_year=?";
List<Map<String, Object>> dataList = databaseUtils.getSqlList(sql, CommonUtils.getParamList(params.get("adjustDepartment"),params.get("developPlan"),params.get("adjustYear")));
log.error("hrestcfgList: [{}]",dataList);
List<String> cfgIds = dataList.stream().map(e->e.get("id").toString()).collect(Collectors.toList());
String currentDate = DateUtil.getCurrentMonth();
//人员编制统计数据 数据源
@ -44,13 +49,13 @@ public class AuthorizedStrengthServiceImpl implements AuthorizedStrengthService
((List<Map<String,Object>>)e.get("grade")).get(0).get("id").equals(params.get("grade"))).collect(Collectors.toList());
sql = "select * from hr_est_history where org_id=? and cfg_id in ("+String.join(",",cfgIds)+")";
sql = "select * from e10_other_business.hr_est_history where org_id=? and cfg_id in ("+String.join(",",cfgIds)+")";
List<Map<String, Object>> historyList = databaseUtils.getSqlList(sql,CommonUtils.getParamList(params.get("adjustDepartment")));
String startDate = params.get("adjustYear")+"-01";
List<Map<String, Object>> deparmentAdjust = Lists.newArrayList();
List<Map<String, Object>> jobAdjust = Lists.newArrayList();
for (int i=0;i<11;i++){
for (int i=0;i<=11;i++){
Map<String,Object> dataMap = Maps.newHashMap();
Map<String,Object> dataMap2 = Maps.newHashMap();