|
|
@@ -63,24 +63,39 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
|
|
|
Date now = new Date();
|
|
|
OrganizationManagement om=new OrganizationManagement();
|
|
|
om.setId(id);
|
|
|
- om.setCreateId(TokenManager.getAdminId());
|
|
|
- /*om.setCreateId("123");*/
|
|
|
+ String createId =organizationManagementMapper.selectAdminNameById(TokenManager.getAdminId());
|
|
|
+ om.setCreateId(createId);
|
|
|
om.setCreateTime(now);
|
|
|
om.setUpdateTime(now);
|
|
|
om.setDeletedSign("0");
|
|
|
om.setName(name);
|
|
|
om.setType(type);
|
|
|
om.setManagerId(managerId);
|
|
|
- if(superId!=null){
|
|
|
- String sdepNo=organizationManagementMapper.selectDepNoByName(superId);
|
|
|
- int Count=organizationManagementMapper.selectDepNoCount(superId);
|
|
|
- if(Count<10){
|
|
|
- om.setDepNo(sdepNo+"0"+Count);
|
|
|
- }if(Count>=10){
|
|
|
- om.setDepNo(sdepNo+Count);
|
|
|
- }
|
|
|
- }else{
|
|
|
- om.setDepNo("DP");
|
|
|
+ String sdepNo=organizationManagementMapper.selectDepNoByName(superId);
|
|
|
+ int Count=organizationManagementMapper.selectDepNoCount(superId);
|
|
|
+ if(Count<10){
|
|
|
+ String dep=sdepNo+"0"+Count;
|
|
|
+ String sid=organizationManagementMapper.selectIdByDepNo(dep);
|
|
|
+ while(sid!=null){
|
|
|
+ Count=Count+1;
|
|
|
+ if(Count>=10){
|
|
|
+ dep=sdepNo+Count;
|
|
|
+ }else{
|
|
|
+ dep=sdepNo+"0"+Count;
|
|
|
+ }
|
|
|
+ sid=organizationManagementMapper.selectIdByDepNo(dep);
|
|
|
+ }
|
|
|
+ om.setDepNo(dep);
|
|
|
+ }
|
|
|
+ if(Count>=10){
|
|
|
+ String dep=sdepNo+Count;
|
|
|
+ String sid=organizationManagementMapper.selectIdByDepNo(dep);
|
|
|
+ while(sid!=null){
|
|
|
+ Count=Count+1;
|
|
|
+ dep=sdepNo+Count;
|
|
|
+ sid=organizationManagementMapper.selectIdByDepNo(dep);
|
|
|
+ }
|
|
|
+ om.setDepNo(dep);
|
|
|
}
|
|
|
om.setSuperId(superId);
|
|
|
om.setRemarks(remarks);
|
|
|
@@ -106,19 +121,44 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
|
|
|
@Override
|
|
|
public int updateOrganization(String name, String type, String managerId, String superId, String status,
|
|
|
String remarks,String id) {
|
|
|
+ Date now=new Date();
|
|
|
OrganizationManagement om=new OrganizationManagement();
|
|
|
om.setName(name);
|
|
|
om.setType(type);
|
|
|
+ om.setUpdateTime(now);
|
|
|
om.setManagerId(managerId);
|
|
|
om.setSuperId(superId);
|
|
|
+ String sdepNo=organizationManagementMapper.selectDepNoByName(superId);
|
|
|
+ int Count=organizationManagementMapper.selectDepNoCount(superId);
|
|
|
+ if(Count<10){
|
|
|
+ String dep=sdepNo+"0"+Count;
|
|
|
+ String sid=organizationManagementMapper.selectIdByDepNo(dep);
|
|
|
+ while(sid!=null){
|
|
|
+ Count=Count+1;
|
|
|
+ if(Count>=10){
|
|
|
+ dep=sdepNo+Count;
|
|
|
+ }else{
|
|
|
+ dep=sdepNo+"0"+Count;
|
|
|
+ }
|
|
|
+ sid=organizationManagementMapper.selectIdByDepNo(dep);
|
|
|
+ }
|
|
|
+ om.setDepNo(dep);
|
|
|
+ }
|
|
|
+ if(Count>=10){
|
|
|
+ String dep=sdepNo+Count;
|
|
|
+ String sid=organizationManagementMapper.selectIdByDepNo(dep);
|
|
|
+ while(sid!=null){
|
|
|
+ Count=Count+1;
|
|
|
+ dep=sdepNo+Count;
|
|
|
+ sid=organizationManagementMapper.selectIdByDepNo(dep);
|
|
|
+ }
|
|
|
+ om.setDepNo(dep);
|
|
|
+ }
|
|
|
om.setStatus(status);
|
|
|
om.setRemarks(remarks);
|
|
|
om.setId(id);
|
|
|
organizationManagementMapper.updateByPrimaryKeySelective(om);
|
|
|
return 1;
|
|
|
}
|
|
|
-
|
|
|
|
|
|
-
|
|
|
-
|
|
|
}
|