Просмотр исходного кода

科德系统组织机构修改异常修改

anderx лет назад: 3
Родитель
Сommit
13ac2ecc37

+ 20 - 21
src/main/java/com/goafanti/organization/controller/AdminOrganizationController.java

@@ -28,7 +28,7 @@ public class AdminOrganizationController extends BaseApiController{
 			Integer pageSize){
 		Result res = new Result();
 		res.setData(organizationService.listOrganizationManagement(olo, pageNo, pageSize));
-		return res;		
+		return res;
 	}
 	/**部门组织管理上级组织查询 **/
 	@RequestMapping(value = "/selectSuperId" , method = RequestMethod.GET)
@@ -41,7 +41,7 @@ public class AdminOrganizationController extends BaseApiController{
 	@RequestMapping(value = "/selectSuperIdS" , method = RequestMethod.GET)
 	public Result selectsuperIdS(){
 		Result res = new Result();
-		
+
 		res.setData(organizationService.selectSuperId(1));
 		return res;
 	}
@@ -57,7 +57,7 @@ public class AdminOrganizationController extends BaseApiController{
 		if(olo!=null){
 			res.getError().add(buildError("","部门已存在"));
 			return res;
-		}		
+		}
 		String sdepNo=organizationManagementMapper.selectDepNo(superId);
 		int Count=organizationManagementMapper.selectDepNoCount(superId);
 		if((Count+1)>99){
@@ -68,13 +68,13 @@ public class AdminOrganizationController extends BaseApiController{
 			String dep=sdepNo+"0"+Count;
 			String sid=organizationManagementMapper.selectIdByDepNo(dep);
 			while(sid!=null){
-				Count=(Count+1)%100;				
+				Count=(Count+1)%100;
 				if(Count>=10){
-					dep=sdepNo+Count;	
+					dep=sdepNo+Count;
 				}else{
 					dep=sdepNo+"0"+Count;
 				}
-				sid=organizationManagementMapper.selectIdByDepNo(dep);				
+				sid=organizationManagementMapper.selectIdByDepNo(dep);
 			}
 			organizationService.addOrganization(name, managerId, type, superId, remarks,dep,workingHoursType);
 		}
@@ -82,13 +82,13 @@ public class AdminOrganizationController extends BaseApiController{
 			String dep=sdepNo+Count;
 			String sid=organizationManagementMapper.selectIdByDepNo(dep);
 			while(sid!=null){
-				Count=(Count+1)%100;				
+				Count=(Count+1)%100;
 				dep=sdepNo+Count;
-				sid=organizationManagementMapper.selectIdByDepNo(dep);				
+				sid=organizationManagementMapper.selectIdByDepNo(dep);
 			}
 			organizationService.addOrganization(name, managerId, type, superId, remarks,dep,workingHoursType);
 		}
-		
+
 		return res;
 	}
 	/**负责人自动补全查询**/
@@ -115,7 +115,7 @@ public class AdminOrganizationController extends BaseApiController{
 				|| StringUtils.isBlank(status)|| StringUtils.isBlank(remarks)){
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,""));
 			return res;
-		}		
+		}
 		String sdepNo=organizationManagementMapper.selectDepNo(superId);//No
 		int Count=organizationManagementMapper.selectDepNoCount(superId);//14
 		if((Count+1)>99){
@@ -127,31 +127,30 @@ public class AdminOrganizationController extends BaseApiController{
 			String dep=sdepNo+"0"+Count;
 			String sid=organizationManagementMapper.selectIdByDepNo(dep);
 			while(sid!=null){
-				Count=(Count+1)%100;				
+				Count=(Count+1)%100;
 				if(Count>=10){
-					dep=sdepNo+Count;	
+					dep=sdepNo+Count;
 				}else{
 					dep=sdepNo+"0"+Count;
 				}
-				sid=organizationManagementMapper.selectIdByDepNo(dep);				
+				sid=organizationManagementMapper.selectIdByDepNo(dep);
 			}
 			i=organizationService.updateOrganization(name, type, managerId, superId, status, province,remarks,id,dep,abbreviation,financeId,workingHoursType);
-		}
-		if(Count>=10){
+		}else if(Count>=10){
 			String dep=sdepNo+Count;
 			String sid=organizationManagementMapper.selectIdByDepNo(dep);
 			while(sid!=null){
-				Count=(Count+1)%100;				
+				Count=(Count+1)%100;
 				dep=sdepNo+Count;
-				sid=organizationManagementMapper.selectIdByDepNo(dep);				
+				sid=organizationManagementMapper.selectIdByDepNo(dep);
 			}
 			i=organizationService.updateOrganization(name, type, managerId, superId, status, province,remarks,id,dep,abbreviation,financeId,workingHoursType);
 		}
-		
+
 		return res.data(i);
 	}
-	
-	
+
+
 	/**删除列表信息**/
 	@RequestMapping(value = "/deleteById" , method = RequestMethod.POST)
 	public Result deleteById(String id){
@@ -175,5 +174,5 @@ public class AdminOrganizationController extends BaseApiController{
 		organizationService.deleteById(id);
 		return res;
 	}
-	
+
 }

+ 26 - 71
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -26,7 +26,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 	private OrganizationManagementMapper organizationManagementMapper;
 	@Autowired
 	private TOrderMidMapper	tOrderMidMapper;
-	
+
 	@Override
 	public Pagination<OrganizationListOut> listOrganizationManagement(OrganizationListOut olo, Integer pageNo,
 			Integer pageSize) {
@@ -37,7 +37,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		return p;
 	}
 	private Map<String,Object> disposeParams(OrganizationListOut olo){
-		Map<String,Object> params = new HashMap<String, Object>();		
+		Map<String,Object> params = new HashMap<String, Object>();
 		if(StringUtils.isNotBlank(olo.getId())) params.put("id", olo.getId());
 		if(StringUtils.isNotBlank(olo.getCreateId())) params.put("createId", olo.getCreateId());
 		if(StringUtils.isNotBlank(olo.getCreateTime())) params.put("createTime", olo.getCreateTime());
@@ -67,7 +67,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 	public int addOrganization( String name, String managerId, String type, String superId, String remarks,String dep,Integer workingHoursType) {
 		String id = UUID.randomUUID().toString();
 		Date now = new Date();
-		OrganizationManagement om=new OrganizationManagement(); 
+		OrganizationManagement om=new OrganizationManagement();
 		om.setId(id);
 		String createId =organizationManagementMapper.selectAdminNameById(TokenManager.getAdminId());
 		om.setCreateId(createId);
@@ -108,13 +108,13 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		Date now=new Date();
 		OrganizationManagement om=new OrganizationManagement();
 		om.setName(name);
-		om.setType(type);  
+		om.setType(type);
 		om.setUpdateTime(now);
 		om.setManagerId(managerId);
 		om.setDepNo(depn);
 		om.setSuperId(superId);
 		om.setStatus(status);
-		om.setRemarks(remarks); 
+		om.setRemarks(remarks);
 		om.setId(id);
 		om.setAbbreviation(abbreviation);
 		om.setFinanceId(financeId);
@@ -122,76 +122,31 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		om.setWorkingHoursType(workingHoursType);
 		tOrderMidMapper.updateFinanceId(id,financeId);
 		int x=organizationManagementMapper.updateByPrimaryKeySelective(om);
-		//*******下级编号修改
-		int n=0;
-		List<OrganizationListOut> Nos =organizationManagementMapper.selectIDNBySuperId(om.getId());
-		for(OrganizationListOut i:Nos){			
-			String sdepNo=organizationManagementMapper.selectDepNoById(i.getSuperId());
-			if(n<10){
-				String dep=sdepNo+"0"+n;			
-				if(n>=10){
-					dep=sdepNo+n;	
+		updateLowerLevelNo(om.getId(),om.getDepNo());
+		return x;
+	}
+
+	private void updateLowerLevelNo(String id,String depNo) {
+		List<OrganizationListOut> Nos =organizationManagementMapper.selectIDNBySuperId(id);
+		int i=1;
+		for (OrganizationListOut o : Nos) {
+			if(i<10){
+				String dep=depNo+"0"+i;
+				if(i>=10){
+					dep=depNo+i;
 				}else{
-					dep=sdepNo+"0"+n;
-				}	
-				i.setDepNo(dep);
-			}
-			if(n>=10){
-				String dep=sdepNo+n;			
-				dep=sdepNo+n;	
-				i.setDepNo(dep);
-			}
-		organizationManagementMapper.updateByNumber(i);
-			n++;
-			
-			//*******下下级编号修改
-			int m=0;
-			List<OrganizationListOut> Noss =organizationManagementMapper.selectIDNBySuperId(i.getId());
-			//System.out.println("noss="+Noss);
-			for(OrganizationListOut o:Noss){			
-				sdepNo=organizationManagementMapper.selectDepNoById(o.getSuperId());
-				if(m<10){
-					String dep=sdepNo+"0"+m;			
-					if(m>=10){
-						dep=sdepNo+m;	
-					}else{
-						dep=sdepNo+"0"+m;
-					}	
-					o.setDepNo(dep);
-				}
-				if(m>=10){
-					String dep=sdepNo+m;			
-					dep=sdepNo+m;	
-					o.setDepNo(dep);
-				}
-				organizationManagementMapper.updateByNumber(o);
-				m++;
-				
-				//*******下下级编号修改
-				int z=0;
-				List<OrganizationListOut> Nosss =organizationManagementMapper.selectIDNBySuperId(o.getId());
-				for(OrganizationListOut p:Nosss){			
-					sdepNo=organizationManagementMapper.selectDepNoById(p.getSuperId());
-					if(z<10){
-						String dep=sdepNo+"0"+z;			
-						if(z>=10){
-							dep=sdepNo+z;	
-						}else{
-							dep=sdepNo+"0"+z;
-						}	
-						p.setDepNo(dep);
-					}
-					if(z>=10){
-						String dep=sdepNo+z;			
-						dep=sdepNo+z;	
-						p.setDepNo(dep);
-					}
-					organizationManagementMapper.updateByNumber(p);
-					z++;
+					dep=depNo+"0"+i;
 				}
+				o.setDepNo(dep);
+			} else if(i>=10){
+				String dep=depNo+i;
+				dep=depNo+i;
+				o.setDepNo(dep);
 			}
+			organizationManagementMapper.updateByNumber(o);
+			updateLowerLevelNo(o.getId(),o.getDepNo());
+			i++;
 		}
-		return x;
 	}
 
 }