Browse Source

部门管理模块最终修改

Michael 8 years ago
parent
commit
9e38a39988

+ 3 - 0
src/main/java/com/goafanti/common/dao/OrganizationManagementMapper.java

@@ -89,4 +89,7 @@ public interface OrganizationManagementMapper {
 	OrganizationListOut selectAllById(String id);
 	
 	int deleteById(String id);
+	
+	String selectAdminNameById(String name);
+	String selectIdByDepNo(String depNo);
 }

+ 14 - 0
src/main/java/com/goafanti/common/mapper/OrganizationManagementMapper.xml

@@ -495,4 +495,18 @@
 	    delete from organization_management
 	    where id = #{id,jdbcType=VARCHAR}
   	</delete>
+  	<select id="selectAdminNameById" parameterType="java.lang.String" resultType="java.lang.String">
+  		select 
+  		name
+  		from admin
+  		where 
+  		id=#{id,jdbcType=VARCHAR}
+  	</select>
+  	<select id="selectIdByDepNo" parameterType="java.lang.String" resultType="java.lang.String">
+  		select
+  		id
+  		from organization_management
+  		where
+  		dep_no=#{depNo,jdbcType=VARCHAR}
+  	</select>
 </mapper>

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

@@ -3,7 +3,6 @@ package com.goafanti.organization.service;
 import java.util.List;
 
 import com.goafanti.admin.bo.AdminListBo;
-import com.goafanti.common.model.OrganizationManagement;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.organization.bo.OrganizationListOut;
 

+ 55 - 15
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -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;
 	}
-	
 
-	
-	
 }