TODO注释清理

pull/173/head
dxfeng 2 years ago
parent c115308f9e
commit a2247ddb12

@ -5,7 +5,6 @@ import javax.ws.rs.Path;
/** /**
* @Author liang.cheng * @Author liang.cheng
* @Date 2023/6/27 3:38 PM * @Date 2023/6/27 3:38 PM
* @Description: TODO
* @Version 1.0 * @Version 1.0
*/ */

@ -8,7 +8,6 @@ import lombok.NoArgsConstructor;
/** /**
* @Author liang.cheng * @Author liang.cheng
* @Date 2023/6/29 11:19 AM * @Date 2023/6/29 11:19 AM
* @Description: TODO
* @Version 1.0 * @Version 1.0
*/ */
@Data @Data

@ -5,7 +5,6 @@ import java.util.Map;
/** /**
* @Author liang.cheng * @Author liang.cheng
* @Date 2023/6/27 3:45 PM * @Date 2023/6/27 3:45 PM
* @Description: TODO
* @Version 1.0 * @Version 1.0
*/ */
public interface OrgVirtualService { public interface OrgVirtualService {

@ -469,7 +469,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
String ecDepartmentID = Util.null2String(syncMap.get("id")); String ecDepartmentID = Util.null2String(syncMap.get("id"));
OrganizationAssert.isTrue(StringUtils.isNotBlank(ecDepartmentID), syncMap.get("message").toString()); OrganizationAssert.isTrue(StringUtils.isNotBlank(ecDepartmentID), syncMap.get("message").toString());
// 更新组织架构图 // 更新组织架构图
//TODO new DepartmentTriggerRunnable(deptById.getId()).run(); // new DepartmentTriggerRunnable(deptById.getId()).run();
// 复制当前部门岗位信息 // 复制当前部门岗位信息
//if ("1".equals(copyJob)) { //if ("1".equals(copyJob)) {
@ -540,7 +540,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
departmentPO.setSubCompanyId1(targetDepartment.getSubCompanyId1()); departmentPO.setSubCompanyId1(targetDepartment.getSubCompanyId1());
updateEcDepartment(departmentPO); updateEcDepartment(departmentPO);
// 更新组织架构图 // 更新组织架构图
//TODO new DepartmentTriggerRunnable(departmentPO.getId()).run(); // new DepartmentTriggerRunnable(departmentPO.getId()).run();
} }
// 查询该部门一级岗位、更新岗位所属分部、所属部门 // 查询该部门一级岗位、更新岗位所属分部、所属部门
//List<JobPO> firstChildJobList = getJobMapper().listJobsByDepartmentId(mergeParam.getId()); //List<JobPO> firstChildJobList = getJobMapper().listJobsByDepartmentId(mergeParam.getId());
@ -553,7 +553,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
// 更新岗位组织架构图 // 更新岗位组织架构图
//for (JobPO jobPO : firstChildJobList) { //for (JobPO jobPO : firstChildJobList) {
// // 刷新组织架构图 // // 刷新组织架构图
// TODO new JobTriggerRunnable(jobPO.getId()).run(); // new JobTriggerRunnable(jobPO.getId()).run();
//} //}
// 更新当前部门下的人员 // 更新当前部门下的人员
rs.executeUpdate("update hrmresource set SUBCOMPANYID1 =?,DEPARTMENTID =? where DEPARTMENTID =?", targetDepartment.getSubCompanyId1(), targetEcDeptId, mergeEcDeptId); rs.executeUpdate("update hrmresource set SUBCOMPANYID1 =?,DEPARTMENTID =? where DEPARTMENTID =?", targetDepartment.getSubCompanyId1(), targetEcDeptId, mergeEcDeptId);
@ -561,7 +561,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
//List<Long> hrmResourceIds = getSystemDataMapper().getHrmResourceIdsByDept(mergeParam.getId().toString()); //List<Long> hrmResourceIds = getSystemDataMapper().getHrmResourceIdsByDept(mergeParam.getId().toString());
//// 更新人员组织架构图 //// 更新人员组织架构图
//for (Long hrmResourceId : hrmResourceIds) { //for (Long hrmResourceId : hrmResourceIds) {
//TODO new HrmResourceTriggerRunnable(hrmResourceId).run(); // new HrmResourceTriggerRunnable(hrmResourceId).run();
//} //}
// 更新子部门下岗位的所属分部 // 更新子部门下岗位的所属分部
for (DepartmentPO departmentPO : firstChildDeptList) { for (DepartmentPO departmentPO : firstChildDeptList) {
@ -575,13 +575,13 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
// 删除部门 // 删除部门
ServiceUtil.getService(OrganizationServiceImpl.class, user).doDepartmentCancel(map, user); ServiceUtil.getService(OrganizationServiceImpl.class, user).doDepartmentCancel(map, user);
// 更新组织架构图 // 更新组织架构图
// TODO new DepartmentTriggerRunnable(mergeDepartment).run(); // new DepartmentTriggerRunnable(mergeDepartment).run();
// 更新部门合并后名称 // 更新部门合并后名称
targetDepartment.setDepartmentName(mergeParam.getMergeName()); targetDepartment.setDepartmentName(mergeParam.getMergeName());
targetDepartment.setDepartmentMark(mergeParam.getMergeName()); targetDepartment.setDepartmentMark(mergeParam.getMergeName());
updateEcDepartment(targetDepartment); updateEcDepartment(targetDepartment);
// 更新组织架构图 // 更新组织架构图
// TODO new DepartmentTriggerRunnable(oldFParentId, targetDepartment.getId()).run(); // new DepartmentTriggerRunnable(oldFParentId, targetDepartment.getId()).run();
return 0; return 0;
} }
@ -622,7 +622,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
deptById.setSupDepId(null); deptById.setSupDepId(null);
// 更新组织架构图 // 更新组织架构图
//TODO new DepartmentTriggerRunnable(company.toString(), deptById).run(); // new DepartmentTriggerRunnable(company.toString(), deptById).run();
} else if ("1".equals(moveParam.getMoveType())) { } else if ("1".equals(moveParam.getMoveType())) {
Integer departmentId = moveParam.getDepartment(); Integer departmentId = moveParam.getDepartment();
OrganizationAssert.notNull(departmentId, "请选择要转移到的部门"); OrganizationAssert.notNull(departmentId, "请选择要转移到的部门");
@ -638,7 +638,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
deptById.setSubCompanyId1(parentDepartment.getSubCompanyId1()); deptById.setSubCompanyId1(parentDepartment.getSubCompanyId1());
// 更新组织架构图 // 更新组织架构图
// TODO new DepartmentTriggerRunnable(Integer.toString(100000000 + department.intValue()), deptById).run(); // new DepartmentTriggerRunnable(Integer.toString(100000000 + department.intValue()), deptById).run();
} }
// 更新EC部门 // 更新EC部门
updateEcDepartment(deptById); updateEcDepartment(deptById);
@ -651,7 +651,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
//// 更新人员组织架构图 //// 更新人员组织架构图
//List<Long> hrmResourceIds = getSystemDataMapper().getHrmResourceIdsByDept(deptById.getId().toString()); //List<Long> hrmResourceIds = getSystemDataMapper().getHrmResourceIdsByDept(deptById.getId().toString());
//for (Long hrmResourceId : hrmResourceIds) { //for (Long hrmResourceId : hrmResourceIds) {
//TODO new HrmResourceTriggerRunnable(hrmResourceId).run(); // new HrmResourceTriggerRunnable(hrmResourceId).run();
//} //}
forbiddenChildTag(deptById.getSubCompanyId1(), deptList); forbiddenChildTag(deptById.getSubCompanyId1(), deptList);
// 递归更新下级部门、岗位 // 递归更新下级部门、岗位
@ -672,7 +672,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
updateEcDepartment(departmentPO); updateEcDepartment(departmentPO);
// 更新组织架构图 // 更新组织架构图
// TODO new DepartmentTriggerRunnable(departmentPO.getId()).run(); // new DepartmentTriggerRunnable(departmentPO.getId()).run();
// 刷新岗位所属分部 // 刷新岗位所属分部
//refreshJobComp(departmentPO.getId(), subCompanyId1); //refreshJobComp(departmentPO.getId(), subCompanyId1);
// 更新当前部门下的人员 // 更新当前部门下的人员
@ -682,7 +682,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
//List<Long> hrmResourceIds = getSystemDataMapper().getHrmResourceIdsByDept(departmentPO.getId().toString()); //List<Long> hrmResourceIds = getSystemDataMapper().getHrmResourceIdsByDept(departmentPO.getId().toString());
//// 更新人员组织架构图 //// 更新人员组织架构图
//for (Long hrmResourceId : hrmResourceIds) { //for (Long hrmResourceId : hrmResourceIds) {
//TODO new HrmResourceTriggerRunnable(hrmResourceId).run(); // new HrmResourceTriggerRunnable(hrmResourceId).run();
//} //}
List<DepartmentPO> childList = getDepartmentMapper().getDeptListByPId(departmentPO.getId()); List<DepartmentPO> childList = getDepartmentMapper().getDeptListByPId(departmentPO.getId());
forbiddenChildTag(subCompanyId1, childList); forbiddenChildTag(subCompanyId1, childList);

@ -446,7 +446,7 @@ public class JobServiceImpl extends Service implements JobService {
jobById.setShowOrder(orderNum); jobById.setShowOrder(orderNum);
insertCount += getJobMapper().insertIgnoreNull(jobById); insertCount += getJobMapper().insertIgnoreNull(jobById);
// 更新组织架构图 // 更新组织架构图
//TODO new JobTriggerRunnable(jobById.getId()).run(); // new JobTriggerRunnable(jobById.getId()).run();
} }
return insertCount; return insertCount;
@ -567,14 +567,14 @@ public class JobServiceImpl extends Service implements JobService {
// 更新合并后的岗位,更新组织架构图 // 更新合并后的岗位,更新组织架构图
// updateEcJob(targetJob, mergeParam.getMergeName()); // updateEcJob(targetJob, mergeParam.getMergeName());
// TODO targetJob.setJobName(mergeParam.getMergeName()); // targetJob.setJobName(mergeParam.getMergeName());
getJobMapper().updateBaseJob(targetJob); getJobMapper().updateBaseJob(targetJob);
//TODO new JobTriggerRunnable(jobById.getId(), targetJob.getId()).run(); // new JobTriggerRunnable(jobById.getId(), targetJob.getId()).run();
// 原岗位删除 // 原岗位删除
//new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.CANCELED, null, jobById).sync(); //new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.CANCELED, null, jobById).sync();
getJobMapper().deleteByIds(Collections.singletonList(jobById.getId())); getJobMapper().deleteByIds(Collections.singletonList(jobById.getId()));
// 更新组织架构图 // 更新组织架构图
//TODO new JobTriggerRunnable(jobById).run(); // new JobTriggerRunnable(jobById).run();
return updateCount; return updateCount;
} }
@ -614,7 +614,7 @@ public class JobServiceImpl extends Service implements JobService {
// 更新人员信息 // 更新人员信息
// updateResourceJob(job); // updateResourceJob(job);
// 更新组织架构图 // 更新组织架构图
//TODO new JobTriggerRunnable(job.getId()).run(); // new JobTriggerRunnable(job.getId()).run();
// 递归处理子级元素 // 递归处理子级元素
List<JobPO> jobsByPid = getJobMapper().getJobsByPid(job.getId()); List<JobPO> jobsByPid = getJobMapper().getJobsByPid(job.getId());

@ -8,7 +8,6 @@ import java.util.Map;
/** /**
* @Author liang.cheng * @Author liang.cheng
* @Date 2023/6/27 3:45 PM * @Date 2023/6/27 3:45 PM
* @Description: TODO
* @Version 1.0 * @Version 1.0
*/ */
public class OrgVirtualServiceImpl extends Service implements OrgVirtualService { public class OrgVirtualServiceImpl extends Service implements OrgVirtualService {

@ -180,7 +180,6 @@ public class OrganizationSyncEc {
* *
*/ */
private void cancelCompany() { private void cancelCompany() {
// TODO
String forbiddenTag = Util.null2String(params.get("forbiddenTag")); String forbiddenTag = Util.null2String(params.get("forbiddenTag"));
if ("0".equals(forbiddenTag)) { if ("0".equals(forbiddenTag)) {
// 解封 // 解封

@ -251,7 +251,7 @@ public class CompanyImport {
Map<String, Object> syncMap = new OrganizationSyncEc(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.ADD, map, false).sync(); Map<String, Object> syncMap = new OrganizationSyncEc(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.ADD, map, false).sync();
if (OrgImportUtil.isThrowError(syncMap)) { if (OrgImportUtil.isThrowError(syncMap)) {
// 刷新组织架构图 // 刷新组织架构图
//TODO new CompanyTriggerRunnable(infoParams.getId()).run(); // new CompanyTriggerRunnable(infoParams.getId()).run();
historyDetailPO.setOperateDetail("添加成功"); historyDetailPO.setOperateDetail("添加成功");
historyDetailPO.setStatus("1"); historyDetailPO.setStatus("1");
} else { } else {
@ -274,7 +274,7 @@ public class CompanyImport {
Map<String, Object> syncMap = new OrganizationSyncEc(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.UPDATE, map, false).sync(); Map<String, Object> syncMap = new OrganizationSyncEc(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.UPDATE, map, false).sync();
if (OrgImportUtil.isThrowError(syncMap)) { if (OrgImportUtil.isThrowError(syncMap)) {
// 刷新组织架构图 // 刷新组织架构图
//TODO new CompanyTriggerRunnable(companyId).run(); // new CompanyTriggerRunnable(companyId).run();
historyDetailPO.setOperateDetail("更新成功"); historyDetailPO.setOperateDetail("更新成功");
historyDetailPO.setStatus("1"); historyDetailPO.setStatus("1");
} else { } else {

@ -311,7 +311,7 @@ public class DepartmentImport {
Map<String, Object> syncMap = new OrganizationSyncEc(user, LogModuleNameEnum.DEPARTMENT, OperateTypeEnum.UPDATE, map, false).sync(); Map<String, Object> syncMap = new OrganizationSyncEc(user, LogModuleNameEnum.DEPARTMENT, OperateTypeEnum.UPDATE, map, false).sync();
if (OrgImportUtil.isThrowError(syncMap)) { if (OrgImportUtil.isThrowError(syncMap)) {
// 刷新组织架构图 // 刷新组织架构图
//TODO new DepartmentTriggerRunnable(departmentId).run(); // new DepartmentTriggerRunnable(departmentId).run();
historyDetailPO.setOperateDetail("更新成功"); historyDetailPO.setOperateDetail("更新成功");
historyDetailPO.setStatus("1"); historyDetailPO.setStatus("1");
} else { } else {

@ -19,7 +19,6 @@ import java.util.Map;
/** /**
* @Author liang.cheng * @Author liang.cheng
* @Date 2023/6/27 3:41 PM * @Date 2023/6/27 3:41 PM
* @Description: TODO
* @Version 1.0 * @Version 1.0
*/ */
public class OrgVirtualController { public class OrgVirtualController {

@ -167,7 +167,7 @@ public class JobWrapper extends OrganizationWrapper {
}.getClass(), jobById.getJobNo(), JSON.toJSONString(params), jobById, newJobById); }.getClass(), jobById.getJobNo(), JSON.toJSONString(params), jobById, newJobById);
// 更新组织架构图 // 更新组织架构图
//TODO new Thread(new JobTriggerRunnable(jobById, newJobById)).start(); // new Thread(new JobTriggerRunnable(jobById, newJobById)).start();
return updateForbiddenTagById; return updateForbiddenTagById;
} }
@ -185,7 +185,7 @@ public class JobWrapper extends OrganizationWrapper {
writeOperateLog(new Object() { writeOperateLog(new Object() {
}.getClass(), jobPO.getJobTitleName(), JSON.toJSONString(ids), "删除岗位"); }.getClass(), jobPO.getJobTitleName(), JSON.toJSONString(ids), "删除岗位");
// 更新组织架构图 // 更新组织架构图
// TODO new JobTriggerRunnable(jobPO).run(); // new JobTriggerRunnable(jobPO).run();
} }
return deleteByIds; return deleteByIds;
} }

@ -11,7 +11,6 @@ import java.util.Map;
/** /**
* @Author liang.cheng * @Author liang.cheng
* @Date 2023/6/27 3:42 PM * @Date 2023/6/27 3:42 PM
* @Description: TODO
* @Version 1.0 * @Version 1.0
*/ */
public class OrgVirtualWrapper extends Service { public class OrgVirtualWrapper extends Service {

Loading…
Cancel
Save