yxt_group
/
supervise
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

员工表修改新增和修改接口

master
wangpengfei 2 years ago
parent
4f36f54de6
commit
9c47c1ded1
12 changed files with 650 additions and 130 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java
  2. 2
      yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfo.java
  3. 29
      yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDto.java
  4. 11
      yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java
  5. 16
      yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java
  6. 8
      yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoQuery.java
  7. 22
      yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoVo.java
  8. 8
      yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.java
  9. 54
      yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.xml
  10. 26
      yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoRest.java
  11. 554
      yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoService.java
  12. 21
      yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java

25
yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/wechat/WechatRest.java
View File

@ -1,6 +1,7 @@
package com.yxt.supervise.customer.biz.wechat;
import com.alibaba.fastjson.JSONObject;
import com.yxt.supervise.customer.api.wechat.Template;
import com.yxt.supervise.customer.api.wechat.TemplateData;
import com.yxt.supervise.customer.api.wechat.WeChatTemplateMsg;
import com.yxt.supervise.customer.biz.util.WeixinCheckoutUtil;
@ -60,13 +61,19 @@ public class WechatRest {
@PostMapping("/sendMessage")
public void sendMessage(@RequestBody WeChatTemplateMsg data) throws Exception {
String openId="otnrM521f8KcCsRfL2Jj4Tk8np1g";
//
//String openId="otnrM57kui-WCUmRtChhb1HguOgw";
//郭
String openId="otnrM544hxIgkMOfaDU8VpJhj_6k";
//刘
//String openId ="otnrM5ySvUo7ZZc4qafWzM9eyKBk";
//String openId="otnrM544hxIgkMOfaDU8VpJhj_6k";
//聂总
//otnrM521f8KcCsRfL2Jj4Tk8np1g
// String appsecret="4764e32722a7d98656dea6afd9405701";
// String appId="wx1d44e0fcd110351a";
// 模板参数
Map<String, String> sendMag = new HashMap<String, String>();
Map<String, Template> sendMag = new HashMap<String, Template>();
// openId代表一个唯一微信用户，即微信消息的接收人
//String openId = "oLcw_5ti_iJpwibmL0QxfK2ZG9qQ";
// 公众号的模板id(也有相应的接口可以查询到)
@ -92,12 +99,12 @@ public class WechatRest {
* 兑付日期：{{keyword5.DATA}}
* {{remark.DATA}}
*/
sendMag.put("first", "f123");
sendMag.put("keyword1", "111");
sendMag.put("keyword2", "222");
sendMag.put("keyword3", "333");
sendMag.put("keyword4", "444");
sendMag.put("remark", "123465");
sendMag.put("first", new Template("f123"));
sendMag.put("keyword1", new Template("111"));
sendMag.put("keyword2", new Template("222"));
sendMag.put("keyword3", new Template("333"));
sendMag.put("keyword4", new Template("444"));
sendMag.put("remark", new Template("123465"));
Map<String, String> miniprogram = new HashMap<>();
miniprogram.put("appid","wx11565021714ba796");
miniprogram.put("pagepath","pages/index/index");

2
yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfo.java
View File

@ -170,4 +170,6 @@ public class SysStaffinfo extends BaseEntity {
private String postRank;
@ApiModelProperty("身份证地址")
private String idAddrs;
@ApiModelProperty("微信")
private String openId;
}

29
yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDto.java
View File

@ -32,31 +32,31 @@ public class SysStaffinfoDto implements Dto {
private static final long serialVersionUID = 8637516813924395044L;
@ApiModelProperty(value = "姓名", required = true)
@NotBlank(message = "姓名不能为空")
//@NotBlank(message = "姓名不能为空")
private String name;
@ApiModelProperty(value = "性别key", required = true)
@NotBlank(message = "性别不能为空")
//@NotBlank(message = "性别不能为空")
private String genderKey;
@ApiModelProperty(value = "性别", required = true)
@NotBlank(message = "性别不能为空")
//@NotBlank(message = "性别不能为空")
private String gender;
@ApiModelProperty(value = "员工编号")
private String jobNumber;
@ApiModelProperty(value = "身份证号", required = true)
@Pattern(regexp = "/(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)/", message = "请输入正确的身份证号")
@NotBlank(message = "身份证号不能为空")
//@Pattern(regexp = "/(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)/", message = "请输入正确的身份证号")
//@NotBlank(message = "身份证号不能为空")
private String idNo;
@ApiModelProperty(value = "证件有效期", required = true)
@NotBlank(message = "证件有效期不能为空")
//@NotBlank(message = "证件有效期不能为空")
private String idTerm;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("生日")
//@ApiModelProperty("生日")
private Date birthday;
@ApiModelProperty(value = "民族", required = true)
@NotBlank(message = "民族不能为空")
//@NotBlank(message = "民族不能为空")
private String national;
@ApiModelProperty(value = "民族key", required = true)
@NotBlank(message = "民族不能为空")
//@NotBlank(message = "民族不能为空")
private String nationalKey;
@ApiModelProperty(value = "籍贯", required = false)
private String nativePlace;
@ -75,8 +75,8 @@ public class SysStaffinfoDto implements Dto {
@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 = "手机号码格式不正确")
@NotBlank(message = "手机号不能为空")
//@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 = "手机号码格式不正确")
//@NotBlank(message = "手机号不能为空")
private String mobile;
@ApiModelProperty(value = "邮箱", required = false)
//@Pattern(regexp = "[a-zA-Z0-9]+@[a-zA-Z0-9]+\\.[a-zA-Z0-9]+", message = "邮箱格式不正确")
@ -94,10 +94,10 @@ public class SysStaffinfoDto implements Dto {
@ApiModelProperty(value = "婚姻状况key", required = false)
private String maritalStatusKey;
@ApiModelProperty(value = "员工类型", required = true)
@NotBlank(message = "员工类型不能为空")
//@NotBlank(message = "员工类型不能为空")
private String personType;
@ApiModelProperty(value = "员工类型key", required = true)
@NotBlank(message = "员工类型不能为空")
//@NotBlank(message = "员工类型不能为空")
private String personTypeKey;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("入职时间")
@ -181,5 +181,6 @@ public class SysStaffinfoDto implements Dto {
private Date quitDate;
@ApiModelProperty(value = "离职原因")
private String quitReason;
@ApiModelProperty(value = "微信")
private String openId;
}

11
yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java
View File

@ -44,7 +44,9 @@ public interface SysStaffinfoFeign {
@ApiOperation("员工管理分页列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<SysStaffinfoVo>> listPage(@RequestBody PagerQuery<SysStaffinfoQuery> pq);
@ApiOperation("员工管理分页列表 新")
@PostMapping("/listPageNew")
public ResultBean<PagerVo<SysStaffinfoVo>> listPageNew(@RequestBody PagerQuery<SysStaffinfoQuery> pq);
/**
* 员工信息新增保存
*
@ -54,6 +56,9 @@ public interface SysStaffinfoFeign {
@ApiOperation("新增保存")
@PostMapping("/save")
public ResultBean save(@Valid @RequestBody SysStaffinfoDto dto);
@ApiOperation("新增保存")
@PostMapping("/saveNew")
public ResultBean saveNew(@Valid @RequestBody SysStaffinfoDto dto);
/**
* 员工信息修改保存
@ -65,7 +70,9 @@ public interface SysStaffinfoFeign {
@ApiOperation("修改保存")
@PostMapping("/update/{sid}")
public ResultBean update(@Valid @RequestBody SysStaffinfoDto dto, @PathVariable("sid") String sid);
@ApiOperation("修改保存")
@PostMapping("/updateNew/{sid}")
public ResultBean updateNew(@Valid @RequestBody SysStaffinfoDto dto, @PathVariable("sid") String sid);
/**
* 员工信息删除操作，即离职
*

16
yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java
View File

@ -31,17 +31,31 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui_portal/sysstaffinfo/listPage无法访问");
}
@Override
public ResultBean<PagerVo<SysStaffinfoVo>> listPageNew(PagerQuery<SysStaffinfoQuery> pq) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui_portal/sysstaffinfo/listPageNew无法访问");
}
@Override
public ResultBean save(SysStaffinfoDto dto) {
return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffinfo/save无法访问");
}
@Override
public ResultBean saveNew(SysStaffinfoDto dto) {
return null;
}
@Override
public ResultBean update(SysStaffinfoDto dto, String sid) {
return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffinfo/update无法访问");
}
@Override
public ResultBean updateNew(SysStaffinfoDto dto, String sid) {
return null;
}
@Override
public ResultBean del(SysStaffQuery sysStaffQuery) {
return null;

8
yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoQuery.java
View File

@ -37,6 +37,14 @@ public class SysStaffinfoQuery implements Query {
private String joinCompnyDateEnd;
@ApiModelProperty(value = "所在部门sid")
private String orgSid;
@ApiModelProperty(value = "所在部门sid")
private String orgName;
@ApiModelProperty(value = "所在岗位sid")
private String postSid;
@ApiModelProperty(value = "角色sid")
private String roleSid;
@ApiModelProperty(value = "角色sid")
private String roleName;
@ApiModelProperty(value = "用户名")
private String userName;
}

22
yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoVo.java
View File

@ -42,6 +42,28 @@ public class SysStaffinfoVo implements Vo {
private String postName;
@ApiModelProperty(value = "部门sid")
private String orgSid;
@ApiModelProperty(value = "记录是否可用，1:可用，0:不可用")
private String isEnable;
@ApiModelProperty(value = "部门名")
private String departmentName;
@ApiModelProperty(value = "部门sid")
private String departmentSid;
@ApiModelProperty(value = "岗位sid")
private String postSid;
@ApiModelProperty(value = "岗位名称")
private String userName;
@ApiModelProperty(value = "用户sid")
private String userSid;
@ApiModelProperty(value = "角色")
private String roleName;
@ApiModelProperty(value = "类型code")
private String userType;
@ApiModelProperty(value = "用户类型:1监管、2客户、3银行")
private String userTypeKey;
@ApiModelProperty(value = "微信")
private String openId;
@ApiModelProperty(value = "职位")
private String position;
}

8
yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.java
View File

@ -68,6 +68,14 @@ public interface SysStaffinfoMapper extends BaseMapper<SysStaffinfo> {
* @return
*/
IPage<SysStaffinfoVo> pagerList(IPage<SysStaffinfoQuery> page, @Param(Constants.WRAPPER) Wrapper<SysStaffinfoVo> qw);
/**
* 员工管理分页列表 新
*
* @param page 分页
* @param qw 查询条件
* @return
*/
IPage<SysStaffinfoVo> pagerListNew(IPage<SysStaffinfoQuery> page, @Param(Constants.WRAPPER) Wrapper<SysStaffinfoVo> qw);
/**
* 根据员工sid和员工手机号码查询员工信息是否已存在

54
yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.xml
View File

@ -124,6 +124,60 @@
ON ssp.staffSid = si.sid
${ew.customSqlSegment}
</select>
<select id="pagerListNew" resultType="com.yxt.supervise.system.sysstaffinfo.SysStaffinfoVo">
SELECT DISTINCT sta.Sid,
user.isEnable,
(
SELECT GROUP_CONCAT(org.name)
FROM sys_staff_org staffOrg
LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
WHERE staffOrg.staffSid = user.staffSid
) departmentName,
(
SELECT GROUP_CONCAT(org.sid)
FROM sys_staff_org staffOrg
LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
WHERE staffOrg.staffSid = user.staffSid
) sysStaffOrg,
(
SELECT GROUP_CONCAT(post.name)
FROM sys_staff_post staffPost
LEFT JOIN sys_post post ON post.sid = staffPost.postSid
WHERE staffPost.staffSid = user.staffSid
) postName,
(
SELECT GROUP_CONCAT(post.sid)
FROM sys_staff_post staffPost
LEFT JOIN sys_post post ON post.sid = staffPost.postSid
WHERE staffPost.staffSid = user.staffSid
) sysStaffPost,
user.userName,
user.sid userSid,
staff.name,
(
SELECT GROUP_CONCAT(role.name)
FROM sys_user_role user_role
LEFT JOIN sys_role role ON role.sid = user_role.roleSid
WHERE user_role.userSid = USER.sid
) roleName,
-- dict.dictValue userType,
user.userType userTypeKey,
sta.mobile,
sta.position,
sta.openId,
CASE
WHEN user.userType='1' THEN '监管'
WHEN user.userType='2' THEN '客户'
WHEN user.userType='3' THEN '银行'
end userType
FROM sys_staffinfo sta
LEFT JOIN sys_user user on user.staffSid =sta.sid
LEFT JOIN sys_user_role user_role ON user_role.userSid = USER.sid
LEFT JOIN sys_role role ON role.sid = user_role.roleSid
LEFT JOIN dict_common dict ON dict.dictKey = user.userType AND dict.dictType = 'userType'
LEFT JOIN sys_staffinfo staff ON staff.sid = user.staffSid
${ew.customSqlSegment}
</select>
<!--根据员工手机号和sid查询员工信息是否已存在-->
<select id="selectByMobileAndSid" resultType="com.yxt.supervise.system.sysstaffinfo.SysStaffinfo">
select *

26
yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoRest.java
View File

@ -64,7 +64,14 @@ public class SysStaffinfoRest implements SysStaffinfoFeign {
PagerVo<SysStaffinfoVo> pv1 = PagerUtil.pageToVo(page, pv);
return rb.success().setData(pv1);
}
@Override
public ResultBean<PagerVo<SysStaffinfoVo>> listPageNew(@RequestBody PagerQuery<SysStaffinfoQuery> pq) {
ResultBean<PagerVo<SysStaffinfoVo>> rb = ResultBean.fireFail();
IPage<SysStaffinfoVo> page = sysStaffinfoService.lpagerListNew(pq);
PagerVo<SysStaffinfoVo> pv = new PagerVo<>();
PagerVo<SysStaffinfoVo> pv1 = PagerUtil.pageToVo(page, pv);
return rb.success().setData(pv1);
}
/**
* 员工信息的新增保存
*
@ -80,6 +87,14 @@ public class SysStaffinfoRest implements SysStaffinfoFeign {
}
return rb.success().setMsg(resultBean.getMsg());
}
public ResultBean saveNew(SysStaffinfoDto dto) {
ResultBean rb = ResultBean.fireFail();
ResultBean resultBean = sysStaffinfoService.saveStaffInfoNew(dto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setMsg(resultBean.getMsg());
}
/**
* 员工信息的修改保存
@ -97,7 +112,14 @@ public class SysStaffinfoRest implements SysStaffinfoFeign {
}
return rb.success().setMsg(resultBean.getMsg());
}
public ResultBean updateNew(SysStaffinfoDto dto, String sid) {
ResultBean rb = ResultBean.fireFail();
ResultBean resultBean = sysStaffinfoService.updateStaffInfoNew(dto, sid);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setMsg(resultBean.getMsg());
}
/**
* 进行删除操作，即设置员工类型为离职类型02的操作。
*

554
yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoService.java
View File

@ -200,6 +200,59 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
return sysStaffinfoVoIPage;
}
public IPage<SysStaffinfoVo> lpagerListNew(PagerQuery<SysStaffinfoQuery> pagerQuery) {
// mybits所用的分页对对象
IPage<SysStaffinfoQuery> page = PagerUtil.queryToPage(pagerQuery);
// mybits所用的查询条件封装类
//QueryWrapper<SysStaffinfoVo> qw = createQueryWrapper(pagerQuery.getParams());
SysStaffinfoQuery query=pagerQuery.getParams();
QueryWrapper<SysStaffinfoVo> qw = new QueryWrapper<>();
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getName())) {
qw.like("staff.name", query.getName());
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getUserName())) {
qw.like("user.userName", query.getUserName());
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getRoleName())) {
qw.like("role.name", query.getRoleName());
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getOrgName())) {
qw.like("org.name", query.getOrgName());
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getMobile())) {
qw.eq("sta.mobile", query.getMobile());
}
qw.ne("staff.personTypeKey","01");
IPage<SysStaffinfoVo> sysStaffinfoVoIPage = baseMapper.pagerListNew(page, qw);
List<SysStaffinfoVo> records = sysStaffinfoVoIPage.getRecords();
for (SysStaffinfoVo record : records) {
String orgSid = record.getOrgSid();
String orgName = "";
if (StringUtils.isNotBlank(orgSid)) {
String[] split = orgSid.split(",");
for (String s : split) {
//获取本级sid获取本级部门信息
SysOrganization sysOrganization = sysOrganizationService.fetchBySid(s);
if(sysOrganization == null){
sysStaffOrgService.delByOrgSid(s);
}else{
//从本级部门信息中获取上级sid
String psid = sysOrganization.getPsid();
//从本级部门信息中获取本级部门名称
String bjName = sysOrganization.getName();
//获取上级sid获取上级部门信息
SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(psid);
//从上级部门信息中获取上级部门名称
String sjName = sysOrganization1.getName();
orgName += sjName + "-" + bjName + ",";
}
}
orgName = orgName.substring(0, orgName.length() - 1);
record.setOrgName(orgName);
}
}
return sysStaffinfoVoIPage;
}
public List<AppContactSysOrganizationVo> selectContactsByOrgsid(String sid) {
List<AppContactSysOrganizationVo> list = baseMapper.selectContactsByOrgsid(sid);
list.stream().forEach(vo -> {
@ -235,35 +288,35 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
jobNumber = addOne(jobNumber);
}
//查询员工的手机号是否重复
SysStaffinfo sysStaffinfo1 = baseMapper.selectByMobile(dto.getMobile());
SysUser sysUser1 = sysUserService.selectByMobile(dto.getMobile());
if (sysStaffinfo1 != null || sysUser1 != null) {
return rb.setMsg("已存在手机号为" + dto.getMobile() + "的员工");
}
// SysStaffinfo sysStaffinfo1 = baseMapper.selectByMobile(dto.getMobile());
// SysUser sysUser1 = sysUserService.selectByMobile(dto.getMobile());
// if (sysStaffinfo1 != null || sysUser1 != null) {
// return rb.setMsg("已存在手机号为" + dto.getMobile() + "的员工");
// }
//查询是否存在该身份证号的员工
SysStaffinfo sysStaffinfo2 = baseMapper.selectByIdNo(dto.getIdNo());
if (sysStaffinfo2 != null) {
return rb.setMsg("已存在身份证号为" + dto.getIdNo() + "的员工");
}
// SysStaffinfo sysStaffinfo2 = baseMapper.selectByIdNo(dto.getIdNo());
// if (sysStaffinfo2 != null) {
// return rb.setMsg("已存在身份证号为" + dto.getIdNo() + "的员工");
// }
//判断身份证号出生日期和填写的出生日期是否相同
String idNo = dto.getIdNo();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
String birthday = simpleDateFormat.format(dto.getBirthday());
String substring = idNo.substring(6, 14);
if (!birthday.equals(substring)) {
return rb.setMsg("选择的出生日期和身份证出生日期不符，请重新选择");
}
//查询部门和岗位是否为空
if (dto.getSysStaffOrg() == null) {
return rb.setMsg("员工部门信息不能为空");
}
if (dto.getSysStaffPost() == null) {
return rb.setMsg("员工岗位信息不能为空");
}
Date joinCompnyDate = dto.getJoinCompnyDate();
if (joinCompnyDate == null) {
return rb.setMsg("员工入职日期不能为空");
}
// if (!birthday.equals(substring)) {
// return rb.setMsg("选择的出生日期和身份证出生日期不符，请重新选择");
// }
// //查询部门和岗位是否为空
// if (dto.getSysStaffOrg() == null) {
// return rb.setMsg("员工部门信息不能为空");
// }
// if (dto.getSysStaffPost() == null) {
// return rb.setMsg("员工岗位信息不能为空");
// }
// Date joinCompnyDate = dto.getJoinCompnyDate();
// if (joinCompnyDate == null) {
// return rb.setMsg("员工入职日期不能为空");
// }
//添加员工基础信息
SysStaffinfo sysStaffinfo3 = new SysStaffinfo();
dto.fillEntity(sysStaffinfo3);
@ -271,76 +324,236 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
sysStaffinfo3.setPinYinName(PinYinUtils.getPinYinName(dto.getName()));
sysStaffinfo3.setFirstPinYinLabel(PinYinUtils.getCharDuoPinYinChar(dto.getName()));
//是否意外险参保
if (dto.getIsHaveInsurance() != null) {
//意外险参保：是
if (dto.getIsHaveInsurance() == 1) {
//意外险参保地以及意外险参保开始时间和结束时间不能为空
if (dto.getInsuranceStartDate() == null) {
return rb.setMsg("意外险参保时间不能为空");
}
if (dto.getInsuranceEndDate() == null) {
return rb.setMsg("意外险终止时间不能为空");
// if (dto.getIsHaveInsurance() != null) {
// //意外险参保：是
// if (dto.getIsHaveInsurance() == 1) {
// //意外险参保地以及意外险参保开始时间和结束时间不能为空
// if (dto.getInsuranceStartDate() == null) {
// return rb.setMsg("意外险参保时间不能为空");
// }
// if (dto.getInsuranceEndDate() == null) {
// return rb.setMsg("意外险终止时间不能为空");
// }
// if (StringUtils.isBlank(dto.getInsuranceAddr())) {
// return rb.setMsg("意外险参保地不能为空");
// }
// } else {
// sysStaffinfo3.setIsHaveInsurance(0);
// sysStaffinfo3.setInsuranceStartDate(null);
// sysStaffinfo3.setInsuranceEndDate(null);
// sysStaffinfo3.setInsuranceAddr(null);
// }
// }
// if ("01".equals(dto.getPersonTypeKey())) {
// if (dto.getQuitDate() == null) {
// return rb.setMsg("离职日期不能为空");
// }
// if (StringUtils.isBlank(dto.getQuitReason())) {
// return rb.setMsg("离职原因不能为空");
// }
// }
// //身份证(人像面)
// if (StringUtils.isNotBlank(sysStaffinfo3.getIdCardA())) {
// if (sysStaffinfo3.getIdCardA().contains(fileUploadComponent.getUrlPrefix())) {
// sysStaffinfo3.setIdCardA(sysStaffinfo3.getIdCardA().replace(fileUploadComponent.getUrlPrefix(), ""));
// }
// }
// //身份证(国徽面)
// if (StringUtils.isNotBlank(sysStaffinfo3.getIdCardB())) {
// if (sysStaffinfo3.getIdCardB().contains(fileUploadComponent.getUrlPrefix())) {
// sysStaffinfo3.setIdCardB(sysStaffinfo3.getIdCardB().replace(fileUploadComponent.getUrlPrefix(), ""));
// }
// }
// //学历证书diploma
// if (StringUtils.isNotBlank(sysStaffinfo3.getDiploma())) {
// if (sysStaffinfo3.getDiploma().contains(fileUploadComponent.getUrlPrefix())) {
// sysStaffinfo3.setDiploma(sysStaffinfo3.getDiploma().replace(fileUploadComponent.getUrlPrefix(), ""));
// }
// }
// //学位证书degreeCertificate
// if (StringUtils.isNotBlank(sysStaffinfo3.getDegreeCertificate())) {
// if (sysStaffinfo3.getDegreeCertificate().contains(fileUploadComponent.getUrlPrefix())) {
// sysStaffinfo3.setDegreeCertificate(sysStaffinfo3.getDegreeCertificate().replace(fileUploadComponent.getUrlPrefix(), ""));
// }
// }
// //前公司离职证明leaveCertificate
// if (StringUtils.isNotBlank(sysStaffinfo3.getLeaveCertificate())) {
// if (sysStaffinfo3.getLeaveCertificate().contains(fileUploadComponent.getUrlPrefix())) {
// sysStaffinfo3.setLeaveCertificate(sysStaffinfo3.getLeaveCertificate().replace(fileUploadComponent.getUrlPrefix(), ""));
// }
// }
// //员工照片
// if (StringUtils.isNotBlank(sysStaffinfo3.getPhoto())) {
// if (sysStaffinfo3.getPhoto().contains(fileUploadComponent.getUrlPrefix())) {
// sysStaffinfo3.setPhoto(sysStaffinfo3.getPhoto().replace(fileUploadComponent.getUrlPrefix(), ""));
// }
// }
//增加员工的关联的部门信息
SysStaffOrg sysStaffOrg = new SysStaffOrg();
SysStaffOrgDto sysStaffOrgDto = dto.getSysStaffOrg();
// if (StringUtils.isBlank(sysStaffOrgDto.getOrgName())) {
// return rb.setMsg("所在部门不能为空");
// }
sysStaffOrgDto.fillEntity(sysStaffOrg);
sysStaffOrg.setStaffSid(sysStaffinfo3.getSid());
sysStaffOrg.setManageType("3");
sysStaffOrgService.save(sysStaffOrg);
//增加员工的关联的岗位信息
SysStaffPost sysStaffPost = new SysStaffPost();
SysStaffPostDto sysStaffPostDto = dto.getSysStaffPost();
// if (StringUtils.isBlank(sysStaffPostDto.getPostSid())) {
// return rb.setMsg("岗位不能为空");
// }
save(sysStaffinfo3);
//添加用户信息
SysUser sysUser = new SysUser();
sysUser.setStaffSid(sysStaffinfo3.getSid());
sysUser.setUserName(jobNumber);
sysUser.setMobile(sysStaffinfo3.getMobile());
sysUser.setUserType(1);
String password = sysStaffinfo3.getMobile().substring(5, 11);
String md5 = Encodes.md5(password);
sysUser.setPassword(md5);
boolean isSave = sysUserService.save(sysUser);
sysStaffPostDto.fillEntity(sysStaffPost);
sysStaffPost.setStaffSid(sysStaffinfo3.getSid());
sysStaffPost.setStartDate(new Date());
sysStaffPostService.save(sysStaffPost);
if (!isSave) {
return rb.setMsg("添加员工信息失败");
}
if (StringUtils.isBlank(dto.getInsuranceAddr())) {
return rb.setMsg("意外险参保地不能为空");
SysUserRole sysUserRole = new SysUserRole();
sysUserRole.setUserSid(sysUser.getSid());
sysUserRole.setRoleSid(sysRoleVo.getSid());
sysUserRoleService.save(sysUserRole);
return rb.success().setMsg("添加员工信息成功");
}
public ResultBean saveStaffInfoNew(SysStaffinfoDto dto) {
ResultBean rb = ResultBean.fireFail();
SysRoleVo sysRoleVo = sysRoleService.fetchByName("试用期员工");
// if (sysRoleVo == null) {
// return rb.setMsg("缺少默认试用期员工角色");
// }
//员工类型
//String personTypeKey = dto.getPersonTypeKey();
String jobNumber = "";
SysStaffinfo sysStaffinfo = baseMapper.selectJobNumber();
if (sysStaffinfo == null) {
//无此员工类型的员工
jobNumber = addOne("0000");
} else {
sysStaffinfo3.setIsHaveInsurance(0);
sysStaffinfo3.setInsuranceStartDate(null);
sysStaffinfo3.setInsuranceEndDate(null);
sysStaffinfo3.setInsuranceAddr(null);
}
}
if ("01".equals(dto.getPersonTypeKey())) {
if (dto.getQuitDate() == null) {
return rb.setMsg("离职日期不能为空");
}
if (StringUtils.isBlank(dto.getQuitReason())) {
return rb.setMsg("离职原因不能为空");
}
}
//身份证(人像面)
if (StringUtils.isNotBlank(sysStaffinfo3.getIdCardA())) {
if (sysStaffinfo3.getIdCardA().contains(fileUploadComponent.getUrlPrefix())) {
sysStaffinfo3.setIdCardA(sysStaffinfo3.getIdCardA().replace(fileUploadComponent.getUrlPrefix(), ""));
}
}
//身份证(国徽面)
if (StringUtils.isNotBlank(sysStaffinfo3.getIdCardB())) {
if (sysStaffinfo3.getIdCardB().contains(fileUploadComponent.getUrlPrefix())) {
sysStaffinfo3.setIdCardB(sysStaffinfo3.getIdCardB().replace(fileUploadComponent.getUrlPrefix(), ""));
}
}
//学历证书diploma
if (StringUtils.isNotBlank(sysStaffinfo3.getDiploma())) {
if (sysStaffinfo3.getDiploma().contains(fileUploadComponent.getUrlPrefix())) {
sysStaffinfo3.setDiploma(sysStaffinfo3.getDiploma().replace(fileUploadComponent.getUrlPrefix(), ""));
}
}
//学位证书degreeCertificate
if (StringUtils.isNotBlank(sysStaffinfo3.getDegreeCertificate())) {
if (sysStaffinfo3.getDegreeCertificate().contains(fileUploadComponent.getUrlPrefix())) {
sysStaffinfo3.setDegreeCertificate(sysStaffinfo3.getDegreeCertificate().replace(fileUploadComponent.getUrlPrefix(), ""));
}
}
//前公司离职证明leaveCertificate
if (StringUtils.isNotBlank(sysStaffinfo3.getLeaveCertificate())) {
if (sysStaffinfo3.getLeaveCertificate().contains(fileUploadComponent.getUrlPrefix())) {
sysStaffinfo3.setLeaveCertificate(sysStaffinfo3.getLeaveCertificate().replace(fileUploadComponent.getUrlPrefix(), ""));
}
}
//员工照片
if (StringUtils.isNotBlank(sysStaffinfo3.getPhoto())) {
if (sysStaffinfo3.getPhoto().contains(fileUploadComponent.getUrlPrefix())) {
sysStaffinfo3.setPhoto(sysStaffinfo3.getPhoto().replace(fileUploadComponent.getUrlPrefix(), ""));
}
jobNumber = sysStaffinfo.getJobNumber();
jobNumber = addOne(jobNumber);
}
//查询员工的手机号是否重复
// SysStaffinfo sysStaffinfo1 = baseMapper.selectByMobile(dto.getMobile());
// SysUser sysUser1 = sysUserService.selectByMobile(dto.getMobile());
// if (sysStaffinfo1 != null || sysUser1 != null) {
// return rb.setMsg("已存在手机号为" + dto.getMobile() + "的员工");
// }
//查询是否存在该身份证号的员工
// SysStaffinfo sysStaffinfo2 = baseMapper.selectByIdNo(dto.getIdNo());
// if (sysStaffinfo2 != null) {
// return rb.setMsg("已存在身份证号为" + dto.getIdNo() + "的员工");
// }
//判断身份证号出生日期和填写的出生日期是否相同
String idNo = dto.getIdNo();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
String birthday = simpleDateFormat.format(dto.getBirthday());
String substring = idNo.substring(6, 14);
// if (!birthday.equals(substring)) {
// return rb.setMsg("选择的出生日期和身份证出生日期不符，请重新选择");
// }
// //查询部门和岗位是否为空
// if (dto.getSysStaffOrg() == null) {
// return rb.setMsg("员工部门信息不能为空");
// }
// if (dto.getSysStaffPost() == null) {
// return rb.setMsg("员工岗位信息不能为空");
// }
// Date joinCompnyDate = dto.getJoinCompnyDate();
// if (joinCompnyDate == null) {
// return rb.setMsg("员工入职日期不能为空");
// }
//添加员工基础信息
SysStaffinfo sysStaffinfo3 = new SysStaffinfo();
dto.fillEntity(sysStaffinfo3);
sysStaffinfo3.setJobNumber(jobNumber);
sysStaffinfo3.setPinYinName(PinYinUtils.getPinYinName(dto.getName()));
sysStaffinfo3.setFirstPinYinLabel(PinYinUtils.getCharDuoPinYinChar(dto.getName()));
//是否意外险参保
// if (dto.getIsHaveInsurance() != null) {
// //意外险参保：是
// if (dto.getIsHaveInsurance() == 1) {
// //意外险参保地以及意外险参保开始时间和结束时间不能为空
// if (dto.getInsuranceStartDate() == null) {
// return rb.setMsg("意外险参保时间不能为空");
// }
// if (dto.getInsuranceEndDate() == null) {
// return rb.setMsg("意外险终止时间不能为空");
// }
// if (StringUtils.isBlank(dto.getInsuranceAddr())) {
// return rb.setMsg("意外险参保地不能为空");
// }
// } else {
// sysStaffinfo3.setIsHaveInsurance(0);
// sysStaffinfo3.setInsuranceStartDate(null);
// sysStaffinfo3.setInsuranceEndDate(null);
// sysStaffinfo3.setInsuranceAddr(null);
// }
// }
// if ("01".equals(dto.getPersonTypeKey())) {
// if (dto.getQuitDate() == null) {
// return rb.setMsg("离职日期不能为空");
// }
// if (StringUtils.isBlank(dto.getQuitReason())) {
// return rb.setMsg("离职原因不能为空");
// }
// }
// //身份证(人像面)
// if (StringUtils.isNotBlank(sysStaffinfo3.getIdCardA())) {
// if (sysStaffinfo3.getIdCardA().contains(fileUploadComponent.getUrlPrefix())) {
// sysStaffinfo3.setIdCardA(sysStaffinfo3.getIdCardA().replace(fileUploadComponent.getUrlPrefix(), ""));
// }
// }
// //身份证(国徽面)
// if (StringUtils.isNotBlank(sysStaffinfo3.getIdCardB())) {
// if (sysStaffinfo3.getIdCardB().contains(fileUploadComponent.getUrlPrefix())) {
// sysStaffinfo3.setIdCardB(sysStaffinfo3.getIdCardB().replace(fileUploadComponent.getUrlPrefix(), ""));
// }
// }
// //学历证书diploma
// if (StringUtils.isNotBlank(sysStaffinfo3.getDiploma())) {
// if (sysStaffinfo3.getDiploma().contains(fileUploadComponent.getUrlPrefix())) {
// sysStaffinfo3.setDiploma(sysStaffinfo3.getDiploma().replace(fileUploadComponent.getUrlPrefix(), ""));
// }
// }
// //学位证书degreeCertificate
// if (StringUtils.isNotBlank(sysStaffinfo3.getDegreeCertificate())) {
// if (sysStaffinfo3.getDegreeCertificate().contains(fileUploadComponent.getUrlPrefix())) {
// sysStaffinfo3.setDegreeCertificate(sysStaffinfo3.getDegreeCertificate().replace(fileUploadComponent.getUrlPrefix(), ""));
// }
// }
// //前公司离职证明leaveCertificate
// if (StringUtils.isNotBlank(sysStaffinfo3.getLeaveCertificate())) {
// if (sysStaffinfo3.getLeaveCertificate().contains(fileUploadComponent.getUrlPrefix())) {
// sysStaffinfo3.setLeaveCertificate(sysStaffinfo3.getLeaveCertificate().replace(fileUploadComponent.getUrlPrefix(), ""));
// }
// }
// //员工照片
// if (StringUtils.isNotBlank(sysStaffinfo3.getPhoto())) {
// if (sysStaffinfo3.getPhoto().contains(fileUploadComponent.getUrlPrefix())) {
// sysStaffinfo3.setPhoto(sysStaffinfo3.getPhoto().replace(fileUploadComponent.getUrlPrefix(), ""));
// }
// }
//增加员工的关联的部门信息
SysStaffOrg sysStaffOrg = new SysStaffOrg();
SysStaffOrgDto sysStaffOrgDto = dto.getSysStaffOrg();
if (StringUtils.isBlank(sysStaffOrgDto.getOrgName())) {
return rb.setMsg("所在部门不能为空");
}
// if (StringUtils.isBlank(sysStaffOrgDto.getOrgName())) {
// return rb.setMsg("所在部门不能为空");
// }
sysStaffOrgDto.fillEntity(sysStaffOrg);
sysStaffOrg.setStaffSid(sysStaffinfo3.getSid());
sysStaffOrg.setManageType("3");
@ -348,9 +561,9 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
//增加员工的关联的岗位信息
SysStaffPost sysStaffPost = new SysStaffPost();
SysStaffPostDto sysStaffPostDto = dto.getSysStaffPost();
if (StringUtils.isBlank(sysStaffPostDto.getPostSid())) {
return rb.setMsg("岗位不能为空");
}
// if (StringUtils.isBlank(sysStaffPostDto.getPostSid())) {
// return rb.setMsg("岗位不能为空");
// }
save(sysStaffinfo3);
//添加用户信息
@ -377,7 +590,6 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
return rb.success().setMsg("添加员工信息成功");
}
/**
* 字符串+1方法，该方法将其结尾的整数+1,适用于任何以整数结尾的字符串,不限格式，不限分隔符。
*
@ -574,6 +786,168 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
return rb.success().setMsg("更新员工信息成功");
}
public ResultBean updateStaffInfoNew(SysStaffinfoDto dto, String sid) {
ResultBean rb = ResultBean.fireFail();
//查询该人员的组织机构list
List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgService.selectByStaffS(sid);
List<String> orgList = new ArrayList<>();
if (sysStaffOrgVos.size() > 0) {
for (SysStaffOrgVo vv : sysStaffOrgVos) {
String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid());
SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid);
if (sysOrganization != null) {
orgList.add(orgSid);
} else {
continue;
}
}
}
//根据员工sid查询员工的信息
SysStaffinfo sysStaffinfo = fetchBySid(sid);
// if (sysStaffinfo == null) {
// return rb.setMsg("此员工信息不存在");
// }
// //查询员工的手机号是否重复
// SysStaffinfo sysStaffinfo2 = baseMapper.selectByMobileAndSid(dto.getMobile(), sid);
// if (sysStaffinfo2 != null) {
// return rb.setMsg("已存在手机号为" + dto.getMobile() + "的员工");
// }
// //查询是否存在该身份证号的员工
// SysStaffinfo sysStaffinfo3 = baseMapper.selectByIdNoAndSid(dto.getIdNo(), sid);
// if (sysStaffinfo3 != null) {
// return rb.setMsg("已存在身份证号为" + dto.getIdNo() + "的员工");
// }
//更新员工基础信息
BeanUtil.copyProperties(dto, sysStaffinfo);
sysStaffinfo.setJobNumber(dto.getJobNumber());
sysStaffinfo.setPinYinName(PinYinUtils.getPinYinName(dto.getName()));
sysStaffinfo.setFirstPinYinLabel(PinYinUtils.getCharDuoPinYinChar(dto.getName()));
//是否意外险参保
// if (dto.getIsHaveInsurance() != null) {
// //意外险参保：是
// if (dto.getIsHaveInsurance() == 1) {
// //意外险参保地以及意外险参保开始时间和结束时间不能为空
// if (dto.getInsuranceStartDate() == null) {
// return rb.setMsg("意外险参保时间不能为空");
// }
// if (dto.getInsuranceEndDate() == null) {
// return rb.setMsg("意外险终止时间不能为空");
// }
// if (StringUtils.isBlank(dto.getInsuranceAddr())) {
// return rb.setMsg("意外险参保地不能为空");
// }
// } else {
// sysStaffinfo.setIsHaveInsurance(0);
// sysStaffinfo.setInsuranceStartDate(null);
// sysStaffinfo.setInsuranceEndDate(null);
// sysStaffinfo.setInsuranceAddr(null);
// }
// }
// if ("01".equals(dto.getPersonTypeKey())) {
// if (dto.getQuitDate() == null) {
// return rb.setMsg("离职日期不能为空");
// }
// if (StringUtils.isBlank(dto.getQuitReason())) {
// return rb.setMsg("离职原因不能为空");
// }
// }
// //身份证(人像面)
// if (StringUtils.isNotBlank(sysStaffinfo.getIdCardA())) {
// if (sysStaffinfo.getIdCardA().contains(fileUploadComponent.getUrlPrefix())) {
// sysStaffinfo.setIdCardA(sysStaffinfo.getIdCardA().replace(fileUploadComponent.getUrlPrefix(), ""));
// }
// }
// //身份证(国徽面)
// if (StringUtils.isNotBlank(sysStaffinfo.getIdCardB())) {
// if (sysStaffinfo.getIdCardB().contains(fileUploadComponent.getUrlPrefix())) {
// sysStaffinfo.setIdCardB(sysStaffinfo.getIdCardB().replace(fileUploadComponent.getUrlPrefix(), ""));
// }
// }
// //学历证书diploma
// if (StringUtils.isNotBlank(sysStaffinfo.getDiploma())) {
// if (sysStaffinfo.getDiploma().contains(fileUploadComponent.getUrlPrefix())) {
// sysStaffinfo.setDiploma(sysStaffinfo.getDiploma().replace(fileUploadComponent.getUrlPrefix(), ""));
// }
// }
// //学位证书degreeCertificate
// if (StringUtils.isNotBlank(sysStaffinfo.getDegreeCertificate())) {
// if (sysStaffinfo.getDegreeCertificate().contains(fileUploadComponent.getUrlPrefix())) {
// sysStaffinfo.setDegreeCertificate(sysStaffinfo.getDegreeCertificate().replace(fileUploadComponent.getUrlPrefix(), ""));
// }
// }
// //前公司离职证明leaveCertificate
// if (StringUtils.isNotBlank(sysStaffinfo.getLeaveCertificate())) {
// if (sysStaffinfo.getLeaveCertificate().contains(fileUploadComponent.getUrlPrefix())) {
// sysStaffinfo.setLeaveCertificate(sysStaffinfo.getLeaveCertificate().replace(fileUploadComponent.getUrlPrefix(), ""));
// }
// }
// //员工照片
// if (StringUtils.isNotBlank(sysStaffinfo.getPhoto())) {
// if (sysStaffinfo.getPhoto().contains(fileUploadComponent.getUrlPrefix())) {
// sysStaffinfo.setPhoto(sysStaffinfo.getPhoto().replace(fileUploadComponent.getUrlPrefix(), ""));
// }
// }
//更新用户信息
sysUserService.updateByStaffSid(dto.getJobNumber(), sysStaffinfo.getMobile(), sid);
//更新员工的关联的部门信息
SysStaffOrgDto sysStaffOrgDto = dto.getSysStaffOrg();
int count = sysStaffOrgService.selectByStaffAndOrg(sysStaffOrgDto.getOrgSidPath(), sid, "2");
if (count > 0) {
sysStaffOrgService.deleteByStaffSidAndType(sysStaffOrgDto.getOrgSidPath(), sid, "2");
}
SysStaffOrg sysStaffOrg = sysStaffOrgService.getOrgByStaffSidAndPath(sid,sysStaffOrgDto.getOrgSidPath());
if(sysStaffOrg == null){
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgService.selectAllByStaffSid(sid);
sysStaffOrg = staffOrgResultBean.getData();
if(sysStaffOrg == null){
sysStaffOrg = new SysStaffOrg();
sysStaffOrg.setStaffSid(sid);
BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg);
sysStaffOrg.setManageType("3");
sysStaffOrgService.insert(sysStaffOrg);
}else{
BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg);
sysStaffOrg.setManageType("3");
sysStaffOrgService.updateById(sysStaffOrg);
}
}else{
BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg);
sysStaffOrg.setManageType("3");
sysStaffOrgService.updateById(sysStaffOrg);
}
//更新员工的关联的岗位信息
SysStaffPostDetailsVo staffPostDetailsVo = sysStaffPostService.getPostByStaffSid(sid);
SysStaffPost sysStaffPost = sysStaffPostService.selectByStaffSid(sid, staffPostDetailsVo.getPostSid());
SysStaffPostDto sysStaffPostDto = dto.getSysStaffPost();
sysStaffPostService.updateBySid(sysStaffPostDto, sysStaffPost.getSid());
boolean isUpdate = updateById(sysStaffinfo);
if (!isUpdate) {
return rb.setMsg("更新员工信息失败");
}
List<SysStaffOrgVo> sysStaffOrgVos1 = sysStaffOrgService.selectByStaffS(sid);
List<String> orgList1 = new ArrayList<>();
if (sysStaffOrgVos1.size() > 0) {
for (SysStaffOrgVo vv : sysStaffOrgVos1) {
String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid());
SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid);
if (sysOrganization != null) {
orgList1.add(orgSid);
} else {
continue;
}
}
}
List<String> reduce1 = orgList.stream().filter(item -> !orgList1.contains(item)).collect(toList());
if (reduce1.size() > 0) {
//根据staffSid查询token
String token = sysUserService.selectByStaffsid(sid).getToken();
//清空该token
redisUtil.remove(token);
}
return rb.success().setMsg("更新员工信息成功");
}
/**
* 根据员工sid查询员工信息
*

21
yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java
View File

@ -115,16 +115,17 @@ public class SysUserRest implements SysUserFeign {
if (userType == 0) {
return new ResultBean<SysUserVo>().fail().setMsg("用户类型不能为空");
}
if (StringUtils.isBlank(verificationCode)) {
return new ResultBean<SysUserVo>().fail().setMsg("验证码不能为空");
} else {
Map<String, Object> stringObjectMap = sysUserService.mobileValidateRegister(mobile, verificationCode);
String code = stringObjectMap.get("code").toString();
String details = stringObjectMap.get("details").toString();
if (Tools.CODE_FAIL.equals(code)) {
return ResultBean.fireFail().setMessage(details).setMsg(details);
}
}
//取消验证码
// if (StringUtils.isBlank(verificationCode)) {
// return new ResultBean<SysUserVo>().fail().setMsg("验证码不能为空");
// } else {
// Map<String, Object> stringObjectMap = sysUserService.mobileValidateRegister(mobile, verificationCode);
// String code = stringObjectMap.get("code").toString();
// String details = stringObjectMap.get("details").toString();
// if (Tools.CODE_FAIL.equals(code)) {
// return ResultBean.fireFail().setMessage(details).setMsg(details);
// }
// }
//"15097329653";
String password = mobile.substring(5, 11);
String md5 = Encodes.md5(password);

Write Preview
Loading…
Cancel
Save