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

分部、部门、岗位禁用、合并修复1025

Browse Source
pull/25/head
‘ml’ 3 years ago
parent e198209705
commit f2c5d1227b
6 changed files with 88 additions and 42 deletions
Show Stats Download Patch File Download Diff File

4
src/com/engine/organization/mapper/staff/StaffMapper.xml
Unescape Escape View File

@ -337,9 +337,9 @@
</update> </update>
<select id="getStaffsByParamId" resultMap="BaseResultMap"> <select id="getStaffsByParamId" resultMap="BaseResultMap">
select sum(a.staff_num) as staff_num from jcl_org_staff a select sum(a.staff_num) as staff_num from jcl_org_staff a
inner join jcl_org_staffplan b on a.plan_id = b.id inner join jcl_org_staffplan b on a.plan_id = b.id
WHERE a.delete_type = 0 and b.control_dimension = #{ftype} WHERE a.delete_type = 0 and b.control_dimension = #{ftype}
<if test="compId != null"> <if test="compId != null">
and a.comp_id = #{compId} and a.comp_id = #{compId}
</if> </if>

2
src/com/engine/organization/service/impl/JobServiceImpl.java
Unescape Escape View File

@ -867,7 +867,7 @@ public class JobServiceImpl extends Service implements JobService {
for (HrmResourcePO hrmResourcePO : resourceList) { for (HrmResourcePO hrmResourcePO : resourceList) {
new RecordSet().executeUpdate("UPDATE HRMRESOURCE SET SUBCOMPANYID1 = ? , DEPARTMENTID = ? WHERE UUID =? ", ecCompany, ecDepartment, hrmResourcePO.getUuid()); new RecordSet().executeUpdate("UPDATE HRMRESOURCE SET SUBCOMPANYID1 = ? , DEPARTMENTID = ? WHERE UUID =? ", ecCompany, ecDepartment, hrmResourcePO.getUuid());
// 更新人员Map表信息 // 更新人员Map表信息
new Thread(new HrmResourceTriggerRunnable(hrmResourcePO.getId())).start(); new HrmResourceTriggerRunnable(hrmResourcePO.getId()).run();
} }
} }

10
src/com/engine/organization/thread/CompanyTriggerRunnable.java
Unescape Escape View File

@ -97,7 +97,7 @@ public class CompanyTriggerRunnable implements Runnable {
jclMap.setFDateEnd(new Date(OrganizationDateUtil.stringToDate("2099-12-31").getTime())); jclMap.setFDateEnd(new Date(OrganizationDateUtil.stringToDate("2099-12-31").getTime()));
StaffPO staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffsByParamId(jclMap.getFType(),jclMap.getFObjId().toString(),null, null); StaffPO staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffsByParamId(jclMap.getFType(),jclMap.getFObjId().toString(),null, null);
JclOrgMap jclOrgMapByObjID = MapperProxyFactory.getProxy(JclOrgMapper.class).getJclOrgMapByObjID(currentDate, ModuleTypeEnum.subcompanyfielddefined.getValue().toString(), jclMap.getFObjId().toString()); JclOrgMap jclOrgMapByObjID = MapperProxyFactory.getProxy(JclOrgMapper.class).getJclOrgMapByObjID(jclMap.getFDateBegin(), ModuleTypeEnum.subcompanyfielddefined.getValue().toString(), jclMap.getFObjId().toString());
if (null != jclOrgMapByObjID) { if (null != jclOrgMapByObjID) {
jclMap.setFPlan(jclOrgMapByObjID.getFPlan()); jclMap.setFPlan(jclOrgMapByObjID.getFPlan());
jclMap.setFOnJob(jclOrgMapByObjID.getFOnJob()); jclMap.setFOnJob(jclOrgMapByObjID.getFOnJob());
@ -119,12 +119,12 @@ public class CompanyTriggerRunnable implements Runnable {
} }
if (null != jclOrgMapByObjID) { if (null != jclOrgMapByObjID) {
if (null != jclOrgMapByObjID.getFParentId()) { if (null != jclOrgMapByObjID.getFParentId()) {
updateParentPlanAndJob(currentDate, jclOrgMapByObjID.getFParentId().toString()); updateParentPlanAndJob(jclMap.getFDateBegin(), jclOrgMapByObjID.getFParentId().toString());
} }
} }
if (null != oldCompany) { if (null != oldCompany) {
if(null != oldCompany.getId()){ if(null != oldCompany.getId()){
updateParentPlanAndJob(currentDate, oldCompany.getId().toString()); updateParentPlanAndJob(jclMap.getFDateBegin(), oldCompany.getId().toString());
} }
} }
} }
@ -133,7 +133,7 @@ public class CompanyTriggerRunnable implements Runnable {
/** /**
* 更新上级部门在编、在岗数 * 更新上级部门在编、在岗数
*/ */
void updateParentPlanAndJob(String currentDate, String parentId) { void updateParentPlanAndJob(Date currentDate, String parentId) {
JclOrgMap parentJclOrgMap = MapperProxyFactory.getProxy(JclOrgMapper.class).getJclOrgMapById(currentDate, parentId); JclOrgMap parentJclOrgMap = MapperProxyFactory.getProxy(JclOrgMapper.class).getJclOrgMapById(currentDate, parentId);
if (null != parentJclOrgMap) { if (null != parentJclOrgMap) {
// 上级部门当前在编、在岗数 // 上级部门当前在编、在岗数
@ -146,7 +146,7 @@ public class CompanyTriggerRunnable implements Runnable {
parentJclOrgMap.setFPlan(null != staffPO ? staffPO.getStaffNum() : 0); parentJclOrgMap.setFPlan(null != staffPO ? staffPO.getStaffNum() : 0);
parentJclOrgMap.setFOnJob(0); parentJclOrgMap.setFOnJob(0);
} }
parentJclOrgMap.setFDateBegin(new Date(OrganizationDateUtil.stringToDate(currentDate).getTime())); parentJclOrgMap.setFDateBegin(currentDate);
parentJclOrgMap.setFDateEnd(new Date(OrganizationDateUtil.stringToDate("2099-12-31").getTime())); parentJclOrgMap.setFDateEnd(new Date(OrganizationDateUtil.stringToDate("2099-12-31").getTime()));
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();

50
src/com/engine/organization/thread/DepartmentTriggerRunnable.java
Unescape Escape View File

@ -33,6 +33,7 @@ public class DepartmentTriggerRunnable implements Runnable {
private final DepartmentPO newDepartment; private final DepartmentPO newDepartment;
private String oldFparentId; private String oldFparentId;
private String moveTarget; private String moveTarget;
private Boolean forbiddenTag = false;
private CompTriggerMapper getCompTriggerMapper() { private CompTriggerMapper getCompTriggerMapper() {
return MapperProxyFactory.getProxy(CompTriggerMapper.class); return MapperProxyFactory.getProxy(CompTriggerMapper.class);
@ -47,10 +48,17 @@ public class DepartmentTriggerRunnable implements Runnable {
this.newDepartment = newDepartment; this.newDepartment = newDepartment;
} }
public DepartmentTriggerRunnable(Boolean forbiddenTag,DepartmentPO oldDepartment, DepartmentPO newDepartment) {
this.oldDepartment = oldDepartment;
this.newDepartment = newDepartment;
this.forbiddenTag = forbiddenTag;
}
public DepartmentTriggerRunnable(Long departmentId) { public DepartmentTriggerRunnable(Long departmentId) {
this.oldDepartment = new DepartmentPO(); this.oldDepartment = new DepartmentPO();
this.newDepartment = MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptById(departmentId); this.newDepartment = MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptById(departmentId);
} }
public DepartmentTriggerRunnable(String moveTarget,DepartmentPO newDepartment) { public DepartmentTriggerRunnable(String moveTarget,DepartmentPO newDepartment) {
this.oldDepartment = new DepartmentPO(); this.oldDepartment = new DepartmentPO();
this.newDepartment = newDepartment; this.newDepartment = newDepartment;
@ -117,26 +125,25 @@ public class DepartmentTriggerRunnable implements Runnable {
jclMap.setFDateEnd(new Date(OrganizationDateUtil.stringToDate("2099-12-31").getTime())); jclMap.setFDateEnd(new Date(OrganizationDateUtil.stringToDate("2099-12-31").getTime()));
// 获取当前生效的本部门map记录 // 获取当前生效的本部门map记录
JclOrgMap jclOrgMapByObjID = MapperProxyFactory.getProxy(JclOrgMapper.class).getJclOrgMapByObjID(currentDate, ModuleTypeEnum.departmentfielddefined.getValue().toString(), Util.null2String(jclMap.getFObjId())); JclOrgMap jclOrgMapByObjID = MapperProxyFactory.getProxy(JclOrgMapper.class).getJclOrgMapByObjID(jclMap.getFDateBegin(), ModuleTypeEnum.departmentfielddefined.getValue().toString(), Util.null2String(jclMap.getFObjId()));
StaffPO staffPO = new StaffPO(); StaffPO staffPO = new StaffPO();
// StaffPO staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffsByParamId(null,jclMap.getFObjId().toString(), null); // StaffPO staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffsByParamId(null,jclMap.getFObjId().toString(), null);
switch (jclMap.getFType()) {
// 分部
case 1:
staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffsByParamId(1,jclMap.getFObjId().toString(), null, null);
break;
// 部门
case 2:
staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffsByParamId(2,null, jclMap.getFObjId().toString(), null);
break;
}
// 取出以该部门为上级部门的在编、在岗数,转移无需计算 // 取出以该部门为上级部门的在编、在岗数,转移无需计算
JclOrgMap jclOrgMap = MapperProxyFactory.getProxy(JclOrgMapper.class).getSumPlanAndJobByFParentId(currentDate, jclMap.getId().toString()); JclOrgMap jclOrgMap = MapperProxyFactory.getProxy(JclOrgMapper.class).getSumPlanAndJobByFParentId(jclMap.getFDateBegin(), jclMap.getId().toString());
if (null != moveTarget) { if (null != moveTarget) {
jclOrgMap = null; jclOrgMap = null;
} }
if (null != jclOrgMapByObjID) { if (null != jclOrgMapByObjID) {
switch (jclOrgMapByObjID.getFType()) {
// 分部
case 1:
staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffsByParamId(1,jclMap.getFObjId().toString(), null, null);
break;
// 部门
case 2:
staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffsByParamId(2,null, jclMap.getFObjId().toString(), null);
break;
}
if (null != jclOrgMap) { if (null != jclOrgMap) {
jclMap.setFPlan((null != staffPO ? staffPO.getStaffNum() : 0) + jclOrgMap.getFPlan()); jclMap.setFPlan((null != staffPO ? staffPO.getStaffNum() : 0) + jclOrgMap.getFPlan());
jclMap.setFOnJob(jclOrgMapByObjID.getFOnJob() + jclOrgMap.getFOnJob()); jclMap.setFOnJob(jclOrgMapByObjID.getFOnJob() + jclOrgMap.getFOnJob());
@ -161,18 +168,22 @@ public class DepartmentTriggerRunnable implements Runnable {
MapperProxyFactory.getProxy(JclOrgMapper.class).insertMap(jclMap); MapperProxyFactory.getProxy(JclOrgMapper.class).insertMap(jclMap);
} }
if(null != jclOrgMapByObjID) { if(null != jclOrgMapByObjID) {
updateParentPlanAndJob(currentDate, jclOrgMapByObjID.getFParentId().toString()); updateParentPlanAndJob(jclMap.getFDateBegin(), jclOrgMapByObjID.getFParentId().toString());
}
// 部门启用，刷新上级数据
if(forbiddenTag){
updateParentPlanAndJob(jclMap.getFDateBegin(), jclMap.getFParentId().toString());
} }
if(null != moveTarget){ if(null != moveTarget){
updateParentPlanAndJob(currentDate, moveTarget); updateParentPlanAndJob(jclMap.getFDateBegin(), moveTarget);
} }
if (null != oldFparentId) { if (null != oldFparentId) {
updateParentPlanAndJob(currentDate, oldFparentId); updateParentPlanAndJob(jclMap.getFDateBegin(), oldFparentId);
} }
} }
} }
private void updateParentPlanAndJob(String currentDate, String parentId) { private void updateParentPlanAndJob(Date currentDate, String parentId) {
// 获取上级部门 // 获取上级部门
JclOrgMap parentJclOrgMap = MapperProxyFactory.getProxy(JclOrgMapper.class).getJclOrgMapById(currentDate, parentId); JclOrgMap parentJclOrgMap = MapperProxyFactory.getProxy(JclOrgMapper.class).getJclOrgMapById(currentDate, parentId);
if (null != parentJclOrgMap) { if (null != parentJclOrgMap) {
@ -180,7 +191,6 @@ public class DepartmentTriggerRunnable implements Runnable {
JclOrgMap jclOrgMapSum = MapperProxyFactory.getProxy(JclOrgMapper.class).getSumPlanAndJobByFParentId(currentDate, parentJclOrgMap.getId().toString()); JclOrgMap jclOrgMapSum = MapperProxyFactory.getProxy(JclOrgMapper.class).getSumPlanAndJobByFParentId(currentDate, parentJclOrgMap.getId().toString());
StaffPO staffPO = new StaffPO(); StaffPO staffPO = new StaffPO();
switch (parentJclOrgMap.getFType()) { switch (parentJclOrgMap.getFType()) {
// 分部
case 1: case 1:
staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffsByParamId(1,parentId, null, null); staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffsByParamId(1,parentId, null, null);
break; break;
@ -191,13 +201,13 @@ public class DepartmentTriggerRunnable implements Runnable {
} }
// 编制表jcl_org_staff中的编制数+下级编制数，工具类判断 // 编制表jcl_org_staff中的编制数+下级编制数，工具类判断
if(null != jclOrgMapSum){ if(null != jclOrgMapSum){
parentJclOrgMap.setFPlan((null != staffPO ? staffPO.getStaffNum() : 0 ) + jclOrgMapSum.getFPlan()); parentJclOrgMap.setFPlan((null != staffPO ? staffPO.getStaffNum() : 0) + jclOrgMapSum.getFPlan());
parentJclOrgMap.setFOnJob(jclOrgMapSum.getFOnJob()); parentJclOrgMap.setFOnJob(jclOrgMapSum.getFOnJob());
}else{ }else{
parentJclOrgMap.setFPlan(null != staffPO ? staffPO.getStaffNum() : 0); parentJclOrgMap.setFPlan(null != staffPO ? staffPO.getStaffNum() : 0);
parentJclOrgMap.setFOnJob(0); parentJclOrgMap.setFOnJob(0);
} }
parentJclOrgMap.setFDateBegin(new Date(OrganizationDateUtil.stringToDate(currentDate).getTime())); parentJclOrgMap.setFDateBegin(currentDate);
parentJclOrgMap.setFDateEnd(new Date(OrganizationDateUtil.stringToDate("2099-12-31").getTime())); parentJclOrgMap.setFDateEnd(new Date(OrganizationDateUtil.stringToDate("2099-12-31").getTime()));
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();

62
src/com/engine/organization/thread/JobTriggerRunnable.java
Unescape Escape View File

@ -28,6 +28,7 @@ public class JobTriggerRunnable implements Runnable {
private final JobPO oldJob; private final JobPO oldJob;
private final JobPO newJob; private final JobPO newJob;
private Boolean forbiddenTag = false;
private CompTriggerMapper getCompTriggerMapper() { private CompTriggerMapper getCompTriggerMapper() {
return MapperProxyFactory.getProxy(CompTriggerMapper.class); return MapperProxyFactory.getProxy(CompTriggerMapper.class);
@ -41,6 +42,11 @@ public class JobTriggerRunnable implements Runnable {
this.oldJob = oldJob; this.oldJob = oldJob;
this.newJob = newJob; this.newJob = newJob;
} }
public JobTriggerRunnable(Boolean forbiddenTag,JobPO oldJob, JobPO newJob) {
this.oldJob = oldJob;
this.newJob = newJob;
this.forbiddenTag = forbiddenTag;
}
public JobTriggerRunnable(Long jobId) { public JobTriggerRunnable(Long jobId) {
this.oldJob = new JobPO(); this.oldJob = new JobPO();
@ -91,7 +97,19 @@ public class JobTriggerRunnable implements Runnable {
// 该岗位有下级岗位时,查询 // 该岗位有下级岗位时,查询
JclOrgMap jclOrgMap = MapperProxyFactory.getProxy(JclOrgMapper.class).getSumPlanAndJobByFParentId(jclMap.getFDateBegin(), jclMap.getId().toString()); JclOrgMap jclOrgMap = MapperProxyFactory.getProxy(JclOrgMapper.class).getSumPlanAndJobByFParentId(jclMap.getFDateBegin(), jclMap.getId().toString());
StaffPO staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffsByParamId(jclMap.getFType(),null,null, jclMap.getFObjId().toString()); StaffPO staffPO = new StaffPO();
switch (jclMap.getFType()) {
// 部门
case 2:
staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffsByParamId(2,null, jclMap.getFObjId().toString(), null);
break;
// 岗位
case 3:
staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffsByParamId(3,null, null, jclMap.getFObjId().toString());
break;
default:
break;
}
if (null != jclOrgMapByObjID) { if (null != jclOrgMapByObjID) {
if (null != jclOrgMap) { if (null != jclOrgMap) {
jclMap.setFPlan((null != staffPO ? staffPO.getStaffNum() : 0) + jclOrgMap.getFPlan()); jclMap.setFPlan((null != staffPO ? staffPO.getStaffNum() : 0) + jclOrgMap.getFPlan());
@ -115,22 +133,24 @@ public class JobTriggerRunnable implements Runnable {
if (1 != newJob.getDeleteType() && 1 != newJob.getForbiddenTag()) { if (1 != newJob.getDeleteType() && 1 != newJob.getForbiddenTag()) {
MapperProxyFactory.getProxy(JclOrgMapper.class).insertMap(jclMap); MapperProxyFactory.getProxy(JclOrgMapper.class).insertMap(jclMap);
if (null != jclOrgMapByObjID) { }
if(null != jclOrgMapByObjID.getFParentId()){ if (null != jclOrgMapByObjID) {
updateParentPlanAndJob(jclMap.getFDateBegin(), jclOrgMapByObjID.getFParentId().toString()); if(null != jclOrgMapByObjID.getFParentId()){
} updateParentPlanAndJob(jclMap.getFDateBegin(), jclOrgMapByObjID.getFParentId().toString());
} }
if (null != oldJob) { }
if (null != oldJob.getId()){ // 部门启用，刷新上级数据
updateParentPlanAndJob(jclMap.getFDateBegin(), oldJob.getId().toString()); if(forbiddenTag){
} updateParentPlanAndJob(jclMap.getFDateBegin(), jclMap.getFParentId().toString());
}
if (null != oldJob) {
if (null != oldJob.getId()){
updateParentPlanAndJob(jclMap.getFDateBegin(), oldJob.getId().toString());
} }
} }
} }
} }
/** /**
* 更新上级部门在编、在岗数 * 更新上级部门在编、在岗数
*/ */
@ -139,12 +159,28 @@ public class JobTriggerRunnable implements Runnable {
if (null != parentJclOrgMap) { if (null != parentJclOrgMap) {
// 上级部门当前在编、在岗数 // 上级部门当前在编、在岗数
JclOrgMap jclOrgMapSum = MapperProxyFactory.getProxy(JclOrgMapper.class).getSumPlanAndJobByFParentId(currentDate, parentJclOrgMap.getId().toString()); JclOrgMap jclOrgMapSum = MapperProxyFactory.getProxy(JclOrgMapper.class).getSumPlanAndJobByFParentId(currentDate, parentJclOrgMap.getId().toString());
StaffPO staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffsByParamId(parentJclOrgMap.getFType(),null,null,parentJclOrgMap.getFObjId().toString()); StaffPO staffPO = new StaffPO();
switch (parentJclOrgMap.getFType()) {
// 分部
case 1:
staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffsByParamId(1, parentJclOrgMap.getFObjId().toString(), null, null);
break;
// 部门
case 2:
staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffsByParamId(2, null, parentJclOrgMap.getFObjId().toString(), null);
break;
// 岗位
case 3:
staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffsByParamId(3, null, parentJclOrgMap.getFObjId().toString(), null);
break;
default:
break;
}
if (null != jclOrgMapSum) { if (null != jclOrgMapSum) {
parentJclOrgMap.setFPlan((null != staffPO ? staffPO.getStaffNum() : 0) + jclOrgMapSum.getFPlan()); parentJclOrgMap.setFPlan((null != staffPO ? staffPO.getStaffNum() : 0) + jclOrgMapSum.getFPlan());
parentJclOrgMap.setFOnJob(jclOrgMapSum.getFOnJob()); parentJclOrgMap.setFOnJob(jclOrgMapSum.getFOnJob());
} else { } else {
parentJclOrgMap.setFPlan(0); parentJclOrgMap.setFPlan(null != staffPO ? staffPO.getStaffNum() : 0);
parentJclOrgMap.setFOnJob(0); parentJclOrgMap.setFOnJob(0);
} }
parentJclOrgMap.setFDateBegin(currentDate); parentJclOrgMap.setFDateBegin(currentDate);

2
src/com/engine/organization/wrapper/DepartmentWrapper.java
Unescape Escape View File

@ -115,7 +115,7 @@ public class DepartmentWrapper extends OrganizationWrapper {
DepartmentPO newDeptById = getDepartmentMapper().getDeptById(params.getId()); DepartmentPO newDeptById = getDepartmentMapper().getDeptById(params.getId());
writeOperateLog(new Object() { writeOperateLog(new Object() {
}.getClass(), deptById.getDeptName(), JSON.toJSONString(params), deptById, newDeptById); }.getClass(), deptById.getDeptName(), JSON.toJSONString(params), deptById, newDeptById);
new Thread(new DepartmentTriggerRunnable(deptById, newDeptById)).start(); new Thread(new DepartmentTriggerRunnable(params.getForbiddenTag(),deptById, newDeptById)).start();
return updateForbiddenTagById; return updateForbiddenTagById;
} }

Write Preview
Loading…
Cancel
Save