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