From da28b50c6e46e3ff674c6fcf80dde3c16bbb396a Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Tue, 16 Jul 2024 11:09:37 +0800 Subject: [PATCH] 7/16 --- .../oms/apiadmin/aggregation/SysMenuRest.java | 2 +- .../aggregation/SysOrganizationRest.java | 6 +- .../aggregation/SysRoleAuthorizeRest.java | 2 +- .../aggregation/SysStaffinfoRest.java | 195 +++++++++ .../oms/apiadmin/aggregation/SysUserRest.java | 19 + .../oms/biz/func/sysmenu/SysMenuService.java | 5 +- .../oms/biz/func/sysmenu/SysMenuTreeVo.java | 3 + .../SysOrganizationService.java | 4 +- .../com/yxt/oms/biz/func/sysrole/SysRole.java | 1 + .../yxt/oms/biz/func/sysrole/SysRoleDto.java | 1 + .../yxt/oms/biz/func/sysrole/SysRoleVo.java | 2 + .../sysstaffinfo/AppContactsDetailsVo.java | 34 ++ .../func/sysstaffinfo/PcSysStaffQuery.java | 18 + .../biz/func/sysstaffinfo/PcSysStaffVo.java | 19 + .../biz/func/sysstaffinfo/SysStaffQuery.java | 30 ++ .../biz/func/sysstaffinfo/SysStaffinfo.java | 87 ++++ .../SysStaffinfoAppContactsSearchVo.java | 34 ++ .../SysStaffinfoAppContactsVo.java | 34 ++ .../sysstaffinfo/SysStaffinfoDetailsVo.java | 88 ++++ .../func/sysstaffinfo/SysStaffinfoDto.java | 193 +++++++++ .../func/sysstaffinfo/SysStaffinfoMapper.java | 127 ++++++ .../func/sysstaffinfo/SysStaffinfoMapper.xml | 398 ++++++++++++++++++ .../func/sysstaffinfo/SysStaffinfoQuery.java | 42 ++ .../sysstaffinfo/SysStaffinfoService.java | 138 ++++++ .../biz/func/sysstaffinfo/SysStaffinfoVo.java | 47 +++ .../biz/func/sysstaffinfo/WxBase64Query.java | 20 + .../biz/func/sysstaffinfo/WxSysInfoQuery.java | 37 ++ .../sysstaffinfo/app/AppSysStaffQuery.java | 30 ++ .../func/sysstaffinfo/app/AppSysStaffVo.java | 30 ++ .../sysstafforg/SysStaffOrgDetailsVo.java | 28 ++ .../biz/func/sysstafforg/SysStaffOrgDto.java | 42 ++ .../oms/biz/func/sysuser/SysUserService.java | 18 + .../biz/func/sysuserrole/SysUserRoleVo.java | 1 + .../sysorganization/SysOrganizationFeign.java | 4 +- .../SysOrganizationFeignFallback.java | 2 +- .../sysstaffinfo/SysStaffinfoFeign.java | 153 +++++++ .../feign/portal/sysuser/SysUserFeign.java | 8 + .../portal/sysuser/SysUserFeignFallback.java | 10 + .../oms/feign/portal/sysuser/SysUserVo.java | 13 +- 39 files changed, 1910 insertions(+), 15 deletions(-) create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffinfoRest.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/AppContactsDetailsVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/PcSysStaffQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/PcSysStaffVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoAppContactsVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoDetailsVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoDto.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoMapper.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoMapper.xml create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoService.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/WxBase64Query.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/WxSysInfoQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/app/AppSysStaffQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/app/AppSysStaffVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDetailsVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDto.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRest.java index d37a4e4..a563352 100644 --- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRest.java +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRest.java @@ -44,7 +44,7 @@ public class SysMenuRest { */ @ApiOperation("菜单列表：根据资源归类") @PostMapping("/listAllVoForSource") - public ResultBean> listAllVoForSource(@RequestBody SysMenuQuery query){ + public ResultBean> listAllVoForSource(@RequestBody PagerQuery query){ return sysMenuService.listAllVoForSource(query); } diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysOrganizationRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysOrganizationRest.java index 866403a..8136467 100644 --- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysOrganizationRest.java +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysOrganizationRest.java @@ -58,9 +58,9 @@ public class SysOrganizationRest { } @ApiOperation("所有数据列表") - @GetMapping("/list") - public ResultBean> list() { - return sysOrganizationService.listVo(); + @GetMapping("/list/{orgSid}") + public ResultBean> list(@PathVariable("orgSid") String orgSid) { + return sysOrganizationService.listVo(orgSid); } @ApiOperation("新增保存") diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleAuthorizeRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleAuthorizeRest.java index 936b140..42c766e 100644 --- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleAuthorizeRest.java +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleAuthorizeRest.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; */ @Api(tags = "角色授权表") @RestController -@RequestMapping("apiadmin/sysrikeauthorize") +@RequestMapping("apiadmin/sysroleauthorize") public class SysRoleAuthorizeRest { @Autowired SysRoleAuthorizeService sysRoleAuthorizeService; diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffinfoRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffinfoRest.java new file mode 100644 index 0000000..0f4eb87 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffinfoRest.java @@ -0,0 +1,195 @@ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.sysstaffinfo.*; +import com.yxt.oms.biz.func.sysstaffinfo.app.AppSysStaffQuery; +import com.yxt.oms.biz.func.sysstaffinfo.app.AppSysStaffVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffinfoFeignFallback.java
+ * Class: com.yxt.user.biz.sysstaffinfo.SysStaffinfoRest
+ * Description: 人员基础信息表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "人员基础信息表") +@RestController +@RequestMapping("/apiadmin/sysstaffinfo") +public class SysStaffinfoRest { + + + + @Autowired + private SysStaffinfoService sysStaffinfoService; + + + + /** + * 员工管理的分页列表 + * + * @param pq 查询条件 + * @return + */ + @ApiOperation("员工管理分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return sysStaffinfoService.pagerList(pq); + } + + /** + * 员工信息的新增保存 + * + * @param dto 数据传输对象 + * @return + */ + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysStaffinfoDto dto) { + return sysStaffinfoService.saveStaffInfo(dto); + } + + /** + * 员工信息的修改保存 + * + * @param dto 数据传输对象 + * @param sid 员工信息sid + * @return + */ + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysStaffinfoDto dto, @PathVariable("sid") String sid) { + return sysStaffinfoService.updateStaffInfo(dto, sid); + } + /** + * 进行删除操作，即设置员工类型为离职类型02的操作。 + * + * @param sysStaffQuery 数据传输对象 + * @return + */ + @ApiOperation("设置离职") + @PostMapping("/del") + public ResultBean del(SysStaffQuery sysStaffQuery) { + return sysStaffinfoService.del(sysStaffQuery); + } + + @ApiOperation("员工信息编辑初始化及详情") + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid) { + return sysStaffinfoService.selectDetailsBySid(sid); + } + /** + * 获取集团内全部员工姓名 + * + * @param staffName 员工姓名 + * @return + */ + @ApiOperation("获取集团内全部员工姓名") + @GetMapping("/getStaffName") + + public ResultBean>> getStaffName(String staffName, String deptSid) { + return sysStaffinfoService.getStaffName(staffName, deptSid); + } + /** + * 获取部门内全部员工姓名 + * + * @param staffName 员工姓名 + * @return + */ + @ApiOperation("获取部门内全部员工姓名") + @GetMapping("/getStaffNameByDeptSid") + + public ResultBean>> getStaffNameByDeptSid(String staffName, String deptSid) { + return sysStaffinfoService.getStaffNameByDeptSid(staffName, deptSid); + } + + + @ApiOperation("获取App通讯录") + @ResponseBody + @GetMapping("/selectAppContactsList") + public ResultBean> selectAppContactsList(String names) { + return sysStaffinfoService.selectAppContactsList(); + } + + @ApiOperation("app查看通讯录详情") + @ResponseBody + @GetMapping("/selectAppContactsVO/{staffSid}") + public ResultBean selectAppContactsVO(String staffSid) { + + return sysStaffinfoService.selectAppContactsVO(staffSid); + } + + @ApiOperation("App通讯录搜索") + @ResponseBody + @PostMapping("/searchAppContactsList") + public ResultBean> searchAppContactsList(PagerQuery pq) { + + return sysStaffinfoService.searchAppContactsList(pq); + } + + @ApiOperation("App通讯录搜索2") + @ResponseBody + @PostMapping("/searchAppContactsList2") + public ResultBean> searchAppContactsList2(PagerQuery pq) { + return sysStaffinfoService.searchAppContactsList2(pq); + } + + @ApiOperation("销售订单-内部推荐人下拉框") + @ResponseBody + @GetMapping("/selectStaffList") + public ResultBean> selectStaffList(PcSysStaffQuery pcSysStaffQuery) { + return sysStaffinfoService.selectStaffList(pcSysStaffQuery); + } + + @ApiOperation("移动端-销售订单-内部推荐人下拉框") + @ResponseBody + @PostMapping("/getUserList") + public ResultBean> getUserList(PagerQuery pagerQuery) { + return sysStaffinfoService.getUserList(pagerQuery); + } + + @ApiOperation("存放地点变更-获取人员列表") + @ResponseBody + @GetMapping("/getGressionUserList/{userSid}") + public ResultBean> getGressionUserList(String userSid) { + return sysStaffinfoService.getGressionUserList(userSid, ""); + } + + @ApiOperation("切换机构：存放地点变更-获取人员列表") + @ResponseBody + @GetMapping("/getGressionUserList") + public ResultBean> getGressionUserList(String userSid, String orgPath) { + return sysStaffinfoService.getGressionUserList(userSid, orgPath); + } + + @ApiOperation("获取集团所有人员") + @ResponseBody + @GetMapping("/selectStaffLists") + public ResultBean> selectStaffLists() { + return sysStaffinfoService.selectStaffLists(); + } + + @ApiOperation("获取集团所有在职人员") + @ResponseBody + @GetMapping("/selectStaffListss") + public ResultBean> selectStaffListss() { + return sysStaffinfoService.selectStaffListss(); + } + + + +} diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysUserRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysUserRest.java index fbf16d2..f436a5e 100644 --- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysUserRest.java +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysUserRest.java @@ -93,4 +93,23 @@ public class SysUserRest { public ResultBean setIsEnable(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid, @ApiParam(value = "isEnable", required = true) @PathVariable("isEnable") String isEnable){ return sysUserService.setIsEnable(sid,isEnable); } + /** + * 初始化密码 + * + * @param sid 用户sid + * @return ResultBean + */ + @ResponseBody + @PostMapping("/initPwd/{sid}") + @ApiOperation(value = "10、用户初始化密码") + @ApiOperationSupport(order = 100) + public ResultBean + initPwd(@ApiParam(value = "用户sid", required = true) @PathVariable("sid") String sid) { + return sysUserService.initPwd(sid); + } + @ApiOperation("删除记录根据sid") + @GetMapping("/delBySid/{sid}") + public ResultBean delBySid(@PathVariable("sid") String sid){ + return sysUserService.delBySid(sid); + }; } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuService.java index 2d2a120..6a13e4e 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuService.java @@ -107,9 +107,8 @@ public class SysMenuService extends MybatisBaseService { } return sysMenuVos; }*/ - public ResultBean> listAllVoForSource(SysMenuQuery query) { - - return sysMenuFeign.listAllVoForSource(query); + public ResultBean> listAllVoForSource(PagerQuery query) { + return sysMenuFeign.listAllVoForSource(query.getParams()); } public ResultBean>> getMenusForFunction(SysMenuFunctionQuery sysMenuFunctionQuery) { return sysMenuFeign.getMenusForFunction(sysMenuFunctionQuery); diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuTreeVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuTreeVo.java index af4737e..4418588 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuTreeVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuTreeVo.java @@ -56,4 +56,7 @@ public class SysMenuTreeVo implements Vo { private String remarks; @ApiModelProperty("子菜单") private List children; + + private String menuType; + private String isShow; } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationService.java index f80e11c..90b565b 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationService.java @@ -103,8 +103,8 @@ public class SysOrganizationService extends MybatisBaseService> listVo() { - return sysOrganizationFeign.list(); + public ResultBean> listVo(String orgSid) { + return sysOrganizationFeign.list(orgSid); } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRole.java b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRole.java index d9e8b05..9b6f00b 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRole.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRole.java @@ -46,4 +46,5 @@ public class SysRole extends BaseEntity { @ApiModelProperty(value = "角色组织层级value") private String roleTypeValue; private String orgSid; + private String dataRuleId; } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleDto.java b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleDto.java index 8379916..0b2d83b 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleDto.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleDto.java @@ -49,4 +49,5 @@ public class SysRoleDto implements Dto { @ApiModelProperty(value = "角色组织层级value") private String roleTypeValue; private String orgSid; + private String dataRuleId; } \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleVo.java index ce48d89..e83c975 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleVo.java @@ -44,4 +44,6 @@ public class SysRoleVo implements Vo { private String postName; @ApiModelProperty(value = "组织层级") private String roleTypeValue; + private String dataRuleId;//角色数据权限id + private String dataRuleValue;// } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/AppContactsDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/AppContactsDetailsVo.java new file mode 100644 index 0000000..47d7bd5 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/AppContactsDetailsVo.java @@ -0,0 +1,34 @@ +package com.yxt.oms.biz.func.sysstaffinfo; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description + * @Author liuguohui + * @Date 2021/9/17 + */ +@ApiModel(value = "App通讯录查看详情") +@Data +public class AppContactsDetailsVo implements Vo { + +// @ApiModelProperty("人员sid") +// private String sid; + + @ApiModelProperty("姓名") + private String name; + + @ApiModelProperty("手机号") + private String mobile; + + @ApiModelProperty("头像") + private String headImage; + + @ApiModelProperty("部门名称（路径）") + private String orgNamePath; + + @ApiModelProperty("职位") + private String position; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/PcSysStaffQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/PcSysStaffQuery.java new file mode 100644 index 0000000..29f4ee7 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/PcSysStaffQuery.java @@ -0,0 +1,18 @@ +package com.yxt.oms.biz.func.sysstaffinfo; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/5/20 15:47 + * @Description + */ +@Data +public class PcSysStaffQuery implements Query { + private static final long serialVersionUID = 1858291601540877140L; + @ApiModelProperty(value = "业务员sid",required = false) + private String staffSid; + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/PcSysStaffVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/PcSysStaffVo.java new file mode 100644 index 0000000..559f109 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/PcSysStaffVo.java @@ -0,0 +1,19 @@ +package com.yxt.oms.biz.func.sysstaffinfo; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/5/20 15:44 + * @Description + */ +@Data +public class PcSysStaffVo implements Vo { + private static final long serialVersionUID = -9042032921079833819L; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("人员") + private String staffName; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffQuery.java new file mode 100644 index 0000000..f765bdc --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffQuery.java @@ -0,0 +1,30 @@ +package com.yxt.oms.biz.func.sysstaffinfo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Date; + +/** + * @Author dimengzhe + * @Date 2022/2/15 15:22 + * @Description + */ +@Data +public class SysStaffQuery implements Query { + private static final long serialVersionUID = -7345786610678948794L; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty(value = "离职日期") + @NotNull(message = "离职日期不能为空") + private Date quitDate; + @ApiModelProperty(value = "离职原因") + @NotBlank(message = "离职原因不能为空") + private String quitReason; + @ApiModelProperty(value = "员工sid") + private String sid; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfo.java new file mode 100644 index 0000000..0b76c08 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfo.java @@ -0,0 +1,87 @@ +package com.yxt.oms.biz.func.sysstaffinfo; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffinfo.java
+ * Class: com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo
+ * Description: 人员基础信息表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "人员基础信息表", description = "人员基础信息表") +@TableName("sys_staffinfo") +@Data +public class SysStaffinfo extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("工号") + private String jobNumber; + @ApiModelProperty("姓名") + private String name; + + @ApiModelProperty(value = "性别") + private String gender; + @ApiModelProperty("身份证号") + private String idNo; + @ApiModelProperty("证件有效期") + private String idTerm; + @ApiModelProperty("生日") + private Date birthday; + @ApiModelProperty("民族") + private String national; + + @ApiModelProperty("籍贯") + private String nativePlace; + + @ApiModelProperty("住址") + private String address; + @ApiModelProperty("手机号") + private String mobile; + @ApiModelProperty("邮箱") + private String email; + + @ApiModelProperty("婚姻状况") + private String maritalStatus; + + @ApiModelProperty("员工类型（无类型、全职、兼职、实习、劳务派遣、退休返聘、劳务外包）") + private String personType; + + @ApiModelProperty("入职时间") + private Date joinCompnyDate; + @ApiModelProperty("试用期（无试用期、1个月、2个月、3个月、其他）") + private String probPeriod; + + @ApiModelProperty("计划转正日期") + private Date plannedConfirmDate; + @ApiModelProperty("实际转正日期") + private Date confirmationDate; + @ApiModelProperty("银行卡号") + private String bankCardNo; + @ApiModelProperty("开户行") + private String openBank; + @ApiModelProperty("身份证(人像面)") + private String idCardA; + @ApiModelProperty("身份证(国徽面)") + private String idCardB; + @ApiModelProperty("学历证书") + private String diploma; + @ApiModelProperty("学位证书") + private String degreeCertificate; + @ApiModelProperty("前公司离职证明") + private String leaveCertificate; + @ApiModelProperty("员工照片") + private String photo; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java new file mode 100644 index 0000000..34636dc --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java @@ -0,0 +1,34 @@ +package com.yxt.oms.biz.func.sysstaffinfo; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description + * @Author liuguohui + * @Date 2021/9/24 + */ +@ApiModel(value = "App通讯录（搜索）") +@Data +public class SysStaffinfoAppContactsSearchVo implements Vo { + + @ApiModelProperty("人员sid") + private String sid; + + @ApiModelProperty("用户头像") + private String headImage; + + @ApiModelProperty("姓名") + private String name; + + @ApiModelProperty("手机号") + private String mobile; + + @ApiModelProperty("职位") + private String position; + + @ApiModelProperty("部门名称") + private String orgName; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoAppContactsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoAppContactsVo.java new file mode 100644 index 0000000..6e203a5 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoAppContactsVo.java @@ -0,0 +1,34 @@ +package com.yxt.oms.biz.func.sysstaffinfo; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description + * @Author liuguohui + * @Date 2021/9/16 + */ +@ApiModel(value = "App通讯录") +@Data +public class SysStaffinfoAppContactsVo implements Vo { + + @ApiModelProperty("人员sid") + private String sid; + + @ApiModelProperty("姓名") + private String name; + + @ApiModelProperty("手机号") + private String mobile; + + @ApiModelProperty("用户头像") + private String headImage; + + @ApiModelProperty("姓名的拼音（全）") + private String pinYinName; + + @ApiModelProperty("姓名拼音的首字母（特殊的#表示）") + private String firstPinYinLabel; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoDetailsVo.java new file mode 100644 index 0000000..8ea3143 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoDetailsVo.java @@ -0,0 +1,88 @@ +package com.yxt.oms.biz.func.sysstaffinfo; + +import com.yxt.common.core.vo.Vo; +import com.yxt.oms.biz.func.sysstafforg.SysStaffOrgDetailsVo; +import com.yxt.oms.biz.func.sysuserrole.SysUserRoleVo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/2/11 16:12 + * @Description 员工信息的编辑初始化和详情返回数据 + */ +@Data +public class SysStaffinfoDetailsVo implements Vo { + private static final long serialVersionUID = 1232171677690215067L; + + private String sid; + @ApiModelProperty("工号") + private String jobNumber; + @ApiModelProperty("姓名") + private String name; + + @ApiModelProperty(value = "性别") + private String gender; + @ApiModelProperty("身份证号") + private String idNo; + @ApiModelProperty("证件有效期") + private String idTerm; + @ApiModelProperty("生日") + private Date birthday; + @ApiModelProperty("民族") + private String national; + + @ApiModelProperty("籍贯") + private String nativePlace; + + @ApiModelProperty("住址") + private String address; + @ApiModelProperty("手机号") + private String mobile; + @ApiModelProperty("邮箱") + private String email; + + @ApiModelProperty("婚姻状况") + private String maritalStatus; + + @ApiModelProperty("员工类型（无类型、全职、兼职、实习、劳务派遣、退休返聘、劳务外包）") + private String personType; + + @ApiModelProperty("入职时间") + private Date joinCompnyDate; + @ApiModelProperty("试用期（无试用期、1个月、2个月、3个月、其他）") + private String probPeriod; + + @ApiModelProperty("计划转正日期") + private Date plannedConfirmDate; + @ApiModelProperty("实际转正日期") + private Date confirmationDate; + @ApiModelProperty("银行卡号") + private String bankCardNo; + @ApiModelProperty("开户行") + private String openBank; + @ApiModelProperty("身份证(人像面)") + private String idCardA; + @ApiModelProperty("身份证(国徽面)") + private String idCardB; + @ApiModelProperty("学历证书") + private String diploma; + @ApiModelProperty("学位证书") + private String degreeCertificate; + @ApiModelProperty("前公司离职证明") + private String leaveCertificate; + @ApiModelProperty("员工照片") + private String photo; + @ApiModelProperty(value = "员工部门信息") + private SysStaffOrgDetailsVo sysStaffOrg; + private List sysUserRoles; + + private String accountType;//账号类型 1单位管理员，2操作员，0是平台管理员 3非登录账户 + private String userType;//用户类型:1员工、2客户、3供应商 + private String userName; + private String remarks; + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoDto.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoDto.java new file mode 100644 index 0000000..00a76e9 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoDto.java @@ -0,0 +1,193 @@ +package com.yxt.oms.biz.func.sysstaffinfo; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import com.yxt.oms.biz.func.sysstafforg.SysStaffOrgDto; +import com.yxt.oms.biz.func.sysuserrole.SysUserRoleDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; +import java.util.Date; +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffinfoDto.java
+ * Class: com.yxt.user.biz.sysstaffinfo.SysStaffinfoDto
+ * Description: 人员基础信息表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "人员基础信息表 数据传输对象", description = "人员基础信息表 数据传输对象") +@Data +public class SysStaffinfoDto implements Dto { + + private static final long serialVersionUID = 8637516813924395044L; + @ApiModelProperty(value = "姓名", required = true) + @NotBlank(message = "姓名不能为空") + private String name; + @ApiModelProperty(value = "性别key", required = true) + @NotBlank(message = "性别不能为空") + private String genderKey; + @ApiModelProperty(value = "性别", required = true) + @NotBlank(message = "性别不能为空") + private String gender; + @ApiModelProperty(value = "员工编号") + private String jobNumber; + @ApiModelProperty(value = "身份证号", required = true) + @Pattern(regexp = "^[1-9]\\d{5}(18|19|([23]\\d))\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$", message = "请输入正确的身份证号") + @NotBlank(message = "身份证号不能为空") + private String idNo; + @ApiModelProperty(value = "证件有效期", required = true) + @NotBlank(message = "证件有效期不能为空") + private String idTerm; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("生日") + private Date birthday; + @ApiModelProperty(value = "民族", required = true) + @NotBlank(message = "民族不能为空") + private String national; + @ApiModelProperty(value = "民族key", required = true) + @NotBlank(message = "民族不能为空") + private String nationalKey; + @ApiModelProperty(value = "籍贯", required = false) + private String nativePlace; + @ApiModelProperty(value = "省", required = false) + private String province; + @ApiModelProperty(value = "市", required = false) + private String city; + @ApiModelProperty(value = "县区", required = false) + private String county; + @ApiModelProperty(value = "省code", required = false) + private String provinceCode; + @ApiModelProperty(value = "市code", required = false) + private String cityCode; + @ApiModelProperty(value = "县区code", required = false) + private String countyCode; + @ApiModelProperty(value = "住址", required = false) + private String address; + @ApiModelProperty(value = "手机号", required = true) +// @Pattern(regexp = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|(19[1,3,5-9])|166|(147))\\d{8}$", message = "手机号码格式不正确") + @Pattern(regexp = "^[0-9]{11}$", message = "手机号码格式不正确") + @NotBlank(message = "手机号不能为空") + private String mobile; + @ApiModelProperty(value = "邮箱", required = false) + //@Pattern(regexp = "[a-zA-Z0-9]+@[a-zA-Z0-9]+\\.[a-zA-Z0-9]+", message = "邮箱格式不正确") + private String email; + @ApiModelProperty(value = "紧急联系人", required = false) + private String emergencyContact; + @ApiModelProperty(value = "紧急联系电话", required = false) + private String emergencyMobile; + @ApiModelProperty(value = "政治面貌", required = false) + private String poliCode; + @ApiModelProperty(value = "政治面貌key", required = false) + private String poliCodeKey; + @ApiModelProperty(value = "婚姻状况", required = false) + private String maritalStatus; + @ApiModelProperty(value = "婚姻状况key", required = false) + private String maritalStatusKey; + @ApiModelProperty(value = "员工类型", required = true) + @NotBlank(message = "员工类型不能为空") + private String personType; + @ApiModelProperty(value = "员工类型key", required = true) + @NotBlank(message = "员工类型不能为空") + private String personTypeKey; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("入职时间") + private Date joinCompnyDate; + @ApiModelProperty("试用期（无试用期、1个月、2个月、3个月、其他）") + private String probPeriod; + @ApiModelProperty("试用期key") + private String probPeriodKey; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("计划转正日期") + private Date plannedConfirmDate; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("实际转正日期") + private Date confirmationDate; + @ApiModelProperty("银行卡号") + private String bankCardNo; + @ApiModelProperty("开户行") + private String openBank; + @ApiModelProperty("身份证(人像面)") + private String idCardA; + @ApiModelProperty("身份证(国徽面)") + private String idCardB; + @ApiModelProperty("学历证书") + private String diploma; + @ApiModelProperty("学位证书") + private String degreeCertificate; + @ApiModelProperty("前公司离职证明") + private String leaveCertificate; + @ApiModelProperty("员工照片") + private String photo; + @ApiModelProperty(value = "员工部门信息") + private SysStaffOrgDto sysStaffOrg; + @ApiModelProperty(value = "员工角色信息") + private List sysUserRoles; + //========================================// + @ApiModelProperty(value = "毕业院校") + private String graduate; + @ApiModelProperty(value = "学历/专业") + private String education; + private String educationKey; + @ApiModelProperty(value = "职称") + private String title; + @ApiModelProperty(value = "资格认证") + private String qualification; + @ApiModelProperty(value = "驾照类型") + private String licenseType; + @ApiModelProperty(value = "驾照类型key") + private String licenseTypeKey; + @ApiModelProperty(value = "意外险参保：1是，0否") + private Integer isHaveInsurance; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty(value = "意外险参保时间") + private Date insuranceStartDate; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty(value = "意外险参保终止日期") + private Date insuranceEndDate; + @ApiModelProperty(value = "意外险参保地") + private String insuranceAddr; + + @ApiModelProperty(value = "养老:1是，0否") + private Integer isHaveAged; + @ApiModelProperty(value = "医疗:1是，0否") + private Integer isHaveMedical; + @ApiModelProperty(value = "工伤：1是，0否") + private Integer isHaveInjury; + @ApiModelProperty(value = "失业：1是，0否") + private Integer isHaveUnemploy; + @ApiModelProperty(value = "社保参保地") + private String insuredPlace; + @ApiModelProperty(value = "纸质档案保管地") + private String paperPlace; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty(value = "合同起止日期") + private Date contractStartDate; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty(value = "合同结束日期") + private Date contractEndDate; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty(value = "离职日期") + private Date quitDate; + @ApiModelProperty(value = "离职原因") + private String quitReason; + private String accountType;//账号类型 1单位管理员，2操作员，0是平台管理员 3非登录账户 + private String userType;//用户类型:1员工、2客户、3供应商 + private String orgSid; + @Pattern(regexp = "^[0-9]{11}$", message = "账号格式不正确") + @NotBlank(message = "账号不能为空") + private String userName; + private String remarks; + +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoMapper.java new file mode 100644 index 0000000..61485b6 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoMapper.java @@ -0,0 +1,127 @@ +package com.yxt.oms.biz.func.sysstaffinfo; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.oms.biz.func.sysorganization.AppContactSysOrganizationVo; +import com.yxt.oms.biz.func.sysstaffinfo.app.AppSysStaffVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffinfoMapper.java
+ * Class: com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoMapper
+ * Description: 人员基础信息表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SysStaffinfoMapper extends BaseMapper { + + //@Update("update sys_staffinfo set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + List selectAppContactsList(); + + IPage searchAppContactsPageList(IPage page, @Param("list") List list, + @Param("chnStr") String chnStr, @Param("mobileStr") String mobileStr); + + AppContactsDetailsVo selectAppContactsVO(String staffSid); + + List selectContactsByOrgsid(@Param("sid") String sid); + + SysStaffinfo selectJobNumber(); + + /** + * 查询员工的手机号是否重复 + * + * @param mobile 手机号 + * @return + */ + SysStaffinfo selectByMobile(String mobile); + + /** + * 查询是否存在该身份证号的员工 + * + * @param idNo 身份证号 + * @return + */ + SysStaffinfo selectByIdNo(String idNo); + + /** + * 员工管理分页列表 + * + * @param page 分页 + * @param qw 查询条件 + * @return + */ + IPage pagerList(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + /** + * 根据员工sid和员工手机号码查询员工信息是否已存在 + * + * @param mobile 手机号 + * @param sid 员工sid + * @return + */ + SysStaffinfo selectByMobileAndSid(@Param("mobile") String mobile, @Param("sid") String sid); + + /** + * 根据员工sid和身份证号查询员工信息是否已存在 + * + * @param idNo 身份证号 + * @param sid 员工sid + * @return + */ + SysStaffinfo selectByIdNoAndSid(@Param("idNo") String idNo, @Param("sid") String sid); + + /** + * 根据员工sid查询员工信息 + * + * @param sid 员工sid + * @return + */ + SysStaffinfoDetailsVo selectDetailsBySid(@Param("sid") String sid, @Param("path") String path); + + /** + * 根据员工sid更新信息 + * + * @param personType 员工类型 + * @param personTypeKey 员工类型key + * @param sid 员工sid + * @return + */ + int updateBySid(@Param("personType") String personType, @Param("personTypeKey") String personTypeKey, + @Param("sid") String sid, @Param("date") Date date, @Param("reason") String reason); + + /** + * 查询当前分公司下的员工信息 + * + * @param orgSid 分公司sid + * @return + */ + List selectStaffList(String orgSid); + + List> getStaffName(@Param(Constants.WRAPPER) Wrapper> qw); + + List> getStaffNameByDeptSid(@Param(Constants.WRAPPER) Wrapper> qw); + + IPage getUserList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("orgSid") String orgSid); + + List getGressionUserList(@Param("userOrgSid")String userOrgSid); + + List selectStaffLists(); + List selectStaffListss(); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoMapper.xml new file mode 100644 index 0000000..b6a97ef --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoMapper.xml @@ -0,0 +1,398 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + update sys_staffinfo + set personType = #{personType}, + personTypeKey = #{personTypeKey}, + quitDate = #{date}, + quitReason = #{reason} + where sid = #{sid} + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoQuery.java new file mode 100644 index 0000000..575da0f --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoQuery.java @@ -0,0 +1,42 @@ +package com.yxt.oms.biz.func.sysstaffinfo; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffinfoQuery.java
+ * Class: com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoQuery
+ * Description: 人员基础信息表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "人员基础信息表 查询条件", description = "人员基础信息表 查询条件") +@Data +public class SysStaffinfoQuery implements Query { + + + private static final long serialVersionUID = 7101232842735165406L; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("员工类型key") + private String personTypeKey; + @ApiModelProperty("手机号") + private String mobile; + @ApiModelProperty("入职开始日期") + private String joinCompnyDateStart; + @ApiModelProperty("入职结束日期") + private String joinCompnyDateEnd; + @ApiModelProperty(value = "所在部门sid") + private String orgSid; + @ApiModelProperty(value = "所在岗位sid") + private String postSid; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoService.java new file mode 100644 index 0000000..5d53cd3 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoService.java @@ -0,0 +1,138 @@ +package com.yxt.oms.biz.func.sysstaffinfo; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.sysstaffinfo.app.AppSysStaffQuery; +import com.yxt.oms.biz.func.sysstaffinfo.app.AppSysStaffVo; +import com.yxt.oms.feign.portal.sysstaffinfo.SysStaffinfoFeign; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffinfoService.java
+ * Class: com.yxt.user.biz.sysstaffinfo.SysStaffinfoService
+ * Description: 人员基础信息表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SysStaffinfoService extends MybatisBaseService { + + + @Autowired + private SysStaffinfoFeign sysStaffinfoFeign; + + + public ResultBean> selectAppContactsList() { + return sysStaffinfoFeign.selectAppContactsList(""); + } + + public ResultBean> searchAppContactsList(PagerQuery pagerQuery ) { + return sysStaffinfoFeign.searchAppContactsList(pagerQuery); + } + + public ResultBean> searchAppContactsList2(PagerQuery pagerQuery) { + return sysStaffinfoFeign.searchAppContactsList2(pagerQuery); + } + + + public ResultBean selectAppContactsVO(String staffSid) { + return sysStaffinfoFeign.selectAppContactsVO(staffSid); + } + + + /** + * 员工管理分页列表 + * + * @param pagerQuery 查询条件 + * @return + */ + public ResultBean> pagerList(PagerQuery pagerQuery) { + + return sysStaffinfoFeign.listPage(pagerQuery); + } + + + + /** + * 员工信息的新增保存 + * + * @param dto 数据传输对象 + * @return + */ + public ResultBean saveStaffInfo(SysStaffinfoDto dto) { + return sysStaffinfoFeign.save(dto); + } + + + /** + * 员工信息修改保存 + * + * @param dto 数据传输对象 + * @param sid 员工信息sid + * @return + */ + public ResultBean updateStaffInfo(SysStaffinfoDto dto, String sid) { + return sysStaffinfoFeign.update(dto,sid); + } + + /** + * 根据员工sid查询员工信息 + * + * @param sid 员工sid + * @return + */ + public ResultBean selectDetailsBySid(String sid) { + return sysStaffinfoFeign.fetchBySid(sid); + } + + /** + * 员工信息的删除操作，即设置员工类型为离职状态。 + * + * @param sysStaffQuery 员工sid + * @return + */ + public ResultBean del(SysStaffQuery sysStaffQuery) { + return sysStaffinfoFeign.del(sysStaffQuery); + } + + public ResultBean> selectStaffList(PcSysStaffQuery pcSysStaffQuery) { + return sysStaffinfoFeign.selectStaffList(pcSysStaffQuery); + } + + public ResultBean>> getStaffName(String staffName,String deptSid) { + return sysStaffinfoFeign.getStaffName(staffName,deptSid); + } + + public ResultBean>> getStaffNameByDeptSid(String staffName, String deptSid) { + return sysStaffinfoFeign.getStaffNameByDeptSid(staffName,deptSid); + } + + public ResultBean> getUserList(PagerQuery pagerQuery) { + return sysStaffinfoFeign.getUserList(pagerQuery); + } + + public ResultBean> getGressionUserList(String userSid, String orgPath) { + return sysStaffinfoFeign.getGressionUserList(userSid, orgPath); + } + + public ResultBean> selectStaffLists() { + return sysStaffinfoFeign.selectStaffLists(); + } + + public ResultBean> selectStaffListss() { + return sysStaffinfoFeign.selectStaffListss(); + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoVo.java new file mode 100644 index 0000000..30551f5 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoVo.java @@ -0,0 +1,47 @@ +package com.yxt.oms.biz.func.sysstaffinfo; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffinfoVo.java
+ * Class: com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo
+ * Description: 人员基础信息表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "人员基础信息表 视图数据对象", description = "人员基础信息表 视图数据对象") +@Data +public class SysStaffinfoVo implements Vo { + + private static final long serialVersionUID = -1250862291306247261L; + @ApiModelProperty(value = "员工sid") + private String sid; + @ApiModelProperty(value = "员工编号") + private String jobNumber; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("员工类型") + private String personType; + @ApiModelProperty("手机号") + private String mobile; + @ApiModelProperty(value = "入职日期") + private String joinCompnyDate; + @ApiModelProperty(value = "部门") + private String orgName; + @ApiModelProperty(value = "岗位") + private String postName; + @ApiModelProperty(value = "部门sid") + private String orgSid; + + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/WxBase64Query.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/WxBase64Query.java new file mode 100644 index 0000000..d573b08 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/WxBase64Query.java @@ -0,0 +1,20 @@ +package com.yxt.oms.biz.func.sysstaffinfo; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author dimengzhe + * @date 2021/10/6 16:58 + * @description + */ +@Data +public class WxBase64Query implements Query { + private static final long serialVersionUID = 4307651151043379231L; +// @ApiModelProperty(value = "base64") +// private String base64File; + + @ApiModelProperty(value = "图片全路径") + private String imageUrl; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/WxSysInfoQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/WxSysInfoQuery.java new file mode 100644 index 0000000..c1e391f --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/WxSysInfoQuery.java @@ -0,0 +1,37 @@ +package com.yxt.oms.biz.func.sysstaffinfo; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @author dimengzhe + * @date 2021/10/6 12:08 + * @description 客户端上传身份证 + */ +@Data +public class WxSysInfoQuery implements Query { + private static final long serialVersionUID = 7273642052588903116L; + @ApiModelProperty(value = "用户sid", required = true) + @NotBlank(message = "用户sid不能为空") + private String userSid; + @ApiModelProperty(value = "身份证(人像面)", required = true) + @NotBlank(message = "身份证(人像面)不能为空") + private String idCardA; + @ApiModelProperty(value = "身份证(国徽面)", required = true) + @NotBlank(message = "身份证(国徽面)不能为空") + private String idCardB; + + @ApiModelProperty(value = "身份证地址", required = true) + @NotBlank(message = "身份证地址不能为空") + private String idAddrs; + @ApiModelProperty(value = "证件有效期", required = true) + @NotBlank(message = "证件有效期不能为空") + private String idTerm; + @ApiModelProperty(value = "生日") + private String birth; + @ApiModelProperty(value = "民族") + private String national; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/app/AppSysStaffQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/app/AppSysStaffQuery.java new file mode 100644 index 0000000..10bdc16 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/app/AppSysStaffQuery.java @@ -0,0 +1,30 @@ +package com.yxt.oms.biz.func.sysstaffinfo.app; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/6/11 9:44 + * @Description + */ +@Data +public class AppSysStaffQuery implements Query { + private static final long serialVersionUID = 4724669786231817593L; + @ApiModelProperty(value = "用户名称") + private String name; + @ApiModelProperty(value = "用户sid") + private String userSid; + + @ApiModelProperty("组织机构sid") + private String orgPath; + + @ApiModelProperty("已选人员sid") + private List selectSid; + + @ApiModelProperty("state：1是所有，0是本分公司") + private int state; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/app/AppSysStaffVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/app/AppSysStaffVo.java new file mode 100644 index 0000000..10aa780 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/app/AppSysStaffVo.java @@ -0,0 +1,30 @@ +package com.yxt.oms.biz.func.sysstaffinfo.app; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/6/11 9:29 + * @Description + */ +@Data +public class AppSysStaffVo implements Vo { + private static final long serialVersionUID = -4051562700421770402L; + @ApiModelProperty(value = "用户sid") + private String userSid; + @ApiModelProperty(value = "用户名称") + private String userName; + @ApiModelProperty(value = "头像") + private String userImage; + @ApiModelProperty(value = "电话") + private String userMobile; + @ApiModelProperty(value = "部门") + private String department; + @ApiModelProperty(value = "岗位") + private String position; + + @ApiModelProperty(value = "头像：后端内部使用") + private String headImage; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDetailsVo.java new file mode 100644 index 0000000..9792324 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDetailsVo.java @@ -0,0 +1,28 @@ +package com.yxt.oms.biz.func.sysstafforg; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/2/11 16:15 + * @Description 员工部门详情信息 + */ +@Data +public class SysStaffOrgDetailsVo implements Vo { + private static final long serialVersionUID = 5354841525724609428L; + + @ApiModelProperty("部门sid") + private String orgSid; + @ApiModelProperty("部门名称") + private String orgName; + @ApiModelProperty("部门路径") + private String orgSidPath; + @ApiModelProperty("部门名称路径") + private String orgNamePath; + @ApiModelProperty(value = "部门编码") + private String orgCode; + @ApiModelProperty("管理类型：1、主管。2、分管。3、员工") + private String manageType; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDto.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDto.java new file mode 100644 index 0000000..04b883c --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDto.java @@ -0,0 +1,42 @@ +package com.yxt.oms.biz.func.sysstafforg; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffOrgDto.java
+ * Class: com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDto
+ * Description: 员工部门关联表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "员工部门关联表 数据传输对象", description = "员工部门关联表 数据传输对象") +@Data +public class SysStaffOrgDto implements Dto { + + private static final long serialVersionUID = 1403491378761015027L; + @ApiModelProperty("部门sid") + private String orgSid; + @ApiModelProperty("部门名称") + @NotBlank(message = "部门名称不能为空") + private String orgName; +// @ApiModelProperty("部门路径") +// private String orgSidPath; +// @ApiModelProperty("部门名称路径") +// private String orgNamePath; + @ApiModelProperty(value = "部门编码") + private String orgCode; + @ApiModelProperty(value = "管理类型：1、主管。2、分管。3、员工", example = "3") + private String manageType; +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysuser/SysUserService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysuser/SysUserService.java index 0f14116..662065c 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/sysuser/SysUserService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysuser/SysUserService.java @@ -1,16 +1,20 @@ package com.yxt.oms.biz.func.sysuser; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.oms.feign.portal.sysuser.SysUserDto; import com.yxt.oms.feign.portal.sysuser.SysUserFeign; import com.yxt.oms.feign.portal.sysuser.SysUserQuery; import com.yxt.oms.feign.portal.sysuser.SysUserVo; +import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; @@ -60,4 +64,18 @@ public class SysUserService { public ResultBean setIsEnable(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid, @ApiParam(value = "isEnable", required = true) @PathVariable("isEnable") String isEnable){ return sysUserFeign.setIsEnable(sid, isEnable); } + + /** + * 初始化密码 + * + * @param sid 用户sid + * @return ResultBean + */ + public ResultBean initPwd(String sid) { + return sysUserFeign.initPwd(sid); + } + + public ResultBean delBySid(String sid) { + return sysUserFeign.delBySid(sid); + } } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleVo.java index 497ed22..3b1f21b 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleVo.java @@ -29,4 +29,5 @@ public class SysUserRoleVo implements Vo { @ApiModelProperty("角色sid") private String roleSid; + private String name; } diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeign.java index f4cbd0f..b6b7247 100644 --- a/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeign.java @@ -45,8 +45,8 @@ public interface SysOrganizationFeign { public ResultBean> listAll(@RequestBody SysOrganizationQuery query); @ApiOperation("所有数据列表") - @GetMapping("/list") - public ResultBean> list(); + @GetMapping("/list/{orgSid}") + public ResultBean> list(@PathVariable("orgSid") String orgSid); @ApiOperation("一级组织机构列表") @GetMapping("/selectFirstOrgList") diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeignFallback.java index 4f45fd6..58d8f92 100644 --- a/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeignFallback.java +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeignFallback.java @@ -42,7 +42,7 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign { } @Override - public ResultBean> list() { + public ResultBean> list(String orgSid) { return null; } diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java new file mode 100644 index 0000000..cae62b8 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java @@ -0,0 +1,153 @@ +package com.yxt.oms.feign.portal.sysstaffinfo; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.sysstaffinfo.*; +import com.yxt.oms.biz.func.sysstaffinfo.app.AppSysStaffQuery; +import com.yxt.oms.biz.func.sysstaffinfo.app.AppSysStaffVo; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; +import java.util.Map; + +/** + * @author wangpengfei + * @date 2024/7/11 13:55 + */ +@FeignClient( + contextId = "ss-common-portal-sysstaffinfo", + name = "ss-common-portal", + path = "/apiadmin/sysstaffinfo") +public interface SysStaffinfoFeign { + + + /** + * 员工管理分页列表 + * + * @param pq 查询条件 + * @return + */ + @ApiOperation("员工管理分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + /** + * 员工信息新增保存 + * + * @param dto 数据传输对象 + * @return + */ + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@Valid @RequestBody SysStaffinfoDto dto); + + /** + * 员工信息修改保存 + * + * @param dto 数据传输对象 + * @param sid 员工信息sid + * @return + */ + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@Valid @RequestBody SysStaffinfoDto dto, @PathVariable("sid") String sid); + + /** + * 员工信息删除操作，即离职 + * + * @param sysStaffQuery 数据传输对象 + * @return + */ + @ApiOperation("设置离职") + @PostMapping("/del") + public ResultBean del(@RequestBody SysStaffQuery sysStaffQuery); + + /** + * 员工信息编辑初始化及详情 + * + * @param sid 员工sid + * @return + */ + @ApiOperation("员工信息编辑初始化及详情") + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid); + + /** + * 获取集团内全部员工姓名 + * + * @param staffName 员工姓名 + * @return + */ + @ApiOperation("获取集团内全部员工姓名") + @GetMapping("/getStaffName") + public ResultBean>> getStaffName(@RequestParam(value = "staffName", required = false) String staffName, @RequestParam(value = "deptSid") String deptSid); + + /** + * 获取部门内全部员工姓名 + * + * @param staffName 员工姓名 + * @return + */ + @ApiOperation("获取部门内全部员工姓名") + @GetMapping("/getStaffNameByDeptSid") + public ResultBean>> getStaffNameByDeptSid(@RequestParam(value = "staffName", required = false) String staffName, @RequestParam(value = "deptSid") String deptSid); + + + @ApiOperation("获取App通讯录") + @ResponseBody + @GetMapping("/selectAppContactsList") + public ResultBean> selectAppContactsList(@RequestParam(value = "names", required = false) String names); + + @ApiOperation("app查看通讯录详情") + @ResponseBody + @GetMapping("/selectAppContactsVO/{staffSid}") + public ResultBean selectAppContactsVO(@PathVariable("staffSid") String staffSid); + + @ApiOperation("App通讯录搜索") + @ResponseBody + @PostMapping("/searchAppContactsList") + public ResultBean> searchAppContactsList(@RequestBody PagerQuery pq); + + @ApiOperation("App通讯录搜索2") + @ResponseBody + @PostMapping("/searchAppContactsList2") + public ResultBean> searchAppContactsList2(@RequestBody PagerQuery pq); + + @ApiOperation("销售订单-内部推荐人下拉框") + @ResponseBody + @GetMapping("/selectStaffList") + ResultBean> selectStaffList(@SpringQueryMap PcSysStaffQuery pcSysStaffQuery); + + @ApiOperation("移动端-销售订单-内部推荐人下拉框") + @ResponseBody + @PostMapping("/getUserList") + ResultBean> getUserList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("存放地点变更-获取人员列表") + @ResponseBody + @GetMapping("/getGressionUserList/{userSid}") + ResultBean> getGressionUserList(@PathVariable("userSid") String userSid); + + @ApiOperation("切换机构：存放地点变更-获取人员列表") + @ResponseBody + @GetMapping("/getGressionUserList") + ResultBean> getGressionUserList(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath); + + + @ApiOperation("获取集团所有人员") + @ResponseBody + @GetMapping("/selectStaffLists") + ResultBean> selectStaffLists(); + + @ApiOperation("获取集团所有在职人员") + @ResponseBody + @GetMapping("/selectStaffListss") + ResultBean> selectStaffListss(); + + +} diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java index b6e5b66..9adbaa2 100644 --- a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java @@ -83,4 +83,12 @@ public interface SysUserFeign { @ApiOperation("根据sid获取一条记录") @GetMapping("/fetchBySid/{sid}") public ResultBean fetchBySid(@PathVariable("sid") String sid); + @ResponseBody + @PostMapping("/initPwd/{sid}") + @ApiOperation(value = "10、用户初始化密码") + @ApiOperationSupport(order = 100) + public ResultBean initPwd(@ApiParam(value = "用户sid", required = true) @PathVariable("sid") String sid); + @ApiOperation("删除记录根据sid") + @GetMapping("/delBySid/{sid}") + public ResultBean delBySid(@PathVariable("sid") String sid); } diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java index 2892004..ba0e04a 100644 --- a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java @@ -76,4 +76,14 @@ public class SysUserFeignFallback implements SysUserFeign { public ResultBean fetchBySid(String sid) { return null; } + + @Override + public ResultBean initPwd(String sid) { + return null; + } + + @Override + public ResultBean delBySid(String sid) { + return null; + } } diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserVo.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserVo.java index c68c0bf..3cde48e 100644 --- a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserVo.java +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserVo.java @@ -1,14 +1,17 @@ package com.yxt.oms.feign.portal.sysuser; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; +import com.yxt.oms.biz.func.sysrole.SysRoleVo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NoArgsConstructor; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -68,8 +71,8 @@ public class SysUserVo implements Vo { @ApiModelProperty("用户类型:1员工、2客户、3供应商") private String userType; - @ApiModelProperty("用户类型:1、2、3") - private String userTypeKey; + @ApiModelProperty("用户类型:1、2、3") + private String userTypeValue; @ApiModelProperty("用户头像") private String headImage; @ApiModelProperty("组织名称") @@ -98,4 +101,10 @@ public class SysUserVo implements Vo { List sysOrganizationVos; private String orgSid; private String orgName; + private List sysRoleVos; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; + private String roles;//角色 ,分割 + private String accountType; + private String accountTypeValue; }