Skip to content

8
8timerapiv200
Commit 55e24052 by 邓实川 Committed by chenzg
Options

组织架构部门领导参数添加

parent 5b84c83c
Showing with 17 additions and 11 deletions
src/main/java/cn/timer/api/bean/zzgl/ZzglBmgwM.java
...@@ -67,6 +67,9 @@ public class ZzglBmgwM extends Model<ZzglBmgwM> { ...@@ -67,6 +67,9 @@ public class ZzglBmgwM extends Model<ZzglBmgwM> {
@ApiModelProperty(value = "备注 ", example = "备注") @ApiModelProperty(value = "备注 ", example = "备注")
private String remark; private String remark;
@ApiModelProperty(value = "部门领导id ", example = "9688")
private Integer leader;
@TableField(fill = FieldFill.UPDATE) @TableField(fill = FieldFill.UPDATE)
@ApiModelProperty(value = "更新时间 ", example = "2019-10-01") @ApiModelProperty(value = "更新时间 ", example = "2019-10-01")
private Date updateTime; private Date updateTime;
......
src/main/java/cn/timer/api/controller/zzgl/ZzglController.java
...@@ -46,7 +46,7 @@ public class ZzglController { ...@@ -46,7 +46,7 @@ public class ZzglController {
ZzglBmgwMMapper zzglBmgwMMapper; ZzglBmgwMMapper zzglBmgwMMapper;
@Autowired @Autowired
ZzglLogDgjlMapper zzglLogDgjlMapper; ZzglLogDgjlMapper zzglLogDgjlMapper;
/** /**
* 架构树/架构图/导出 * 架构树/架构图/导出
...@@ -71,7 +71,7 @@ public class ZzglController { ...@@ -71,7 +71,7 @@ public class ZzglController {
*/ */
@GetMapping(value = "/otherlistent/{id}") @GetMapping(value = "/otherlistent/{id}")
@ApiOperation(value = "获取岗位成员列表", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取岗位成员列表", httpMethod = "GET", notes = "接口发布说明")
public Result<List<YgglMainEmp>> selectOtherlistent(@CurrentUser UserBean userBean, @PathVariable Integer id){ public Result<List<YgglMainEmp>> selectOtherlistent(@CurrentUser UserBean userBean, @PathVariable Integer id) {
Integer orgCode = userBean.getOrgCode(); Integer orgCode = userBean.getOrgCode();
ArrayList<Integer> list = new ArrayList<Integer>(); ArrayList<Integer> list = new ArrayList<Integer>();
List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper) List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper)
...@@ -79,6 +79,9 @@ public class ZzglController { ...@@ -79,6 +79,9 @@ public class ZzglController {
list.add(id); list.add(id);
ZzglBmgwM.getDepts(list, id, zzglBmgwMs); ZzglBmgwM.getDepts(list, id, zzglBmgwMs);
ZzglBmgwM messsage = ZzglBmgwM.builder().build().selectOne(new QueryWrapper<ZzglBmgwM>().eq("id", id));
Integer lead = messsage.getLeader(); // 获取部门或岗位领导id
if (list == null || list.size() == 0) { if (list == null || list.size() == 0) {
return ResultUtil.error("部门信息不存在，请先添加部门！"); return ResultUtil.error("部门信息不存在，请先添加部门！");
} else { } else {
...@@ -86,11 +89,11 @@ public class ZzglController { ...@@ -86,11 +89,11 @@ public class ZzglController {
ygglMainEmpsLambdaQueryWrapper ygglMainEmpsLambdaQueryWrapper
.select(YgglMainEmp::getId, YgglMainEmp::getEmpNum, YgglMainEmp::getName, YgglMainEmp::getPhone, .select(YgglMainEmp::getId, YgglMainEmp::getEmpNum, YgglMainEmp::getName, YgglMainEmp::getPhone,
YgglMainEmp::getBmgwId) YgglMainEmp::getBmgwId)
.eq(YgglMainEmp::getOrgCode, orgCode).and(i -> i.in(YgglMainEmp::getBmgwId, list.toArray())); .eq(YgglMainEmp::getOrgCode, orgCode).and(i -> i.in(YgglMainEmp::getBmgwId, list.toArray()))
.last(lead != null, "order by if (emp_num='" + lead + "',0,1)");
List<YgglMainEmp> ygglMainEmps = YgglMainEmp.builder().build().selectList(ygglMainEmpsLambdaQueryWrapper); List<YgglMainEmp> ygglMainEmps = YgglMainEmp.builder().build().selectList(ygglMainEmpsLambdaQueryWrapper);
return ResultUtil.data(ygglMainEmps); return ResultUtil.data(ygglMainEmps);
} }
} }
/** /**
...@@ -101,7 +104,8 @@ public class ZzglController { ...@@ -101,7 +104,8 @@ public class ZzglController {
*/ */
@PostMapping(value = "/listdgjl") @PostMapping(value = "/listdgjl")
@ApiOperation(value = "获取调岗记录(weng)", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "获取调岗记录(weng)", httpMethod = "POST", notes = "接口发布说明")
public Result<Object> selectlistdgjl(@CurrentUser UserBean userBean, @RequestBody LogDgjlsQueryDto logDgjlsQueryDto){ public Result<Object> selectlistdgjl(@CurrentUser UserBean userBean,
@RequestBody LogDgjlsQueryDto logDgjlsQueryDto) {
Integer orgCode = userBean.getOrgCode(); Integer orgCode = userBean.getOrgCode();
ArrayList<Integer> list = new ArrayList<Integer>(); ArrayList<Integer> list = new ArrayList<Integer>();
List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper) List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper)
...@@ -112,10 +116,10 @@ public class ZzglController { ...@@ -112,10 +116,10 @@ public class ZzglController {
if (list == null || list.size() == 0) { if (list == null || list.size() == 0) {
return ResultUtil.error("部门信息不存在，请先添加部门！"); return ResultUtil.error("部门信息不存在，请先添加部门！");
} else { } else {
logDgjlsQueryDto.setDeptIdList(list); logDgjlsQueryDto.setDeptIdList(list);
logDgjlsQueryDto.setOrgCode(orgCode); logDgjlsQueryDto.setOrgCode(orgCode);
IPage<LogDgjlsDto> page = new Page<LogDgjlsDto>( IPage<LogDgjlsDto> page = new Page<LogDgjlsDto>(
logDgjlsQueryDto.getCurrentPage() == null ? 1 : logDgjlsQueryDto.getCurrentPage(), logDgjlsQueryDto.getCurrentPage() == null ? 1 : logDgjlsQueryDto.getCurrentPage(),
logDgjlsQueryDto.getTotalPage() == null ? 10 : logDgjlsQueryDto.getTotalPage()); logDgjlsQueryDto.getTotalPage() == null ? 10 : logDgjlsQueryDto.getTotalPage());
...@@ -155,7 +159,7 @@ public class ZzglController { ...@@ -155,7 +159,7 @@ public class ZzglController {
*/ */
@PostMapping(value = "/dept") @PostMapping(value = "/dept")
@ApiOperation(value = "添加/修改部门", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "添加/修改部门", httpMethod = "POST", notes = "接口发布说明")
public Result<ZzglBmgwM> adddept(@CurrentUser UserBean userBean, @RequestBody ZzglBmgwM zzglBmgwM){ public Result<ZzglBmgwM> adddept(@CurrentUser UserBean userBean, @RequestBody ZzglBmgwM zzglBmgwM) {
Boolean a = zzglBmgwM.getId() == null; Boolean a = zzglBmgwM.getId() == null;
if (a && zzglBmgwM.getType() == null) if (a && zzglBmgwM.getType() == null)
zzglBmgwM.setType((Integer) 0); zzglBmgwM.setType((Integer) 0);
...@@ -164,7 +168,6 @@ public class ZzglController { ...@@ -164,7 +168,6 @@ public class ZzglController {
if (a) if (a)
return ResultUtil.data(zzglBmgwM); return ResultUtil.data(zzglBmgwM);
return ResultUtil.success(); return ResultUtil.success();
} }
/** /**
...@@ -207,7 +210,7 @@ public class ZzglController { ...@@ -207,7 +210,7 @@ public class ZzglController {
// zzglLogDgjlMapper.insert // zzglLogDgjlMapper.insert
return ResultUtil.success(); return ResultUtil.success();
} }
/** /**
* 岗位权限 * 岗位权限
* *
...@@ -221,7 +224,7 @@ public class ZzglController { ...@@ -221,7 +224,7 @@ public class ZzglController {
ArrayList<Integer> list = new ArrayList<Integer>(); ArrayList<Integer> list = new ArrayList<Integer>();
List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper) List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper)
.eq(ZzglBmgwM::getOrgCode, orgCode).list(); .eq(ZzglBmgwM::getOrgCode, orgCode).list();
ZzglBmgwM.getupDepts(list, id, zzglBmgwMs); ZzglBmgwM.getupDepts(list, id, zzglBmgwMs);
if (list == null || list.size() == 0) { if (list == null || list.size() == 0) {
return ResultUtil.error("部门信息不存在，请先添加部门！"); return ResultUtil.error("部门信息不存在，请先添加部门！");
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment