Browse Source

部门管理模块编辑删除功能接口

Michael 8 years ago
parent
commit
aa304a9ae4

+ 10 - 5
src/main/java/com/goafanti/common/dao/OrganizationManagementMapper.java

@@ -3,6 +3,7 @@ package com.goafanti.common.dao;
 import java.util.List;
 
 import com.goafanti.organization.bo.OrganizationListOut;
+import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.model.OrganizationManagement;
 import com.goafanti.common.model.OrganizationManagementExample;
 import org.apache.ibatis.annotations.Param;
@@ -73,15 +74,19 @@ public interface OrganizationManagementMapper {
 	 */
 	int insert1(OrganizationListOut olo);
 	/**
-	 * 根据组织名称查组织编��??
+	 * 根据组织名称查组织编
 	 */
 	String selectDepNoByName(String name);
 	/**
-	 * 查询相同上级下编号数��??
+	 * 查询相同上级下编号数
 	 */
-	int selectDepNoCount(String depNo);
+	int selectDepNoCount(String superId);
 	/**
-	 * 根据组织名称查找负责��??
+	 * 模糊查询负责人名称
 	 */
-	String selectManagerIdByName(String name);
+	List<AdminListBo> selectName(String name);
+	
+	OrganizationListOut selectAllById(String id);
+	
+	int deleteById(String id);
 }

+ 23 - 7
src/main/java/com/goafanti/common/mapper/OrganizationManagementMapper.xml

@@ -441,7 +441,7 @@
 			AND om.dep_no=#{depNo,jdbcType=VARCHAR}
 		</if>	
 	</select>
-	<select id="selectSuperId" resultType="com.goafanti.organization.bo.OrganizationListOut">
+	<select id="selectSuperId" >
 		select
 		id,name,dep_no as depNo
 		from organization_management
@@ -469,14 +469,30 @@
 		count(0)
 		from organization_management
 		where
-		dep_no like concat(#{depNo,jdbcType=VARCHAR},'%')
+		<!-- dep_no like concat(#{depNo,jdbcType=VARCHAR},'%') -->
+		super_id=#{superId,jdbcType=VARCHAR}
 	</select>
-	<select id="selectManagerIdByName" resultType="String">
+	<select id="selectName" resultType="com.goafanti.admin.bo.AdminListBo">
 		select
-		manager_id
-		from organization_management
+		name
+		from admin
 		where
-		name=#{name,jdbcType=VARCHAR}
+		name  like concat('%',#{name,jdbcType=VARCHAR},'%')
+	</select>
+	<select id="selectAllById" resultType="com.goafanti.organization.bo.OrganizationListOut">
+		select
+		id,create_id as createId,create_time as createTime,
+		update_time as updateTime,deleted_sign as deletedSign,
+		name,type,manager_id as managerId,
+		dep_no as depNo,
+		super_id as superId,
+		remarks,status
+		from organization_management
+		where 
+		id=#{id,jdbcType=VARCHAR}
 	</select>
-	
+	<delete id="deleteById" parameterType="java.lang.String">
+	    delete from organization_management
+	    where id = #{id,jdbcType=VARCHAR}
+  	</delete>
 </mapper>

+ 42 - 0
src/main/java/com/goafanti/organization/controller/OrganizationManagementController.java

@@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.organization.bo.OrganizationListOut;
@@ -44,4 +45,45 @@ public class OrganizationManagementController extends BaseApiController{
 		organizationService.addOrganization(name, managerId, type, superId, remarks);
 		return res;
 	}
+	/**负责人自动补全查询**/
+	@RequestMapping(value = "/selectName" , method = RequestMethod.POST)
+	public Result selectName(String name){
+		Result res = new Result();
+		res.setData(organizationService.selectName(name));
+		return res;
+	}
+	/**编辑页面数据读取**/
+	@RequestMapping(value = "/selectAllById" , method = RequestMethod.POST)
+	public OrganizationListOut selectAllById(String id){
+		OrganizationListOut res = organizationService.selectAllById(id);
+		return res;
+	}
+	/**修改信息**/
+	@RequestMapping(value = "/updateOrganization" , method = RequestMethod.POST)
+	public Result updateOrganization(String name, String type, String managerId, String superId, String status,
+			String remarks,String id){
+		Result res = new Result();
+		if(StringUtils.isBlank(name) || StringUtils.isBlank(type)
+				|| StringUtils.isBlank(managerId)|| StringUtils.isBlank(superId)
+				|| StringUtils.isBlank(status)|| StringUtils.isBlank(remarks)){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,""));
+			return res;
+		}
+		organizationService.updateOrganization(name, type, managerId, superId, status, remarks,id);
+		return res;
+	}
+	
+	
+	/**删除列表信息**/
+	@RequestMapping(value = "/deleteById" , method = RequestMethod.POST)
+	public Result deleteById(String id){
+		Result res = new Result();
+		if(StringUtils.isBlank(id)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, ""));
+			return res;
+		}
+		organizationService.deleteById(id);
+		return res;
+	}
+	
 }

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

@@ -2,6 +2,8 @@ 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;
 
@@ -27,4 +29,17 @@ public interface OrganizationService {
 	 * @return
 	 */
 	int addOrganization(String name,String managerId,String type,String superId,String desc);
+	/**
+	 * 模糊查询负责人名称
+	 * @param name
+	 * @return
+	 */
+	List<AdminListBo> selectName(String name);
+	
+	OrganizationListOut selectAllById(String id);
+	
+	int deleteById(String id);
+	
+	int updateOrganization(String name,String type,String managerId,String superId,String status,String remarks,String id);
+	
 }

+ 33 - 2
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -13,6 +13,7 @@ import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.organization.bo.OrganizationListOut;
 import com.goafanti.organization.service.OrganizationService;
+import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.dao.OrganizationManagementMapper;
 import com.goafanti.common.model.OrganizationManagement;
 import com.goafanti.common.utils.StringUtils;
@@ -72,14 +73,14 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		om.setManagerId(managerId);
 		if(superId!=null){
 			String sdepNo=organizationManagementMapper.selectDepNoByName(superId);
-			int Count=organizationManagementMapper.selectDepNoCount(sdepNo);
+			int Count=organizationManagementMapper.selectDepNoCount(superId);
 			if(Count<10){
 			om.setDepNo(sdepNo+"0"+Count);
 			}if(Count>=10){
 				om.setDepNo(sdepNo+Count);
 			}	
 		}else{
-			om.setDepNo("null");
+			om.setDepNo("DP");
 		}
 		om.setSuperId(superId);
 		om.setRemarks(remarks);
@@ -87,6 +88,36 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		organizationManagementMapper.insert(om);
 		return 1;
 	}
+	@Override
+	public List<AdminListBo> selectName(String name) {
+		List<AdminListBo> list=organizationManagementMapper.selectName(name);
+		return list;
+	}
+	@Override
+	public OrganizationListOut selectAllById(String id) {
+		OrganizationListOut olo=organizationManagementMapper.selectAllById(id);
+		return olo;
+	}
+	@Override
+	public int deleteById(String id) {
+		organizationManagementMapper.deleteById(id);
+		return 1;
+	}
+	@Override
+	public int updateOrganization(String name, String type, String managerId, String superId, String status,
+			String remarks,String id) {
+		OrganizationManagement om=new OrganizationManagement();
+		om.setName(name);
+		om.setType(type);
+		om.setManagerId(managerId);
+		om.setSuperId(superId);
+		om.setStatus(status);
+		om.setRemarks(remarks);
+		om.setId(id);
+		organizationManagementMapper.updateByPrimaryKeySelective(om);
+		return 1;
+	}
+