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

编制

This commit is contained in:
liuliang 2025-08-26 13:51:29 +08:00
parent e2d4ffa223
commit dfa20fc352
5 changed files with 46 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,6 +123,7 @@ public class CommonServiceImpl implements CommonService {
QueryDto queryDto = new QueryDto();
queryDto.setTableId(tableId);
queryDto.setGroupId(groupId);
queryDto.setPageSize(9999);
Map<String, Object> resultMap = dsSetService.getListDatas(SourceType.getSourceTypeByValue(sourceType),queryDto);
resultList = (List<Map<String, Object>>)resultMap.get("list");
}

10
jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/controller/ChangeOrganzationController.java
View File

@ -12,6 +12,7 @@ import com.weaver.seconddev.jcl.organization.entity.Department;
import com.weaver.seconddev.jcl.organization.entity.Employee;
import com.weaver.seconddev.jcl.organization.service.AuthorizedStrengthService;
import com.weaver.seconddev.jcl.organization.service.OrganaztionService;
import com.weaver.seconddev.jcl.organization.service.SysDepartmentService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -30,6 +31,8 @@ public class ChangeOrganzationController extends BaseCommonController {
@Autowired
private OrganaztionService organaztionService;
@Autowired
private SysDepartmentService sysDepartmentService;
/**
* 添加员工部门
@ -53,8 +56,11 @@ public class ChangeOrganzationController extends BaseCommonController {
@PostMapping("/delOrganaztionDepartment")
public WeaResult<Map<String, Object>> delOrganaztionDepartment(@RequestBody Department department){
Map<String, Object> actionMap = new HashMap<>();
organaztionService.delOrganaztionDepartment(department,this.getCurrentUser());
try {
organaztionService.delOrganaztionDepartment(department,this.getCurrentUser());
}catch (Exception e){
return WeaResult.fail(e.getMessage(),e);
}
return WeaResult.success(actionMap);
}
/**

2
jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/OrganaztionService.java
View File

@ -26,4 +26,6 @@ public interface OrganaztionService {
void updateDepartmentStatus(Map<String, Object> params);
Map<String,Object> getDepartmentChangeToken(Map<String, Object> params);
}

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

@ -8,7 +8,6 @@ import com.weaver.seconddev.jcl.organization.service.AuthorizedStrengthService;
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;
@ -95,17 +94,17 @@ public class AuthorizedStrengthServiceImpl implements AuthorizedStrengthService
dataMap2.put("zy",personYdzqMonthMap.get("preAddEmpCount"));
dataMap2.put("ysf",personYdzqMonthMap.get("preSubEmpCount"));
dataMap2.put("kybz",personYdzqMonthMap.get("estLackCount"));
List<Map<String, Object>> gradeList = (List<Map<String, Object>>)personYdzqMonthMap.get("grade");
String gradeIds = "";
String gradeNames = "";
for (Map<String, Object> gradeMap :gradeList){
gradeIds += gradeMap.get("id")+",";
gradeNames += gradeMap.get("name")+",";
}
gradeIds = gradeIds.substring(0,gradeIds.length()-1);
gradeNames = gradeNames.substring(0,gradeNames.length()-1);
dataMap2.put("grade",gradeIds);
dataMap2.put("gradeName",gradeNames);
// List<Map<String, Object>> gradeList = (List<Map<String, Object>>)personYdzqMonthMap.get("grade");
// String gradeIds = "";
// String gradeNames = "";
// for (Map<String, Object> gradeMap :gradeList){
// gradeIds += gradeMap.get("id")+",";
// gradeNames += gradeMap.get("name")+",";
// }
// gradeIds = gradeIds.substring(0,gradeIds.length()-1);
// gradeNames = gradeNames.substring(0,gradeNames.length()-1);
// dataMap2.put("grade",gradeIds);
// dataMap2.put("gradeName",gradeNames);
List<Map<String, Object>> positionList = (List<Map<String, Object>>)personYdzqMonthMap.get("position");
String positionIds = "";
@ -167,15 +166,15 @@ public class AuthorizedStrengthServiceImpl implements AuthorizedStrengthService
List<Map<String, Object>> jobAdjustList = jobAdjustGroup.get(entry.getKey());
List<Map<String, Object>> jobResultList = Lists.newArrayList();
if (jobAdjustList != null){
Map<String,List<Map<String, Object>>> jobGroupByPositionAndGradle = jobAdjustList.stream().collect(Collectors.groupingBy(e->e.get("position")+"&"+e.get("grade")));
Map<String,List<Map<String, Object>>> jobGroupByPositionAndGradle = jobAdjustList.stream().collect(Collectors.groupingBy(e->e.get("position").toString()));
for (Map.Entry<String,List<Map<String, Object>>> jobentry: jobGroupByPositionAndGradle.entrySet()){
Map<String,Object> jobResultMap = Maps.newHashMap();
List<Map<String, Object>> jobList = jobentry.getValue();
jobResultMap.put("position",jobList.get(0).get("position"));
jobResultMap.put("positionName",jobList.get(0).get("positionName"));
jobResultMap.put("grade",jobList.get(0).get("grade"));
jobResultMap.put("gradeName",jobList.get(0).get("gradeName"));
// jobResultMap.put("grade",jobList.get(0).get("grade"));
// jobResultMap.put("gradeName",jobList.get(0).get("gradeName"));
jobResultMap.put("jobList",jobList);
jobResultList.add(jobResultMap);
}

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

@ -9,6 +9,7 @@ import com.weaver.seconddev.jcl.common.service.CommonService;
import com.weaver.seconddev.jcl.organization.entity.Department;
import com.weaver.seconddev.jcl.organization.exception.EmployeeJclRunTimeException;
import com.weaver.seconddev.jcl.organization.service.OrganaztionService;
import com.weaver.seconddev.jcl.organization.service.SysDepartmentService;
import com.weaver.seconddev.jcl.organization.util.CommonUtils;
import com.weaver.seconddev.jcl.organization.util.DatabaseUtils;
import com.weaver.seconddev.jcl.organization.util.DateUtil;
@ -33,6 +34,9 @@ public class OrganaztionSeviceImpl implements OrganaztionService {
private static final Logger log = LoggerFactory.getLogger(OrganaztionSeviceImpl.class);
@Autowired
private SyncDataUtils syncDataUtils;
@Autowired
private SysDepartmentService sysDepartmentService;
@Override
@ -58,8 +62,23 @@ public class OrganaztionSeviceImpl implements OrganaztionService {
@Override
public void delOrganaztionDepartment(Department department, SimpleEmployee employee) {
String sql = "update uf_organization_bghzzsj set delete_type='1' where bh=?";
databaseUtils.execute(sql,CommonUtils.getParamList(department.getBh()));
String organzationId = department.getZz();
if (organzationId != null){
Map<String, List<String>> listMap = sysDepartmentService.checkIsNotDisableDept(organzationId);
if (listMap.get("lowerDeptList").size() >0){
throw new EmployeeJclRunTimeException("被删除组织有子部门");
}else if (listMap.get("deptPersonList").size() >0){
throw new EmployeeJclRunTimeException("被删除组织下存在人员");
}
}else {
String querySql = "select * from uf_organization_bghzzsj where sjzzbh=?";
List<Map<String, Object>> list = databaseUtils.getSqlList(querySql,CommonUtils.getParamList(department.getBh()));
if (list.size() > 0){
throw new EmployeeJclRunTimeException("被删除组织下存在子部门");
}
}
String sql = "update uf_organization_bghzzsj set delete_type='3',is_delete='1' where bh=? and form_data_id=? ";
databaseUtils.execute(sql,CommonUtils.getParamList(department.getBh(),department.getForm_data_id()));
}