Browse Source

Merge remote-tracking branch 'origin/master' into test

Michael 8 years ago
parent
commit
dfd4326c05

+ 63 - 2
src/main/java/com/goafanti/organization/controller/AdminOrganizationController.java

@@ -50,8 +50,38 @@ public class AdminOrganizationController extends BaseApiController{
 		if(olo!=null){
 			res.getError().add(buildError("","部门已存在"));
 			return res;
+		}		
+		String sdepNo=organizationManagementMapper.selectDepNoByName(superId);
+		int Count=organizationManagementMapper.selectDepNoCount(superId);
+		if((Count+1)>99){
+			res.getError().add(buildError("","每层最多存在99个子类"));
+			return res;
+		}
+		if(Count<10){
+			String dep=sdepNo+"0"+Count;
+			String sid=organizationManagementMapper.selectIdByDepNo(dep);
+			while(sid!=null){
+				Count=(Count+1)%100;				
+				if(Count>=10){
+					dep=sdepNo+Count;	
+				}else{
+					dep=sdepNo+"0"+Count;
+				}
+				sid=organizationManagementMapper.selectIdByDepNo(dep);				
+			}
+			organizationService.addOrganization(name, managerId, type, superId, remarks,dep);
+		}
+		if(Count>=10){
+			String dep=sdepNo+Count;
+			String sid=organizationManagementMapper.selectIdByDepNo(dep);
+			while(sid!=null){
+				Count=(Count+1)%100;				
+				dep=sdepNo+Count;
+				sid=organizationManagementMapper.selectIdByDepNo(dep);				
+			}
+			organizationService.addOrganization(name, managerId, type, superId, remarks,dep);
 		}
-		organizationService.addOrganization(name, managerId, type, superId, remarks);
+		
 		return res;
 	}
 	/**负责人自动补全查询**/
@@ -77,8 +107,39 @@ public class AdminOrganizationController extends BaseApiController{
 				|| StringUtils.isBlank(status)|| StringUtils.isBlank(remarks)){
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,""));
 			return res;
+		}		
+		String sdepNo=organizationManagementMapper.selectDepNoByName(superId);
+		superId=organizationManagementMapper.selectIdByName(superId);
+		int Count=organizationManagementMapper.selectDepNoCount(superId);
+		if((Count+1)>99){
+			res.getError().add(buildError("","每层最多存在99个子类"));
+			return res;
+		}
+		if(Count<10){
+			String dep=sdepNo+"0"+Count;
+			String sid=organizationManagementMapper.selectIdByDepNo(dep);
+			while(sid!=null){
+				Count=(Count+1)%100;				
+				if(Count>=10){
+					dep=sdepNo+Count;	
+				}else{
+					dep=sdepNo+"0"+Count;
+				}
+				sid=organizationManagementMapper.selectIdByDepNo(dep);				
+			}
+			organizationService.updateOrganization(name, type, managerId, superId, status, remarks,id,dep);
+		}
+		if(Count>=10){
+			String dep=sdepNo+Count;
+			String sid=organizationManagementMapper.selectIdByDepNo(dep);
+			while(sid!=null){
+				Count=(Count+1)%100;				
+				dep=sdepNo+Count;
+				sid=organizationManagementMapper.selectIdByDepNo(dep);				
+			}
+			organizationService.updateOrganization(name, type, managerId, superId, status, remarks,id,dep);
 		}
-		organizationService.updateOrganization(name, type, managerId, superId, status, remarks,id);
+		
 		return res;
 	}
 	

+ 2 - 2
src/main/java/com/goafanti/organization/service/OrganizationService.java

@@ -27,7 +27,7 @@ public interface OrganizationService {
 	 * @param desc 组织职能说明
 	 * @return
 	 */
-	int addOrganization(String name,String managerId,String type,String superId,String desc);
+	int addOrganization(String name,String managerId,String type,String superId,String desc,String dep);
 	/**
 	 * 模糊查询负责人名称
 	 * @param name
@@ -39,6 +39,6 @@ public interface OrganizationService {
 	
 	int deleteById(String id);
 	
-	int updateOrganization(String name,String type,String managerId,String superId,String status,String remarks,String id);
+	int updateOrganization(String name,String type,String managerId,String superId,String status,String remarks,String id,String depn);
 	
 }

+ 5 - 56
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -63,7 +63,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 	 *
 	 */
 	@Override
-	public int addOrganization(String name, String managerId, String type, String superId, String remarks) {
+	public int addOrganization(String name, String managerId, String type, String superId, String remarks,String dep) {
 		String id = UUID.randomUUID().toString();
 		Date now = new Date();
 		OrganizationManagement om=new OrganizationManagement(); 
@@ -76,32 +76,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		om.setName(name);
 		om.setType(type);
 		om.setManagerId(managerId);
-		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.setDepNo(dep);
 		superId=organizationManagementMapper.selectIdByName(superId);
 		om.setSuperId(superId);
 		om.setRemarks(remarks);
@@ -127,40 +102,14 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 	}
 	@Override
 	public int updateOrganization(String name, String type, String managerId, String superId, String status,
-			String remarks,String id) {
+			String remarks,String id,String depn) {
 		Date now=new Date();
 		OrganizationManagement om=new OrganizationManagement();
 		om.setName(name);
 		om.setType(type);
 		om.setUpdateTime(now);
 		om.setManagerId(managerId);
-		String sdepNo=organizationManagementMapper.selectDepNoByName(superId);
-		superId=organizationManagementMapper.selectIdByName(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.setDepNo(depn);
 		om.setSuperId(superId);
 		om.setStatus(status);
 		om.setRemarks(remarks);
@@ -170,7 +119,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		int n=0;
 		List<OrganizationListOut> Nos =organizationManagementMapper.selectIDNBySuperId(id);
 		for(OrganizationListOut i:Nos){			
-			sdepNo=organizationManagementMapper.selectDepNoById(i.getSuperId());
+			String sdepNo=organizationManagementMapper.selectDepNoById(i.getSuperId());
 			if(n<10){
 				String dep=sdepNo+"0"+n;			
 				if(n>=10){