Commit a765c54f by 太阳与水

排序100%

parent 05fd3c8c
...@@ -147,7 +147,7 @@ public class YgglController { ...@@ -147,7 +147,7 @@ public class YgglController {
// 获取员工档案 // 获取员工档案
@GetMapping(value = "/ygda/{empNum}") @GetMapping(value = "/ygda/{empNum}")
@ApiOperation(value = "获取员工档案(管)", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工档案(管)", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 14) @ApiOperationSupport(order = 2)
public Result<YgglMainEmp> selectygda(@CurrentUser UserBean userBean, @PathVariable Integer empNum) { public Result<YgglMainEmp> selectygda(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
Integer orgCode = userBean.getOrgCode(); Integer orgCode = userBean.getOrgCode();
QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<>(); QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<>();
...@@ -165,7 +165,7 @@ public class YgglController { ...@@ -165,7 +165,7 @@ public class YgglController {
*/ */
@GetMapping(value = "/ygdabm/{gwid}") @GetMapping(value = "/ygdabm/{gwid}")
@ApiOperation(value = "获取员工档案部门岗位名称", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工档案部门岗位名称", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 3)
public Result<String> selectbmgw(@CurrentUser UserBean userBean,@PathVariable Integer gwid) { public Result<String> selectbmgw(@CurrentUser UserBean userBean,@PathVariable Integer gwid) {
if (gwid==null||gwid==0) { if (gwid==null||gwid==0) {
return ResultUtil.data("无岗位","获取员工档案部门岗位名称成功"); return ResultUtil.data("无岗位","获取员工档案部门岗位名称成功");
...@@ -190,7 +190,7 @@ public class YgglController { ...@@ -190,7 +190,7 @@ public class YgglController {
*/ */
@PostMapping(value = "/addygda") @PostMapping(value = "/addygda")
@ApiOperation(value = "添加员工档案", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "添加员工档案", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 26) @ApiOperationSupport(order = 4)
public Result<Object> addygda(@CurrentUser UserBean userBean, @RequestBody AddygdaDto addygdaDto) { public Result<Object> addygda(@CurrentUser UserBean userBean, @RequestBody AddygdaDto addygdaDto) {
Integer orgCode = userBean.getOrgCode(); Integer orgCode = userBean.getOrgCode();
String name = addygdaDto.getName(); String name = addygdaDto.getName();
...@@ -250,7 +250,7 @@ public class YgglController { ...@@ -250,7 +250,7 @@ public class YgglController {
*/ */
@PostMapping(value = "/updateygda") @PostMapping(value = "/updateygda")
@ApiOperation(value = "修改员工档案", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "修改员工档案", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 27) @ApiOperationSupport(order = 5)
public Result<Object> updateygda(@CurrentUser UserBean userBean, @RequestBody YgglMainEmp ygglMainEmp) { public Result<Object> updateygda(@CurrentUser UserBean userBean, @RequestBody YgglMainEmp ygglMainEmp) {
if (ygglMainEmp.getEmpNum() != null) { if (ygglMainEmp.getEmpNum() != null) {
...@@ -269,7 +269,7 @@ public class YgglController { ...@@ -269,7 +269,7 @@ public class YgglController {
*/ */
@PostMapping(value = "/ygquery") @PostMapping(value = "/ygquery")
@ApiOperation(value = "员工搜索/分页", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "员工搜索/分页", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 52) @ApiOperationSupport(order = 6)
public Result<Object> ygquery(@CurrentUser UserBean userBean, @RequestBody YgQueryDto ygQueryDto) { public Result<Object> ygquery(@CurrentUser UserBean userBean, @RequestBody YgQueryDto ygQueryDto) {
Integer orgCode = userBean.getOrgCode(); Integer orgCode = userBean.getOrgCode();
Integer b = ygQueryDto.getBmgwid(); Integer b = ygQueryDto.getBmgwid();
...@@ -305,7 +305,7 @@ public class YgglController { ...@@ -305,7 +305,7 @@ public class YgglController {
//威力加强版 //威力加强版
@PostMapping(value = "/ygdas") @PostMapping(value = "/ygdas")
@ApiOperation(value = "导入威力加强版", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "导入威力加强版", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 70) @ApiOperationSupport(order = 7)
public Result<List<YgDrjqbDto>> ygdr(@CurrentUser UserBean userBean,@RequestBody YgDrsDto drList) { public Result<List<YgDrjqbDto>> ygdr(@CurrentUser UserBean userBean,@RequestBody YgDrsDto drList) {
drList.setOrgCode(userBean.getOrgCode()); drList.setOrgCode(userBean.getOrgCode());
YgDrsDto tofList = errorFilter(drList);//滤嘴,过滤信息 YgDrsDto tofList = errorFilter(drList);//滤嘴,过滤信息
...@@ -648,7 +648,7 @@ public class YgglController { ...@@ -648,7 +648,7 @@ public class YgglController {
*/ */
@GetMapping(value = "/ygdas") @GetMapping(value = "/ygdas")
@ApiOperation(value = "导出/批量添加/修改员工", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "导出/批量添加/修改员工", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 55) @ApiOperationSupport(order = 8)
public Result<List<YgglMainEmp>> selectygdas(@CurrentUser UserBean userBean) { public Result<List<YgglMainEmp>> selectygdas(@CurrentUser UserBean userBean) {
Integer orgCode = userBean.getOrgCode(); Integer orgCode = userBean.getOrgCode();
QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<>(); QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<>();
...@@ -664,7 +664,7 @@ public class YgglController { ...@@ -664,7 +664,7 @@ public class YgglController {
*/ */
@GetMapping(value = "/jyjlb") @GetMapping(value = "/jyjlb")
@ApiOperation(value = "获取员工教育经历表", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工教育经历表", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 3) @ApiOperationSupport(order = 9)
public Result<List<YgglAttaJyjlb>> selectjyjlb(@CurrentUser UserBean userBean) { public Result<List<YgglAttaJyjlb>> selectjyjlb(@CurrentUser UserBean userBean) {
List<YgglAttaJyjlb> ygglAttaJyjlbss = YgglAttaJyjlb.builder().build() List<YgglAttaJyjlb> ygglAttaJyjlbss = YgglAttaJyjlb.builder().build()
.selectList(new QueryWrapper<YgglAttaJyjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", .selectList(new QueryWrapper<YgglAttaJyjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
...@@ -675,7 +675,7 @@ public class YgglController { ...@@ -675,7 +675,7 @@ public class YgglController {
// 获取员工教育经历表 // 获取员工教育经历表
@GetMapping(value = "/jyjlb/{empNum}") @GetMapping(value = "/jyjlb/{empNum}")
@ApiOperation(value = "获取员工教育经历表(管)", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工教育经历表(管)", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 16) @ApiOperationSupport(order = 10)
public Result<List<YgglAttaJyjlb>> selectjyjlb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) { public Result<List<YgglAttaJyjlb>> selectjyjlb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
List<YgglAttaJyjlb> ygglAttaJyjlbs = YgglAttaJyjlb.builder().build().selectList( List<YgglAttaJyjlb> ygglAttaJyjlbs = YgglAttaJyjlb.builder().build().selectList(
new QueryWrapper<YgglAttaJyjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum)); new QueryWrapper<YgglAttaJyjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
...@@ -689,7 +689,7 @@ public class YgglController { ...@@ -689,7 +689,7 @@ public class YgglController {
*/ */
@PostMapping(value = "/jyjlb") @PostMapping(value = "/jyjlb")
@ApiOperation(value = "添加/修改员工教育经历表", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "添加/修改员工教育经历表", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 32) @ApiOperationSupport(order = 11)
public Result<YgglAttaJyjlb> addjyjlb(@CurrentUser UserBean userBean, @RequestBody YgglAttaJyjlb ygglAttaJyjlb) { public Result<YgglAttaJyjlb> addjyjlb(@CurrentUser UserBean userBean, @RequestBody YgglAttaJyjlb ygglAttaJyjlb) {
ygglAttaJyjlb.setEmpNum(ygglAttaJyjlb.getEmpNum()); ygglAttaJyjlb.setEmpNum(ygglAttaJyjlb.getEmpNum());
ygglAttaJyjlb.setOrgCode(userBean.getOrgCode()); ygglAttaJyjlb.setOrgCode(userBean.getOrgCode());
...@@ -704,7 +704,7 @@ public class YgglController { ...@@ -704,7 +704,7 @@ public class YgglController {
*/ */
@DeleteMapping(value = "/jyjlb/{id}") @DeleteMapping(value = "/jyjlb/{id}")
@ApiOperation(value = "删除员工教育经历表", httpMethod = "DELETE", notes = "接口发布说明") @ApiOperation(value = "删除员工教育经历表", httpMethod = "DELETE", notes = "接口发布说明")
@ApiOperationSupport(order = 43) @ApiOperationSupport(order = 12)
public Result<Boolean> deljyjlb(@CurrentUser UserBean userBean, @PathVariable Integer id) { public Result<Boolean> deljyjlb(@CurrentUser UserBean userBean, @PathVariable Integer id) {
Integer orgCode = userBean.getOrgCode(); Integer orgCode = userBean.getOrgCode();
return ResultUtil.data(YgglAttaJyjlb.builder().build() return ResultUtil.data(YgglAttaJyjlb.builder().build()
...@@ -719,7 +719,7 @@ public class YgglController { ...@@ -719,7 +719,7 @@ public class YgglController {
*/ */
@GetMapping(value = "/pxjlxxb") @GetMapping(value = "/pxjlxxb")
@ApiOperation(value = "获取员工培训经历信息表", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工培训经历信息表", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 7) @ApiOperationSupport(order = 13)
public Result<List<YgglAttaPxjlxxb>> selectpxjlxxb(@CurrentUser UserBean userBean) { public Result<List<YgglAttaPxjlxxb>> selectpxjlxxb(@CurrentUser UserBean userBean) {
List<YgglAttaPxjlxxb> ygglAttaPxjlxxbs = YgglAttaPxjlxxb.builder().build() List<YgglAttaPxjlxxb> ygglAttaPxjlxxbs = YgglAttaPxjlxxb.builder().build()
.selectList(new QueryWrapper<YgglAttaPxjlxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", .selectList(new QueryWrapper<YgglAttaPxjlxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
...@@ -730,7 +730,7 @@ public class YgglController { ...@@ -730,7 +730,7 @@ public class YgglController {
// 获取员工培训经历信息表 // 获取员工培训经历信息表
@GetMapping(value = "/pxjlxxb/{empNum}") @GetMapping(value = "/pxjlxxb/{empNum}")
@ApiOperation(value = "获取员工培训经历信息表(管)", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工培训经历信息表(管)", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 20) @ApiOperationSupport(order = 14)
public Result<List<YgglAttaPxjlxxb>> selectpxjlxxb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) { public Result<List<YgglAttaPxjlxxb>> selectpxjlxxb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
List<YgglAttaPxjlxxb> ygglAttaPxjlxxbs = YgglAttaPxjlxxb.builder().build().selectList( List<YgglAttaPxjlxxb> ygglAttaPxjlxxbs = YgglAttaPxjlxxb.builder().build().selectList(
new QueryWrapper<YgglAttaPxjlxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum)); new QueryWrapper<YgglAttaPxjlxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
...@@ -745,7 +745,7 @@ public class YgglController { ...@@ -745,7 +745,7 @@ public class YgglController {
*/ */
@PostMapping(value = "/pxjlxxb") @PostMapping(value = "/pxjlxxb")
@ApiOperation(value = "添加/修改员工培训经历信息表", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "添加/修改员工培训经历信息表", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 36) @ApiOperationSupport(order = 15)
public Result<YgglAttaPxjlxxb> addpxjlxxb(@CurrentUser UserBean userBean, public Result<YgglAttaPxjlxxb> addpxjlxxb(@CurrentUser UserBean userBean,
@RequestBody YgglAttaPxjlxxb ygglAttaPxjlxxb) { @RequestBody YgglAttaPxjlxxb ygglAttaPxjlxxb) {
ygglAttaPxjlxxb.setEmpNum(ygglAttaPxjlxxb.getEmpNum()); ygglAttaPxjlxxb.setEmpNum(ygglAttaPxjlxxb.getEmpNum());
...@@ -762,7 +762,7 @@ public class YgglController { ...@@ -762,7 +762,7 @@ public class YgglController {
*/ */
@DeleteMapping(value = "/pxjlxxb/{id}") @DeleteMapping(value = "/pxjlxxb/{id}")
@ApiOperation(value = "删除员工培训经历信息表", httpMethod = "DELETE", notes = "接口发布说明") @ApiOperation(value = "删除员工培训经历信息表", httpMethod = "DELETE", notes = "接口发布说明")
@ApiOperationSupport(order = 47) @ApiOperationSupport(order = 16)
public Result<Boolean> delpxjlxxb(@CurrentUser UserBean userBean, @PathVariable Integer id) { public Result<Boolean> delpxjlxxb(@CurrentUser UserBean userBean, @PathVariable Integer id) {
Integer orgCode = userBean.getOrgCode(); Integer orgCode = userBean.getOrgCode();
return ResultUtil.data(YgglAttaPxjlxxb.builder().build() return ResultUtil.data(YgglAttaPxjlxxb.builder().build()
...@@ -777,7 +777,7 @@ public class YgglController { ...@@ -777,7 +777,7 @@ public class YgglController {
*/ */
@GetMapping(value = "/gzjlb") @GetMapping(value = "/gzjlb")
@ApiOperation(value = "获取员工工作经历表", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工工作经历表", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 4) @ApiOperationSupport(order = 17)
public Result<List<YgglAttaGzjlb>> selectgzjlb(@CurrentUser UserBean userBean) { public Result<List<YgglAttaGzjlb>> selectgzjlb(@CurrentUser UserBean userBean) {
List<YgglAttaGzjlb> ygglAttaGzjlbs = YgglAttaGzjlb.builder().build() List<YgglAttaGzjlb> ygglAttaGzjlbs = YgglAttaGzjlb.builder().build()
.selectList(new QueryWrapper<YgglAttaGzjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", .selectList(new QueryWrapper<YgglAttaGzjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
...@@ -787,7 +787,7 @@ public class YgglController { ...@@ -787,7 +787,7 @@ public class YgglController {
// 获取员工工作经历表 // 获取员工工作经历表
@GetMapping(value = "/gzjlb/{empNum}") @GetMapping(value = "/gzjlb/{empNum}")
@ApiOperation(value = "获取员工工作经历表(管)", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工工作经历表(管)", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 17) @ApiOperationSupport(order = 18)
public Result<List<YgglAttaGzjlb>> selectgzjlb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) { public Result<List<YgglAttaGzjlb>> selectgzjlb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
List<YgglAttaGzjlb> ygglAttaGzjlbs = YgglAttaGzjlb.builder().build().selectList( List<YgglAttaGzjlb> ygglAttaGzjlbs = YgglAttaGzjlb.builder().build().selectList(
new QueryWrapper<YgglAttaGzjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum)); new QueryWrapper<YgglAttaGzjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
...@@ -802,7 +802,7 @@ public class YgglController { ...@@ -802,7 +802,7 @@ public class YgglController {
*/ */
@PostMapping(value = "/gzjlb") @PostMapping(value = "/gzjlb")
@ApiOperation(value = "添加/修改员工工作经历表", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "添加/修改员工工作经历表", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 33) @ApiOperationSupport(order = 19)
public Result<YgglAttaGzjlb> addgzjlb(@CurrentUser UserBean userBean, @RequestBody YgglAttaGzjlb ygglAttaGzjlb) { public Result<YgglAttaGzjlb> addgzjlb(@CurrentUser UserBean userBean, @RequestBody YgglAttaGzjlb ygglAttaGzjlb) {
ygglAttaGzjlb.setEmpNum(ygglAttaGzjlb.getEmpNum()); ygglAttaGzjlb.setEmpNum(ygglAttaGzjlb.getEmpNum());
ygglAttaGzjlb.setOrgCode(userBean.getOrgCode()); ygglAttaGzjlb.setOrgCode(userBean.getOrgCode());
...@@ -810,7 +810,20 @@ public class YgglController { ...@@ -810,7 +810,20 @@ public class YgglController {
return ResultUtil.data(ygglAttaGzjlb, "添加/修改员工工作经历表成功"); return ResultUtil.data(ygglAttaGzjlb, "添加/修改员工工作经历表成功");
} }
/**
* 删除员工工作经历表
*
* @param
* @return
*/
@DeleteMapping(value = "/gzjlb/{id}")
@ApiOperation(value = "删除员工工作经历表", httpMethod = "DELETE", notes = "接口发布说明")
@ApiOperationSupport(order = 20)
public Result<Boolean> delgzjlb(@CurrentUser UserBean userBean, @PathVariable Integer id) {
Integer orgCode = userBean.getOrgCode();
return ResultUtil.data(YgglAttaGzjlb.builder().build()
.delete(new QueryWrapper<YgglAttaGzjlb>().eq("org_code", orgCode).eq("id", id)), "删除员工工作经历表成功");
}
/** /**
...@@ -821,7 +834,7 @@ public class YgglController { ...@@ -821,7 +834,7 @@ public class YgglController {
*/ */
@GetMapping(value = "/zcxxb") @GetMapping(value = "/zcxxb")
@ApiOperation(value = "获取员工职称信息表", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工职称信息表", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 5) @ApiOperationSupport(order = 21)
public Result<List<YgglAttaZcxxb>> selectzcxxb(@CurrentUser UserBean userBean) { public Result<List<YgglAttaZcxxb>> selectzcxxb(@CurrentUser UserBean userBean) {
List<YgglAttaZcxxb> ygglAttaZcxxbs = YgglAttaZcxxb.builder().build() List<YgglAttaZcxxb> ygglAttaZcxxbs = YgglAttaZcxxb.builder().build()
.selectList(new QueryWrapper<YgglAttaZcxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", .selectList(new QueryWrapper<YgglAttaZcxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
...@@ -832,7 +845,7 @@ public class YgglController { ...@@ -832,7 +845,7 @@ public class YgglController {
// 获取员工职称信息表 // 获取员工职称信息表
@GetMapping(value = "/zcxxb/{empNum}") @GetMapping(value = "/zcxxb/{empNum}")
@ApiOperation(value = "获取员工职称信息表(管)", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工职称信息表(管)", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 18) @ApiOperationSupport(order = 22)
public Result<List<YgglAttaZcxxb>> selectzcxxb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) { public Result<List<YgglAttaZcxxb>> selectzcxxb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
List<YgglAttaZcxxb> ygglAttaZcxxbs = YgglAttaZcxxb.builder().build().selectList( List<YgglAttaZcxxb> ygglAttaZcxxbs = YgglAttaZcxxb.builder().build().selectList(
new QueryWrapper<YgglAttaZcxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum)); new QueryWrapper<YgglAttaZcxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
...@@ -847,7 +860,7 @@ public class YgglController { ...@@ -847,7 +860,7 @@ public class YgglController {
*/ */
@PostMapping(value = "/zcxxb") @PostMapping(value = "/zcxxb")
@ApiOperation(value = "添加/修改员工职称信息表", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "添加/修改员工职称信息表", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 34) @ApiOperationSupport(order = 23)
public Result<YgglAttaZcxxb> addzcxxb(@CurrentUser UserBean userBean, @RequestBody YgglAttaZcxxb ygglAttaZcxxb) { public Result<YgglAttaZcxxb> addzcxxb(@CurrentUser UserBean userBean, @RequestBody YgglAttaZcxxb ygglAttaZcxxb) {
ygglAttaZcxxb.setEmpNum(ygglAttaZcxxb.getEmpNum()); ygglAttaZcxxb.setEmpNum(ygglAttaZcxxb.getEmpNum());
ygglAttaZcxxb.setOrgCode(userBean.getOrgCode()); ygglAttaZcxxb.setOrgCode(userBean.getOrgCode());
...@@ -864,31 +877,18 @@ public class YgglController { ...@@ -864,31 +877,18 @@ public class YgglController {
*/ */
@DeleteMapping(value = "/zcxxb/{id}") @DeleteMapping(value = "/zcxxb/{id}")
@ApiOperation(value = "删除员工职称信息表", httpMethod = "DELETE", notes = "接口发布说明") @ApiOperation(value = "删除员工职称信息表", httpMethod = "DELETE", notes = "接口发布说明")
@ApiOperationSupport(order = 45) @ApiOperationSupport(order = 24)
public Result<Boolean> delzcxxb(@CurrentUser UserBean userBean, @PathVariable Integer id) { public Result<Boolean> delzcxxb(@CurrentUser UserBean userBean, @PathVariable Integer id) {
Integer orgCode = userBean.getOrgCode(); Integer orgCode = userBean.getOrgCode();
return ResultUtil.data(YgglAttaZcxxb.builder().build() return ResultUtil.data(YgglAttaZcxxb.builder().build()
.delete(new QueryWrapper<YgglAttaZcxxb>().eq("org_code", orgCode).eq("id", id)), "删除员工职称信息表成功"); .delete(new QueryWrapper<YgglAttaZcxxb>().eq("org_code", orgCode).eq("id", id)), "删除员工职称信息表成功");
} }
/**
* 删除员工工作经历表
*
* @param
* @return
*/
@DeleteMapping(value = "/gzjlb/{id}")
@ApiOperation(value = "删除员工工作经历表", httpMethod = "DELETE", notes = "接口发布说明")
@ApiOperationSupport(order = 44)
public Result<Boolean> delgzjlb(@CurrentUser UserBean userBean, @PathVariable Integer id) {
Integer orgCode = userBean.getOrgCode();
return ResultUtil.data(YgglAttaGzjlb.builder().build()
.delete(new QueryWrapper<YgglAttaGzjlb>().eq("org_code", orgCode).eq("id", id)), "删除员工工作经历表成功");
}
// 获取员工证书证件表
/** /**
* 获取员工证书证件表 * 获取员工证书证件表
* *
...@@ -897,7 +897,7 @@ public class YgglController { ...@@ -897,7 +897,7 @@ public class YgglController {
*/ */
@GetMapping(value = "/zszjb") @GetMapping(value = "/zszjb")
@ApiOperation(value = "获取员工证书证件表", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工证书证件表", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 6) @ApiOperationSupport(order = 25)
public Result<List<YgglAttaZszjb>> selectzszjb(@CurrentUser UserBean userBean) { public Result<List<YgglAttaZszjb>> selectzszjb(@CurrentUser UserBean userBean) {
List<YgglAttaZszjb> ygglAttaZszjbs = YgglAttaZszjb.builder().build() List<YgglAttaZszjb> ygglAttaZszjbs = YgglAttaZszjb.builder().build()
.selectList(new QueryWrapper<YgglAttaZszjb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", .selectList(new QueryWrapper<YgglAttaZszjb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
...@@ -905,9 +905,48 @@ public class YgglController { ...@@ -905,9 +905,48 @@ public class YgglController {
return ResultUtil.data(ygglAttaZszjbs, "获取员工证书证件表成功"); return ResultUtil.data(ygglAttaZszjbs, "获取员工证书证件表成功");
} }
// 获取员工证书证件表
@GetMapping(value = "/zszjb/{empNum}")
@ApiOperation(value = "获取员工证书证件表(管)", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 26)
public Result<List<YgglAttaZszjb>> selectzszjb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
List<YgglAttaZszjb> ygglAttaZszjbs = YgglAttaZszjb.builder().build().selectList(
new QueryWrapper<YgglAttaZszjb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
return ResultUtil.data(ygglAttaZszjbs, "获取员工证书证件表成功");
}
/**
* 添加/修改员工证书证件表
*
* @param
* @return
*/
@PostMapping(value = "/zszjb")
@ApiOperation(value = "添加/修改员工证书证件表", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 27)
public Result<YgglAttaZszjb> addzszjb(@CurrentUser UserBean userBean, @RequestBody YgglAttaZszjb ygglAttaZszjb) {
ygglAttaZszjb.setEmpNum(ygglAttaZszjb.getEmpNum());
ygglAttaZszjb.setOrgCode(userBean.getOrgCode());
ygglAttaZszjb.insertOrUpdate();
return ResultUtil.data(ygglAttaZszjb, "添加/修改员工证书证件表成功");
}
/** /**
* 删除员工证书证件表
*
* @param
* @return
*/
@DeleteMapping(value = "/zszjb/{id}")
@ApiOperation(value = "删除员工证书证件表", httpMethod = "DELETE", notes = "接口发布说明")
@ApiOperationSupport(order = 28)
public Result<Boolean> delzszjb(@CurrentUser UserBean userBean, @PathVariable Integer id) {
Integer orgCode = userBean.getOrgCode();
return ResultUtil.data(YgglAttaZszjb.builder().build()
.delete(new QueryWrapper<YgglAttaZszjb>().eq("org_code", orgCode).eq("id", id)), "删除员工证书证件表成功");
}
/**
* 获取员工联系信息表 * 获取员工联系信息表
* *
* @param * @param
...@@ -915,13 +954,51 @@ public class YgglController { ...@@ -915,13 +954,51 @@ public class YgglController {
*/ */
@GetMapping(value = "/lxxxb") @GetMapping(value = "/lxxxb")
@ApiOperation(value = "获取员工联系信息表", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工联系信息表", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 8) @ApiOperationSupport(order = 29)
public Result<List<YgglAttaLxxxb>> selectlxxxb(@CurrentUser UserBean userBean) { public Result<List<YgglAttaLxxxb>> selectlxxxb(@CurrentUser UserBean userBean) {
List<YgglAttaLxxxb> ygglAttaLxxxbs = YgglAttaLxxxb.builder().build() List<YgglAttaLxxxb> ygglAttaLxxxbs = YgglAttaLxxxb.builder().build()
.selectList(new QueryWrapper<YgglAttaLxxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", .selectList(new QueryWrapper<YgglAttaLxxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
userBean.getEmpNum())); userBean.getEmpNum()));
return ResultUtil.data(ygglAttaLxxxbs, "获取员工联系信息表成功"); return ResultUtil.data(ygglAttaLxxxbs, "获取员工联系信息表成功");
} }
// 获取员工联系信息表
@GetMapping(value = "/lxxxb/{empNum}")
@ApiOperation(value = "获取员工联系信息表(管)", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 30)
public Result<List<YgglAttaLxxxb>> selectlxxxb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
List<YgglAttaLxxxb> ygglAttaLxxxbs = YgglAttaLxxxb.builder().build().selectList(
new QueryWrapper<YgglAttaLxxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
return ResultUtil.data(ygglAttaLxxxbs, "获取员工联系信息表成功");
}
/**
* 添加/修改员工联系信息表
*
* @param
* @return
*/
@PostMapping(value = "/lxxxb")
@ApiOperation(value = "添加/修改员工联系信息表", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 31)
public Result<YgglAttaLxxxb> addlxxxb(@CurrentUser UserBean userBean, @RequestBody YgglAttaLxxxb ygglAttaLxxxb) {
ygglAttaLxxxb.setEmpNum(ygglAttaLxxxb.getEmpNum());
ygglAttaLxxxb.setOrgCode(userBean.getOrgCode());
ygglAttaLxxxb.insertOrUpdate();
return ResultUtil.data(ygglAttaLxxxb, "添加/修改员工联系信息表成功");
}
/**
* 删除员工联系信息表
*
* @param
* @return
*/
@DeleteMapping(value = "/lxxxb/{id}")
@ApiOperation(value = "删除员工联系信息表", httpMethod = "DELETE", notes = "接口发布说明")
@ApiOperationSupport(order = 32)
public Result<Boolean> dellxxxb(@CurrentUser UserBean userBean, @PathVariable Integer id) {
Integer orgCode = userBean.getOrgCode();
return ResultUtil.data(YgglAttaLxxxb.builder().build()
.delete(new QueryWrapper<YgglAttaLxxxb>().eq("org_code", orgCode).eq("id", id)), "删除员工联系信息表成功");
}
/** /**
* 获取员工紧急联系人表 * 获取员工紧急联系人表
...@@ -931,7 +1008,7 @@ public class YgglController { ...@@ -931,7 +1008,7 @@ public class YgglController {
*/ */
@GetMapping(value = "/jjlxr") @GetMapping(value = "/jjlxr")
@ApiOperation(value = "获取员工紧急联系人表", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工紧急联系人表", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 9) @ApiOperationSupport(order = 33)
public Result<List<YgglAttaJjlxr>> selectjjlxr(@CurrentUser UserBean userBean) { public Result<List<YgglAttaJjlxr>> selectjjlxr(@CurrentUser UserBean userBean) {
List<YgglAttaJjlxr> ygglAttaJjlxrs = YgglAttaJjlxr.builder().build() List<YgglAttaJjlxr> ygglAttaJjlxrs = YgglAttaJjlxr.builder().build()
.selectList(new QueryWrapper<YgglAttaJjlxr>().eq("org_code", userBean.getOrgCode()).eq("emp_num", .selectList(new QueryWrapper<YgglAttaJjlxr>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
...@@ -939,6 +1016,45 @@ public class YgglController { ...@@ -939,6 +1016,45 @@ public class YgglController {
return ResultUtil.data(ygglAttaJjlxrs, "获取员工紧急联系人表成功"); return ResultUtil.data(ygglAttaJjlxrs, "获取员工紧急联系人表成功");
} }
// 获取员工紧急联系人表
@GetMapping(value = "/jjlxr/{empNum}")
@ApiOperation(value = "获取员工紧急联系人表(管)", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 34)
public Result<List<YgglAttaJjlxr>> selectjjlxr(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
List<YgglAttaJjlxr> ygglAttaJjlxrs = YgglAttaJjlxr.builder().build().selectList(
new QueryWrapper<YgglAttaJjlxr>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
return ResultUtil.data(ygglAttaJjlxrs, "获取员工紧急联系人表成功");
}
/**
* 添加/修改员工紧急联系人表
*
* @param
* @return
*/
@PostMapping(value = "/jjlxr")
@ApiOperation(value = "添加/修改员工紧急联系人表", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 35)
public Result<YgglAttaJjlxr> addjjlxr(@CurrentUser UserBean userBean, @RequestBody YgglAttaJjlxr ygglAttaJjlxr) {
ygglAttaJjlxr.setEmpNum(ygglAttaJjlxr.getEmpNum());
ygglAttaJjlxr.setOrgCode(userBean.getOrgCode());
ygglAttaJjlxr.insertOrUpdate();
return ResultUtil.data(ygglAttaJjlxr, "添加/修改员工紧急联系人表成功");
}
/**
* 删除员工紧急联系人表
*
* @param
* @return
*/
@DeleteMapping(value = "/jjlxr/{id}")
@ApiOperation(value = "删除员工紧急联系人表", httpMethod = "DELETE", notes = "接口发布说明")
@ApiOperationSupport(order = 36)
public Result<Boolean> deljjlxr(@CurrentUser UserBean userBean, @PathVariable Integer id) {
Integer orgCode = userBean.getOrgCode();
return ResultUtil.data(YgglAttaJjlxr.builder().build()
.delete(new QueryWrapper<YgglAttaJjlxr>().eq("org_code", orgCode).eq("id", id)), "删除员工紧急联系人表成功");
}
// 获取工资卡信息 // 获取工资卡信息
/** /**
* 获取员工工资卡信息 * 获取员工工资卡信息
...@@ -948,155 +1064,210 @@ public class YgglController { ...@@ -948,155 +1064,210 @@ public class YgglController {
*/ */
@GetMapping(value = "/gzk") @GetMapping(value = "/gzk")
@ApiOperation(value = "获取员工工资卡信息", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工工资卡信息", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 10) @ApiOperationSupport(order = 37)
public Result<List<YgglAttaGzk>> selectgzk(@CurrentUser UserBean userBean) { public Result<List<YgglAttaGzk>> selectgzk(@CurrentUser UserBean userBean) {
List<YgglAttaGzk> ygglAttaGzks = YgglAttaGzk.builder().build().selectList(new QueryWrapper<YgglAttaGzk>() List<YgglAttaGzk> ygglAttaGzks = YgglAttaGzk.builder().build().selectList(new QueryWrapper<YgglAttaGzk>()
.eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum())); .eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum()));
return ResultUtil.data(ygglAttaGzks, "获取工资卡信息成功"); return ResultUtil.data(ygglAttaGzks, "获取工资卡信息成功");
} }
// 获取工资卡信息
@GetMapping(value = "/gzk/{empNum}")
@ApiOperation(value = "获取员工工资卡信息(管)", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 38)
public Result<List<YgglAttaGzk>> selectgzk(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
List<YgglAttaGzk> ygglAttaGzks = YgglAttaGzk.builder().build().selectList(
new QueryWrapper<YgglAttaGzk>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
return ResultUtil.data(ygglAttaGzks, "获取工资卡信息成功");
}
/** /**
* 获取员工合同信息表 * 添加/修改工资卡信息
* *
* @param * @param
* @return * @return
*/ */
@GetMapping(value = "/htxxb") @PostMapping(value = "/gzk")
@ApiOperation(value = "获取员工合同信息表", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "添加/修改工资卡信息", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 11) @ApiOperationSupport(order = 39)
public Result<List<YgglAttaHtxxb>> selecthtxxb(@CurrentUser UserBean userBean) { public Result<YgglAttaGzk> addgzk(@CurrentUser UserBean userBean, @RequestBody YgglAttaGzk ygglAttaGzk) {
List<YgglAttaHtxxb> ygglAttaHtxxbs = YgglAttaHtxxb.builder().build() ygglAttaGzk.setEmpNum(ygglAttaGzk.getEmpNum());
.selectList(new QueryWrapper<YgglAttaHtxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", ygglAttaGzk.setOrgCode(userBean.getOrgCode());
userBean.getEmpNum())); ygglAttaGzk.insertOrUpdate();
return ResultUtil.data(ygglAttaHtxxbs, "获取员工合同信息表成功"); return ResultUtil.data(ygglAttaGzk, "添加/修改工资卡信息成功");
} }
/** /**
* 获取员工材料附件表 * 删除工资卡信息
* *
* @param * @param
* @return * @return
*/ */
@GetMapping(value = "/clfjb") @DeleteMapping(value = "/gzk/{id}")
@ApiOperation(value = "获取员工材料附件表", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "删除工资卡信息", httpMethod = "DELETE", notes = "接口发布说明")
@ApiOperationSupport(order = 12) @ApiOperationSupport(order = 40)
public Result<List<YgglAttaClfjb>> selectclfjb(@CurrentUser UserBean userBean) { public Result<Boolean> delgzk(@CurrentUser UserBean userBean, @PathVariable Integer id) {
List<YgglAttaClfjb> ygglAttaClfjbs = YgglAttaClfjb.builder().build() Integer orgCode = userBean.getOrgCode();
.selectList(new QueryWrapper<YgglAttaClfjb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", return ResultUtil.data(YgglAttaGzk.builder().build()
userBean.getEmpNum())); .delete(new QueryWrapper<YgglAttaGzk>().eq("org_code", orgCode).eq("id", id)), "删除工资卡信息成功");
return ResultUtil.data(ygglAttaClfjbs, "获取员工材料附件表成功");
} }
// 获取成长记录表
/** /**
* 获取成长记录 * 获取员工合同信息
* *
* @param * @param
* @return * @return
*/ */
@GetMapping(value = "/czjlb") @GetMapping(value = "/htxxb")
@ApiOperation(value = "获取成长记录表", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工合同信息表", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 13) @ApiOperationSupport(order = 41)
public Result<List<YgglAttaCzjlb>> selectczjlb(@CurrentUser UserBean userBean) { public Result<List<YgglAttaHtxxb>> selecthtxxb(@CurrentUser UserBean userBean) {
List<YgglAttaCzjlb> ygglAttaCzjlbs = YgglAttaCzjlb.builder().build() List<YgglAttaHtxxb> ygglAttaHtxxbs = YgglAttaHtxxb.builder().build()
.selectList(new QueryWrapper<YgglAttaCzjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", .selectList(new QueryWrapper<YgglAttaHtxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
userBean.getEmpNum())); userBean.getEmpNum()));
return ResultUtil.data(ygglAttaCzjlbs, "获取成长记录表成功"); return ResultUtil.data(ygglAttaHtxxbs, "获取员工合同信息表成功");
} }
// 获取员工离职表
@GetMapping(value = "/lzb/{empNum}")
@ApiOperation(value = "获取员工离职表(管)", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 15)
public Result<List<YgglMainLzb>> selectlzb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
Integer orgCode = userBean.getOrgCode();
QueryWrapper<YgglMainLzb> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("org_code", orgCode);
List<YgglMainLzb> ygglMainLzbs = YgglMainLzb.builder().build().selectList(queryWrapper);
return ResultUtil.data(ygglMainLzbs, "获取员工离职表成功");
}
// 获取员工证书证件表
@GetMapping(value = "/zszjb/{empNum}")
@ApiOperation(value = "获取员工证书证件表(管)", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 19)
public Result<List<YgglAttaZszjb>> selectzszjb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
List<YgglAttaZszjb> ygglAttaZszjbs = YgglAttaZszjb.builder().build().selectList(
new QueryWrapper<YgglAttaZszjb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
return ResultUtil.data(ygglAttaZszjbs, "获取员工证书证件表成功");
}
// 获取员工联系信息表
@GetMapping(value = "/lxxxb/{empNum}")
@ApiOperation(value = "获取员工联系信息表(管)", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 21)
public Result<List<YgglAttaLxxxb>> selectlxxxb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
List<YgglAttaLxxxb> ygglAttaLxxxbs = YgglAttaLxxxb.builder().build().selectList(
new QueryWrapper<YgglAttaLxxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
return ResultUtil.data(ygglAttaLxxxbs, "获取员工联系信息表成功");
}
// 获取员工紧急联系人表
@GetMapping(value = "/jjlxr/{empNum}")
@ApiOperation(value = "获取员工紧急联系人表(管)", httpMethod = "GET", notes = "接口发布说明")
public Result<List<YgglAttaJjlxr>> selectjjlxr(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
List<YgglAttaJjlxr> ygglAttaJjlxrs = YgglAttaJjlxr.builder().build().selectList(
new QueryWrapper<YgglAttaJjlxr>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
return ResultUtil.data(ygglAttaJjlxrs, "获取员工紧急联系人表成功");
}
// 获取工资卡信息
@GetMapping(value = "/gzk/{empNum}")
@ApiOperation(value = "获取员工工资卡信息(管)", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 22)
public Result<List<YgglAttaGzk>> selectgzk(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
List<YgglAttaGzk> ygglAttaGzks = YgglAttaGzk.builder().build().selectList(
new QueryWrapper<YgglAttaGzk>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
return ResultUtil.data(ygglAttaGzks, "获取工资卡信息成功");
}
// 获取员工合同信息表 // 获取员工合同信息表
@GetMapping(value = "/htxxb/{empNum}") @GetMapping(value = "/htxxb/{empNum}")
@ApiOperation(value = "获取员工合同信息表(管)", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工合同信息表(管)", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 23) @ApiOperationSupport(order = 42)
public Result<List<YgglAttaHtxxb>> selecthtxxb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) { public Result<List<YgglAttaHtxxb>> selecthtxxb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
List<YgglAttaHtxxb> ygglAttaHtxxbs = YgglAttaHtxxb.builder().build().selectList( List<YgglAttaHtxxb> ygglAttaHtxxbs = YgglAttaHtxxb.builder().build().selectList(
new QueryWrapper<YgglAttaHtxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum)); new QueryWrapper<YgglAttaHtxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
return ResultUtil.data(ygglAttaHtxxbs, "获取员工合同信息表成功"); return ResultUtil.data(ygglAttaHtxxbs, "获取员工合同信息表成功");
} }
/**
* 添加/修改员工合同信息表
*
* @param
* @return
*/
@PostMapping(value = "/htxxb")
@ApiOperation(value = "添加/修改员工合同信息表", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 43)
public Result<YgglAttaHtxxb> addhtxxb(@CurrentUser UserBean userBean, @RequestBody YgglAttaHtxxb ygglAttaHtxxb) {
ygglAttaHtxxb.setEmpNum(ygglAttaHtxxb.getEmpNum());
ygglAttaHtxxb.setOrgCode(userBean.getOrgCode());
ygglAttaHtxxb.insertOrUpdate();
return ResultUtil.data(ygglAttaHtxxb, "添加/修改员工合同信息表成功");
}
/**
* 删除员工合同信息表
*
* @param
* @return
*/
@DeleteMapping(value = "/htxxb/{id}")
@ApiOperation(value = "删除员工合同信息表", httpMethod = "DELETE", notes = "接口发布说明")
@ApiOperationSupport(order = 44)
public Result<Boolean> delhtxxb(@CurrentUser UserBean userBean, @PathVariable Integer id) {
Integer orgCode = userBean.getOrgCode();
return ResultUtil.data(YgglAttaHtxxb.builder().build()
.delete(new QueryWrapper<YgglAttaHtxxb>().eq("org_code", orgCode).eq("id", id)), "删除员工合同信息表成功");
}
/**
* 获取员工材料附件表
*
* @param
* @return
*/
@GetMapping(value = "/clfjb")
@ApiOperation(value = "获取员工材料附件表", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 45)
public Result<List<YgglAttaClfjb>> selectclfjb(@CurrentUser UserBean userBean) {
List<YgglAttaClfjb> ygglAttaClfjbs = YgglAttaClfjb.builder().build()
.selectList(new QueryWrapper<YgglAttaClfjb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
userBean.getEmpNum()));
return ResultUtil.data(ygglAttaClfjbs, "获取员工材料附件表成功");
}
// 获取员工材料附件表 // 获取员工材料附件表
@GetMapping(value = "/clfjb/{empNum}") @GetMapping(value = "/clfjb/{empNum}")
@ApiOperation(value = "获取员工材料附件表(管)", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工材料附件表(管)", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 24) @ApiOperationSupport(order = 46)
public Result<List<YgglAttaClfjb>> selectclfjb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) { public Result<List<YgglAttaClfjb>> selectclfjb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
List<YgglAttaClfjb> ygglAttaClfjbs = YgglAttaClfjb.builder().build().selectList( List<YgglAttaClfjb> ygglAttaClfjbs = YgglAttaClfjb.builder().build().selectList(
new QueryWrapper<YgglAttaClfjb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum)); new QueryWrapper<YgglAttaClfjb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
return ResultUtil.data(ygglAttaClfjbs, "获取员工材料附件表成功"); return ResultUtil.data(ygglAttaClfjbs, "获取员工材料附件表成功");
} }
/**
* 添加/修改员工材料附件表
*
* @param
* @return
*/
@PostMapping(value = "/clfjb")
@ApiOperation(value = "添加/修改员工材料附件表", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 47)
public Result<YgglAttaClfjb> addclfjb(@CurrentUser UserBean userBean, @RequestBody YgglAttaClfjb ygglAttaClfjb) {
ygglAttaClfjb.setOrgCode(userBean.getOrgCode());
ygglAttaClfjb.setEmpNum(ygglAttaClfjb.getEmpNum());
ygglAttaClfjb.insertOrUpdate();
return ResultUtil.data(ygglAttaClfjb, "添加/修改员工材料附件表成功");
}
/**
* 删除员工材料附件表
*
* @param
* @return
*/
@DeleteMapping(value = "/clfjb/{id}")
@ApiOperation(value = "删除员工材料附件表", httpMethod = "DELETE", notes = "接口发布说明")
@ApiOperationSupport(order = 48)
public Result<Boolean> delclfjb(@CurrentUser UserBean userBean, @PathVariable Integer id) {
Integer orgCode = userBean.getOrgCode();
return ResultUtil.data(YgglAttaClfjb.builder().build()
.delete(new QueryWrapper<YgglAttaClfjb>().eq("org_code", orgCode).eq("id", id)), "删除员工材料附件表成功");
}
/**
* 获取成长记录表
*
* @param
* @return
*/
@GetMapping(value = "/czjlb")
@ApiOperation(value = "获取成长记录表", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 49)
public Result<List<YgglAttaCzjlb>> selectczjlb(@CurrentUser UserBean userBean) {
List<YgglAttaCzjlb> ygglAttaCzjlbs = YgglAttaCzjlb.builder().build()
.selectList(new QueryWrapper<YgglAttaCzjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
userBean.getEmpNum()));
return ResultUtil.data(ygglAttaCzjlbs, "获取成长记录表成功");
}
// 获取成长记录表 // 获取成长记录表
@GetMapping(value = "/czjlb/{empNum}") @GetMapping(value = "/czjlb/{empNum}")
@ApiOperation(value = "获取成长记录表(管)", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取成长记录表(管)", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 25) @ApiOperationSupport(order = 50)
public Result<List<YgglAttaCzjlb>> selectczjlb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) { public Result<List<YgglAttaCzjlb>> selectczjlb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
List<YgglAttaCzjlb> ygglAttaCzjlbs = YgglAttaCzjlb.builder().build().selectList( List<YgglAttaCzjlb> ygglAttaCzjlbs = YgglAttaCzjlb.builder().build().selectList(
new QueryWrapper<YgglAttaCzjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum)); new QueryWrapper<YgglAttaCzjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
return ResultUtil.data(ygglAttaCzjlbs, "获取员工合同信息表成功"); return ResultUtil.data(ygglAttaCzjlbs, "获取员工成长记录表成功");
}
/**
* 添加/修改成长记录表
*
* @param
* @return
*/
@PostMapping(value = "/czjlb")
@ApiOperation(value = "添加/修改成长记录表", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 51)
public Result<YgglAttaCzjlb> addczjlb(@CurrentUser UserBean userBean, @RequestBody YgglAttaCzjlb ygglAttaCzjlb) {
ygglAttaCzjlb.setEmpNum(ygglAttaCzjlb.getEmpNum());
ygglAttaCzjlb.setOrgCode(userBean.getOrgCode());
ygglAttaCzjlb.insertOrUpdate();
return ResultUtil.data(ygglAttaCzjlb, "添加/修改成长记录表成功");
} }
// 获取员工离职表
@GetMapping(value = "/lzb/{empNum}")
@ApiOperation(value = "获取员工离职表(管)", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 52)
public Result<List<YgglMainLzb>> selectlzb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
Integer orgCode = userBean.getOrgCode();
QueryWrapper<YgglMainLzb> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("org_code", orgCode);
List<YgglMainLzb> ygglMainLzbs = YgglMainLzb.builder().build().selectList(queryWrapper);
return ResultUtil.data(ygglMainLzbs, "获取员工离职表成功");
}
/** /**
...@@ -1107,7 +1278,7 @@ public class YgglController { ...@@ -1107,7 +1278,7 @@ public class YgglController {
*/ */
@PostMapping(value = "/ygzz") @PostMapping(value = "/ygzz")
@ApiOperation(value = "员工转正", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "员工转正", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 28) @ApiOperationSupport(order = 53)
public Result<Void> ygzz(@CurrentUser UserBean userBean, @RequestBody YgzzDto ygzzDto) { public Result<Void> ygzz(@CurrentUser UserBean userBean, @RequestBody YgzzDto ygzzDto) {
UpdateWrapper<YgglMainEmp> updateWrapper = new UpdateWrapper<YgglMainEmp>(); UpdateWrapper<YgglMainEmp> updateWrapper = new UpdateWrapper<YgglMainEmp>();
updateWrapper.eq("emp_num", ygzzDto.getEmpNum()); updateWrapper.eq("emp_num", ygzzDto.getEmpNum());
...@@ -1124,7 +1295,7 @@ public class YgglController { ...@@ -1124,7 +1295,7 @@ public class YgglController {
*/ */
@PostMapping(value = "/addlzjh") @PostMapping(value = "/addlzjh")
@ApiOperation(value = "添加离职计划", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "添加离职计划", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 29) @ApiOperationSupport(order = 54)
public Result<YgglMainLzb> addjhlz(@CurrentUser UserBean userBean, @RequestBody LzygQueryDto lzygQueryDto) { public Result<YgglMainLzb> addjhlz(@CurrentUser UserBean userBean, @RequestBody LzygQueryDto lzygQueryDto) {
QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<YgglMainEmp>(); QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<YgglMainEmp>();
...@@ -1166,7 +1337,7 @@ public class YgglController { ...@@ -1166,7 +1337,7 @@ public class YgglController {
*/ */
@PostMapping(value = "/qrlz") @PostMapping(value = "/qrlz")
@ApiOperation(value = "确认离职", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "确认离职", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 30) @ApiOperationSupport(order = 55)
public Result<Void> addlzb(@CurrentUser UserBean userBean, @RequestBody LzygQueryDto lzygQueryDto) { public Result<Void> addlzb(@CurrentUser UserBean userBean, @RequestBody LzygQueryDto lzygQueryDto) {
QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<YgglMainEmp>(); QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<YgglMainEmp>();
queryWrapper.eq("emp_num", lzygQueryDto.getEmpNum()); queryWrapper.eq("emp_num", lzygQueryDto.getEmpNum());
...@@ -1201,7 +1372,7 @@ public class YgglController { ...@@ -1201,7 +1372,7 @@ public class YgglController {
*/ */
@PostMapping(value = "/fqlz") @PostMapping(value = "/fqlz")
@ApiOperation(value = "放弃离职", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "放弃离职", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 31) @ApiOperationSupport(order = 56)
public Result<Void> fqlz(@CurrentUser UserBean userBean, @RequestBody LzygQueryDto lzygQueryDto) { public Result<Void> fqlz(@CurrentUser UserBean userBean, @RequestBody LzygQueryDto lzygQueryDto) {
UpdateWrapper<YgglMainEmp> updateWrapper = new UpdateWrapper<YgglMainEmp>(); UpdateWrapper<YgglMainEmp> updateWrapper = new UpdateWrapper<YgglMainEmp>();
...@@ -1218,211 +1389,6 @@ public class YgglController { ...@@ -1218,211 +1389,6 @@ public class YgglController {
return ResultUtil.success("放弃成功"); return ResultUtil.success("放弃成功");
} }
/**
* 添加/修改员工证书证件表
*
* @param
* @return
*/
@PostMapping(value = "/zszjb")
@ApiOperation(value = "添加/修改员工证书证件表", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 35)
public Result<YgglAttaZszjb> addzszjb(@CurrentUser UserBean userBean, @RequestBody YgglAttaZszjb ygglAttaZszjb) {
ygglAttaZszjb.setEmpNum(ygglAttaZszjb.getEmpNum());
ygglAttaZszjb.setOrgCode(userBean.getOrgCode());
ygglAttaZszjb.insertOrUpdate();
return ResultUtil.data(ygglAttaZszjb, "添加/修改员工证书证件表成功");
}
/**
* 添加/修改员工联系信息表
*
* @param
* @return
*/
@PostMapping(value = "/lxxxb")
@ApiOperation(value = "添加/修改员工联系信息表", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 37)
public Result<YgglAttaLxxxb> addlxxxb(@CurrentUser UserBean userBean, @RequestBody YgglAttaLxxxb ygglAttaLxxxb) {
ygglAttaLxxxb.setEmpNum(ygglAttaLxxxb.getEmpNum());
ygglAttaLxxxb.setOrgCode(userBean.getOrgCode());
ygglAttaLxxxb.insertOrUpdate();
return ResultUtil.data(ygglAttaLxxxb, "添加/修改员工联系信息表成功");
}
/**
* 添加/修改员工紧急联系人表
*
* @param
* @return
*/
@PostMapping(value = "/jjlxr")
@ApiOperation(value = "添加/修改员工紧急联系人表", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 38)
public Result<YgglAttaJjlxr> addjjlxr(@CurrentUser UserBean userBean, @RequestBody YgglAttaJjlxr ygglAttaJjlxr) {
ygglAttaJjlxr.setEmpNum(ygglAttaJjlxr.getEmpNum());
ygglAttaJjlxr.setOrgCode(userBean.getOrgCode());
ygglAttaJjlxr.insertOrUpdate();
return ResultUtil.data(ygglAttaJjlxr, "添加/修改员工紧急联系人表成功");
}
/**
* 添加/修改工资卡信息
*
* @param
* @return
*/
@PostMapping(value = "/gzk")
@ApiOperation(value = "添加/修改工资卡信息", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 39)
public Result<YgglAttaGzk> addgzk(@CurrentUser UserBean userBean, @RequestBody YgglAttaGzk ygglAttaGzk) {
ygglAttaGzk.setEmpNum(ygglAttaGzk.getEmpNum());
ygglAttaGzk.setOrgCode(userBean.getOrgCode());
ygglAttaGzk.insertOrUpdate();
return ResultUtil.data(ygglAttaGzk, "添加/修改工资卡信息成功");
}
/**
* 添加/修改员工合同信息表
*
* @param
* @return
*/
@PostMapping(value = "/htxxb")
@ApiOperation(value = "添加/修改员工合同信息表", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 40)
public Result<YgglAttaHtxxb> addhtxxb(@CurrentUser UserBean userBean, @RequestBody YgglAttaHtxxb ygglAttaHtxxb) {
ygglAttaHtxxb.setEmpNum(ygglAttaHtxxb.getEmpNum());
ygglAttaHtxxb.setOrgCode(userBean.getOrgCode());
ygglAttaHtxxb.insertOrUpdate();
return ResultUtil.data(ygglAttaHtxxb, "添加/修改员工合同信息表成功");
}
/**
* 添加/修改员工材料附件表
*
* @param
* @return
*/
@PostMapping(value = "/clfjb")
@ApiOperation(value = "添加/修改员工材料附件表", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 41)
public Result<YgglAttaClfjb> addclfjb(@CurrentUser UserBean userBean, @RequestBody YgglAttaClfjb ygglAttaClfjb) {
ygglAttaClfjb.setOrgCode(userBean.getOrgCode());
ygglAttaClfjb.setEmpNum(ygglAttaClfjb.getEmpNum());
ygglAttaClfjb.insertOrUpdate();
return ResultUtil.data(ygglAttaClfjb, "添加/修改员工材料附件表成功");
}
/**
* 添加/修改成长记录表
*
* @param
* @return
*/
@PostMapping(value = "/czjlb")
@ApiOperation(value = "添加/修改成长记录表", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 42)
public Result<YgglAttaCzjlb> addczjlb(@CurrentUser UserBean userBean, @RequestBody YgglAttaCzjlb ygglAttaCzjlb) {
ygglAttaCzjlb.setEmpNum(ygglAttaCzjlb.getEmpNum());
ygglAttaCzjlb.setOrgCode(userBean.getOrgCode());
ygglAttaCzjlb.insertOrUpdate();
return ResultUtil.data(ygglAttaCzjlb, "添加/修改成长记录表成功");
}
/**
* 删除员工证书证件表
*
* @param
* @return
*/
@DeleteMapping(value = "/zszjb/{id}")
@ApiOperation(value = "删除员工证书证件表", httpMethod = "DELETE", notes = "接口发布说明")
@ApiOperationSupport(order = 46)
public Result<Boolean> delzszjb(@CurrentUser UserBean userBean, @PathVariable Integer id) {
Integer orgCode = userBean.getOrgCode();
return ResultUtil.data(YgglAttaZszjb.builder().build()
.delete(new QueryWrapper<YgglAttaZszjb>().eq("org_code", orgCode).eq("id", id)), "删除员工证书证件表成功");
}
/**
* 删除员工紧急联系人表
*
* @param
* @return
*/
@DeleteMapping(value = "/jjlxr/{id}")
@ApiOperation(value = "删除员工紧急联系人表", httpMethod = "DELETE", notes = "接口发布说明")
@ApiOperationSupport(order = 48)
public Result<Boolean> deljjlxr(@CurrentUser UserBean userBean, @PathVariable Integer id) {
Integer orgCode = userBean.getOrgCode();
return ResultUtil.data(YgglAttaJjlxr.builder().build()
.delete(new QueryWrapper<YgglAttaJjlxr>().eq("org_code", orgCode).eq("id", id)), "删除员工紧急联系人表成功");
}
/**
* 删除工资卡信息
*
* @param
* @return
*/
@DeleteMapping(value = "/gzk/{id}")
@ApiOperation(value = "删除工资卡信息", httpMethod = "DELETE", notes = "接口发布说明")
@ApiOperationSupport(order = 49)
public Result<Boolean> delgzk(@CurrentUser UserBean userBean, @PathVariable Integer id) {
Integer orgCode = userBean.getOrgCode();
return ResultUtil.data(YgglAttaGzk.builder().build()
.delete(new QueryWrapper<YgglAttaGzk>().eq("org_code", orgCode).eq("id", id)), "删除工资卡信息成功");
}
/**
* 删除员工合同信息表
*
* @param
* @return
*/
@DeleteMapping(value = "/htxxb/{id}")
@ApiOperation(value = "删除员工合同信息表", httpMethod = "DELETE", notes = "接口发布说明")
@ApiOperationSupport(order = 50)
public Result<Boolean> delhtxxb(@CurrentUser UserBean userBean, @PathVariable Integer id) {
Integer orgCode = userBean.getOrgCode();
return ResultUtil.data(YgglAttaHtxxb.builder().build()
.delete(new QueryWrapper<YgglAttaHtxxb>().eq("org_code", orgCode).eq("id", id)), "删除员工合同信息表成功");
}
/**
* 删除员工材料附件表
*
* @param
* @return
*/
@DeleteMapping(value = "/clfjb/{id}")
@ApiOperation(value = "删除员工材料附件表", httpMethod = "DELETE", notes = "接口发布说明")
@ApiOperationSupport(order = 51)
public Result<Boolean> delclfjb(@CurrentUser UserBean userBean, @PathVariable Integer id) {
Integer orgCode = userBean.getOrgCode();
return ResultUtil.data(YgglAttaClfjb.builder().build()
.delete(new QueryWrapper<YgglAttaClfjb>().eq("org_code", orgCode).eq("id", id)), "删除员工材料附件表成功");
}
/** /**
* 查询离职员工列表 * 查询离职员工列表
* *
...@@ -1431,7 +1397,7 @@ public class YgglController { ...@@ -1431,7 +1397,7 @@ public class YgglController {
*/ */
@PostMapping(value = "/querylzyg") @PostMapping(value = "/querylzyg")
@ApiOperation(value = "查询离职员工列表", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "查询离职员工列表", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 53) @ApiOperationSupport(order = 57)
public Result<Object> querylzyg(@CurrentUser UserBean userBean, @RequestBody LzbQueryDto lzygQueryDto) { public Result<Object> querylzyg(@CurrentUser UserBean userBean, @RequestBody LzbQueryDto lzygQueryDto) {
lzygQueryDto.setOrgCode(userBean.getOrgCode()); lzygQueryDto.setOrgCode(userBean.getOrgCode());
IPage<YgglMainLzb> page = new Page<YgglMainLzb>( IPage<YgglMainLzb> page = new Page<YgglMainLzb>(
...@@ -1447,8 +1413,8 @@ public class YgglController { ...@@ -1447,8 +1413,8 @@ public class YgglController {
* @return * @return
*/ */
@PostMapping(value = "/ygbmdr") @PostMapping(value = "/ygbmdr")
@ApiOperation(value = "员工部门导入", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "员工部门导入未完成", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 59) @ApiOperationSupport(order = 58)
public Result<List<YgglMainEmp>> ygbmdr(UserBean userBean, List<YgglMainEmp> EmpList) { public Result<List<YgglMainEmp>> ygbmdr(UserBean userBean, List<YgglMainEmp> EmpList) {
return ResultUtil.success("员工导入成功!"); return ResultUtil.success("员工导入成功!");
} }
...@@ -1459,7 +1425,7 @@ public class YgglController { ...@@ -1459,7 +1425,7 @@ public class YgglController {
*/ */
@PostMapping(value = "/mz/{id}") @PostMapping(value = "/mz/{id}")
@ApiOperation(value = "展示民族/展示所有民族", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "展示民族/展示所有民族", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 60) @ApiOperationSupport(order = 59)
public Result<List<YgmzDto>> selectmzs(@CurrentUser UserBean userBean, @PathVariable Integer id) { public Result<List<YgmzDto>> selectmzs(@CurrentUser UserBean userBean, @PathVariable Integer id) {
if (id==null||id==0) { if (id==null||id==0) {
List<YgmzDto> allmz =new LambdaQueryChainWrapper<YgmzDto>(ygMzDtoMapper).list(); List<YgmzDto> allmz =new LambdaQueryChainWrapper<YgmzDto>(ygMzDtoMapper).list();
...@@ -1475,7 +1441,7 @@ public class YgglController { ...@@ -1475,7 +1441,7 @@ public class YgglController {
*/ */
@PostMapping(value = "/jg") @PostMapping(value = "/jg")
@ApiOperation(value = "展示籍贯所有省市区", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "展示籍贯所有省市区", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 65) @ApiOperationSupport(order = 60)
public Result<List<YgjgDto>> selectjgs(@CurrentUser UserBean userBean, @RequestBody YgjgDto ygjgDto) { public Result<List<YgjgDto>> selectjgs(@CurrentUser UserBean userBean, @RequestBody YgjgDto ygjgDto) {
Integer type = ygjgDto.getType(); Integer type = ygjgDto.getType();
Integer upId = ygjgDto.getJgid(); Integer upId = ygjgDto.getJgid();
...@@ -1506,7 +1472,7 @@ public class YgglController { ...@@ -1506,7 +1472,7 @@ public class YgglController {
@PostMapping(value = "/jgp/{id}") @PostMapping(value = "/jgp/{id}")
@ApiOperation(value = "显示籍贯省市区", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "显示籍贯省市区", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 66) @ApiOperationSupport(order = 61)
public Result<String> selectjg(@CurrentUser UserBean userBean, @PathVariable Integer id) { public Result<String> selectjg(@CurrentUser UserBean userBean, @PathVariable Integer id) {
String isPro =id.toString().substring(2,4); String isPro =id.toString().substring(2,4);
String isCity =id.toString().substring(4,6); String isCity =id.toString().substring(4,6);
...@@ -1522,8 +1488,6 @@ public class YgglController { ...@@ -1522,8 +1488,6 @@ public class YgglController {
} }
/** /**
* 查询员工列表 * 查询员工列表
* *
...@@ -1532,7 +1496,7 @@ public class YgglController { ...@@ -1532,7 +1496,7 @@ public class YgglController {
*/ */
@GetMapping(value = "/queryemp") @GetMapping(value = "/queryemp")
@ApiOperation(value = "查询员工列表", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "查询员工列表", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 56) @ApiOperationSupport(order = 62)
public Result<List<YgQueryDto>> queryEmpMessage(@CurrentUser UserBean userBean) { public Result<List<YgQueryDto>> queryEmpMessage(@CurrentUser UserBean userBean) {
List<YgQueryDto> ygQueryDto = ygglMainEmpMapper.queryEmpMessage(userBean); List<YgQueryDto> ygQueryDto = ygglMainEmpMapper.queryEmpMessage(userBean);
return ResultUtil.data(ygQueryDto, "查询成功"); return ResultUtil.data(ygQueryDto, "查询成功");
...@@ -1546,7 +1510,7 @@ public class YgglController { ...@@ -1546,7 +1510,7 @@ public class YgglController {
*/ */
@GetMapping("/yggl") @GetMapping("/yggl")
@ApiOperation(value = "获取员工管理统计图信息", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工管理统计图信息", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 57) @ApiOperationSupport(order = 63)
public Result<Map<String, Object>> queryYgglCartogram(@CurrentUser UserBean userBean) { public Result<Map<String, Object>> queryYgglCartogram(@CurrentUser UserBean userBean) {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
...@@ -1588,7 +1552,7 @@ public class YgglController { ...@@ -1588,7 +1552,7 @@ public class YgglController {
*/ */
@GetMapping(value = "/ygsbgjj/{empNum}") @GetMapping(value = "/ygsbgjj/{empNum}")
@ApiOperation(value = "获取员工社保公积金", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工社保公积金", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 12) @ApiOperationSupport(order = 64)
public Result<YgglAttaSbgjj> selectygsbgjj(@CurrentUser UserBean userBean,@PathVariable Integer empNum) { public Result<YgglAttaSbgjj> selectygsbgjj(@CurrentUser UserBean userBean,@PathVariable Integer empNum) {
YgglAttaSbgjj ygglAttaSbgjj = YgglAttaSbgjj.builder().build().selectOne(new QueryWrapper<YgglAttaSbgjj>().eq("emp_num", empNum)); YgglAttaSbgjj ygglAttaSbgjj = YgglAttaSbgjj.builder().build().selectOne(new QueryWrapper<YgglAttaSbgjj>().eq("emp_num", empNum));
...@@ -1604,7 +1568,7 @@ public class YgglController { ...@@ -1604,7 +1568,7 @@ public class YgglController {
*/ */
@PostMapping(value = "/ygsbgjj") @PostMapping(value = "/ygsbgjj")
@ApiOperation(value = "添加/修改员工社保公积金", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "添加/修改员工社保公积金", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 12) @ApiOperationSupport(order = 65)
public Result<YgglAttaSbgjj> addygsbgjj(@CurrentUser UserBean userBean,@RequestBody YgglAttaSbgjj ygglAttaSbgjj) { public Result<YgglAttaSbgjj> addygsbgjj(@CurrentUser UserBean userBean,@RequestBody YgglAttaSbgjj ygglAttaSbgjj) {
Integer empNum = ygglAttaSbgjj.getEmpNum(); Integer empNum = ygglAttaSbgjj.getEmpNum();
if (empNum == null) { if (empNum == null) {
......
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