Commit 1f0a60ad authored by hongguangwu's avatar hongguangwu

人员档案相关-删除接口优化

parent 551fdbd9
......@@ -258,31 +258,31 @@ public class TEmployeeInfo extends BaseEntity {
/**
* 员工合同状态(字典)
*/
@Schema(description = "员工合同状态(字典)")
@Schema(description = "员工合同状态(字典)0初始状态")
private Integer contractStatus;
/**
* 商险状态(字典)
*/
@Schema(description = "商险状态(字典)")
@Schema(description = "商险状态(字典)0初始状态")
private Integer insuranceStatus;
/**
* 社保状态(字典)
*/
@Schema(description = "社保状态(字典)")
@Schema(description = "社保状态(字典)0初始状态")
private Integer socialStatus;
/**
* 公积金状态(字典)
* 公积金状态(字典)0初始状态
*/
@Schema(description = "公积金状态(字典)")
@Schema(description = "公积金状态(字典)0初始状态")
private Integer fundStatus;
/**
* 近3个月发薪(0否;1是
* 近3个月发薪(0无;1是;2否
*/
@Schema(description = "近3个月发薪(0否;1是)")
@Schema(description = "近3个月发薪(0无;1是;2否)")
private Integer salaryStatus;
/**
......
......@@ -279,7 +279,7 @@ public class TEmployeeInfoController {
* @Date: 2022/6/23 17:40
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
@Operation(summary = "档案复档", description = "档案复档 projectIds:项目档案ids")
@Operation(summary = "档案复档temployeeinfo_restore", description = "档案复档 projectIds:项目档案ids")
@SysLog("档案复档")
@GetMapping("/restoreEmployee")
@PreAuthorize("@pms.hasPermission('temployeeinfo_restore')")
......
......@@ -892,6 +892,12 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
employeeInfo.setFileStatus(CommonConstants.ZERO_INT);
employeeInfo.setProjectNum(CommonConstants.ONE_INT);
employeeInfo.setDeleteFlag(CommonConstants.STATUS_NORMAL);
employeeInfo.setContractStatus(CommonConstants.ZERO_INT);
employeeInfo.setInsuranceStatus(CommonConstants.ZERO_INT);
employeeInfo.setSocialStatus(CommonConstants.ZERO_INT);
employeeInfo.setFundStatus(CommonConstants.ZERO_INT);
employeeInfo.setSalaryStatus(CommonConstants.ZERO_INT);
// 生成性别年龄等:
this.setBaseSexInfo(employeeInfo);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment