Browse Source

部门处理修改

anderx 4 years ago
parent
commit
5f988c5cdc

+ 4 - 0
src/main/java/com/goafanti/admin/controller/AdminDepartmentApiController.java

@@ -54,6 +54,10 @@ public class AdminDepartmentApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
 			return res;
 		}
+		if (departmentService.checkDepWorkingHouresType(id)) {
+			res.getError().add(buildError( "工作时间已分配不允许删除。", "工作时间已分配不允许删除。"));
+			return res;
+		}
 		res.setData(departmentService.deleteWorkingHours(id));
 		return res;
 	}

+ 2 - 0
src/main/java/com/goafanti/admin/service/DepartmentService.java

@@ -14,4 +14,6 @@ public interface DepartmentService {
 
 	boolean checkWorkingHoursType(Integer type);
 
+	boolean checkDepWorkingHouresType(Integer id);
+
 }

+ 9 - 0
src/main/java/com/goafanti/admin/service/impl/DepartmentServiceImpl.java

@@ -44,6 +44,15 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
 		}
 		return false;
 	}
+
+	@Override
+	public boolean checkDepWorkingHouresType(Integer id) {
+		int i=workingHoursMapper.getDepTypeCount(id);
+		if(i>0) {
+			return true;
+		}
+		return false;
+	}
 	
 	
 	

+ 2 - 0
src/main/java/com/goafanti/common/dao/WorkingHoursMapper.java

@@ -49,4 +49,6 @@ public interface WorkingHoursMapper {
 	WorkingHours selectBydepId(@Param("depId")String depId);
 
 	int getTypeCount(Integer type);
+
+	int getDepTypeCount(Integer id);
 }

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

@@ -157,12 +157,12 @@
     -->
     insert into department (id, create_id, create_time, 
       update_time, deleted_sign, name, 
-      type, manager_id, dep_no, 
+      type, manager_id, dep_no, working_hours_type,
       super_id, remarks, status
       )
     values (#{id,jdbcType=VARCHAR}, #{createId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{deletedSign,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
-      #{type,jdbcType=VARCHAR}, #{managerId,jdbcType=VARCHAR}, #{depNo,jdbcType=VARCHAR}, 
+      #{type,jdbcType=VARCHAR}, #{managerId,jdbcType=VARCHAR}, #{depNo,jdbcType=VARCHAR}, #{workingHoursType,jdbcType=INTEGER},
       #{superId,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}
       )
   </insert>
@@ -383,6 +383,9 @@
       <if test="province != null">
         province = #{province},
       </if>
+      <if test="workingHoursType !=null">
+      	working_hours_type= #{workingHoursType},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -415,14 +418,13 @@
 			om.remarks,
 			om.status,
 			dm.name as superName,
+			wh.name as workingHoursName,
 			x.name as managerName
 		from department om 
 		left join department dm on om.super_id = dm.id
 		left join admin x on om.manager_id = x.id
-		where
-			om.deleted_sign = '0'
-			and
-			om.name != '平台超管中心'
+		left join working_hours wh  on om.working_hours_type =wh.`type` 
+		where 	om.deleted_sign = 0
 		<if test="name !=null">
 			AND om.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 		</if>
@@ -445,10 +447,7 @@
 		from department om 
 		left join department dm on om.super_id = dm.id
 		left join admin x on om.manager_id = x.id
-		where
-			om.deleted_sign = '0'
-			and
-			om.name != '平台超管中心'
+		where om.deleted_sign = 0
 		<if test="name !=null">
 			AND om.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 		</if>
@@ -533,6 +532,7 @@
 		a.finance_id financeId,
 		a.province,
 		c.name financeName,
+		a.working_hours_type workingHoursType,
 		b.name as managerName
 	from department a 
 	left join admin b on a.manager_id = b.id

+ 7 - 0
src/main/java/com/goafanti/common/mapper/WorkingHoursMapper.xml

@@ -181,4 +181,11 @@
   <select id="getTypeCount" resultType="java.lang.Integer">
   select count(*) from working_hours where type= #{type}
   </select>
+  
+  <select id="getDepTypeCount" resultType="java.lang.Integer">
+  select 
+    count(*)
+    from department d  left join working_hours a on d.working_hours_type =a.type
+    where a.id= #{id}
+  </select>
 </mapper>

+ 10 - 0
src/main/java/com/goafanti/common/model/OrganizationManagement.java

@@ -79,6 +79,8 @@ public class OrganizationManagement {
 	 * 	省份
 	 */
 	private Integer province;
+	
+	private Integer workingHoursType;
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.id
 	 * @return  the value of organization_management.id
@@ -319,4 +321,12 @@ public class OrganizationManagement {
 	public void setProvince(Integer province) {
 		this.province = province;
 	}
+
+	public Integer getWorkingHoursType() {
+		return workingHoursType;
+	}
+
+	public void setWorkingHoursType(Integer workingHoursType) {
+		this.workingHoursType = workingHoursType;
+	}
 }

+ 14 - 0
src/main/java/com/goafanti/organization/bo/OrganizationListOut.java

@@ -39,6 +39,8 @@ public class OrganizationListOut {
 	
 	private String financeId;
 	private Integer province;
+	private Integer workingHoursType;
+	private String workingHoursName;
 	
 	public String getUid() {
 		return uid;
@@ -154,6 +156,18 @@ public class OrganizationListOut {
 	public void setProvince(Integer province) {
 		this.province = province;
 	}
+	public Integer getWorkingHoursType() {
+		return workingHoursType;
+	}
+	public void setWorkingHoursType(Integer workingHoursType) {
+		this.workingHoursType = workingHoursType;
+	}
+	public String getWorkingHoursName() {
+		return workingHoursName;
+	}
+	public void setWorkingHoursName(String workingHoursName) {
+		this.workingHoursName = workingHoursName;
+	}
 	
 	
 	

+ 9 - 8
src/main/java/com/goafanti/organization/controller/AdminOrganizationController.java

@@ -47,7 +47,7 @@ public class AdminOrganizationController extends BaseApiController{
 	}
 	/**部门组织管理新增**/
 	@RequestMapping(value = "/addOrganization" , method = RequestMethod.POST)
-	public Result addOrganization(String name, String managerId, String type, String superId, String remarks) throws Exception{
+	public Result addOrganization(String name, String managerId, String type, String superId, String remarks,Integer workingHoursType) throws Exception{
 		Result res = new Result();
 		if(StringUtils.isBlank(name) || StringUtils.isBlank(type) || StringUtils.isBlank(superId)){
 			res.getError().add(buildError("","组织名称、组织类型、上级组织不能为空"));
@@ -76,7 +76,7 @@ public class AdminOrganizationController extends BaseApiController{
 				}
 				sid=organizationManagementMapper.selectIdByDepNo(dep);				
 			}
-			organizationService.addOrganization(name, managerId, type, superId, remarks,dep);
+			organizationService.addOrganization(name, managerId, type, superId, remarks,dep,workingHoursType);
 		}
 		if(Count>=10){
 			String dep=sdepNo+Count;
@@ -86,7 +86,7 @@ public class AdminOrganizationController extends BaseApiController{
 				dep=sdepNo+Count;
 				sid=organizationManagementMapper.selectIdByDepNo(dep);				
 			}
-			organizationService.addOrganization(name, managerId, type, superId, remarks,dep);
+			organizationService.addOrganization(name, managerId, type, superId, remarks,dep,workingHoursType);
 		}
 		
 		return res;
@@ -100,14 +100,15 @@ public class AdminOrganizationController extends BaseApiController{
 	}
 	/**编辑页面数据读取**/
 	@RequestMapping(value = "/selectAllById" , method = RequestMethod.POST)
-	public OrganizationListOut selectAllById(String id){
-		OrganizationListOut res = organizationService.selectAllById(id);
+	public Result selectAllById(String id){
+		Result res = new Result();
+		res.data(organizationService.selectAllById(id)) ;
 		return res;
 	}
 	/**修改信息**/
 	@RequestMapping(value = "/updateOrganization" , method = RequestMethod.POST)
 	public Result updateOrganization(String name, String type, String managerId, String superId, String status,Integer province,
-			String remarks,String id,String abbreviation,String financeId){
+			String remarks,String id,String abbreviation,String financeId,Integer workingHoursType){
 		Result res = new Result();
 		if(StringUtils.isBlank(name) || StringUtils.isBlank(type)
 				|| StringUtils.isBlank(managerId)|| StringUtils.isBlank(superId)
@@ -134,7 +135,7 @@ public class AdminOrganizationController extends BaseApiController{
 				}
 				sid=organizationManagementMapper.selectIdByDepNo(dep);				
 			}
-			i=organizationService.updateOrganization(name, type, managerId, superId, status, province,remarks,id,dep,abbreviation,financeId);
+			i=organizationService.updateOrganization(name, type, managerId, superId, status, province,remarks,id,dep,abbreviation,financeId,workingHoursType);
 		}
 		if(Count>=10){
 			String dep=sdepNo+Count;
@@ -144,7 +145,7 @@ public class AdminOrganizationController extends BaseApiController{
 				dep=sdepNo+Count;
 				sid=organizationManagementMapper.selectIdByDepNo(dep);				
 			}
-			i=organizationService.updateOrganization(name, type, managerId, superId, status, province,remarks,id,dep,abbreviation,financeId);
+			i=organizationService.updateOrganization(name, type, managerId, superId, status, province,remarks,id,dep,abbreviation,financeId,workingHoursType);
 		}
 		
 		return res.data(i);

+ 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,String dep);
+	int addOrganization(String name,String managerId,String type,String superId,String desc,String dep,Integer workingHoursType);
 	/**
 	 * 模糊查询负责人名称
 	 * @param name
@@ -40,6 +40,6 @@ public interface OrganizationService {
 	int deleteById(String id);
 	
 	int updateOrganization(String name,String type,String managerId,String superId,String status,Integer province,
-			String remarks,String id,String depn,String abbreviation,String financeId);
+			String remarks,String id,String depn,String abbreviation,String financeId,Integer workingHoursType);
 	
 }

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

@@ -61,7 +61,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 	 *
 	 */
 	@Override
-	public int addOrganization( String name, String managerId, String type, String superId, String remarks,String dep) {
+	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(); 
@@ -79,6 +79,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		om.setSuperId(superId);
 		om.setRemarks(remarks);
 		om.setStatus("0");
+		om.setWorkingHoursType(workingHoursType);
 		organizationManagementMapper.insert(om);
 		return 1;
 	}
@@ -100,7 +101,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 	}
 	@Override
 	public int updateOrganization(String name, String type, String managerId, String superId, String status,Integer province,
-			String remarks,String id,String depn,String abbreviation,String financeId) {
+			String remarks,String id,String depn,String abbreviation,String financeId,Integer workingHoursType) {
 		Date now=new Date();
 		OrganizationManagement om=new OrganizationManagement();
 		om.setName(name);
@@ -115,6 +116,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		om.setAbbreviation(abbreviation);
 		om.setFinanceId(financeId);
 		om.setProvince(province);
+		om.setWorkingHoursType(workingHoursType);
 		tOrderMidMapper.updateFinanceId(id,financeId);
 		int x=organizationManagementMapper.updateByPrimaryKeySelective(om);
 		//*******下级编号修改