Commit 3c7592cb authored by huyuchen's avatar huyuchen

huych-入职登记提交

parent 3c1da978
...@@ -77,7 +77,7 @@ public class EmployeeRegistrationHrExportVo implements Serializable { ...@@ -77,7 +77,7 @@ public class EmployeeRegistrationHrExportVo implements Serializable {
private Date createTime; private Date createTime;
@ExcelAttribute(name = "处理状态") @ExcelAttribute(name = "处理状态")
@Schema(description = "处理状态,0已接收,1未处理,2已处理") @Schema(description = "处理状态,0已接收,1未处理,2已处理,3拒绝入职")
@ExcelProperty("处理状态") @ExcelProperty("处理状态")
private String processStatus; private String processStatus;
......
...@@ -675,11 +675,15 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -675,11 +675,15 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
? RegistConstants.BEFORE_IN_PROJECT : RegistConstants.BEFORE_OUT_PROJECT); ? RegistConstants.BEFORE_IN_PROJECT : RegistConstants.BEFORE_OUT_PROJECT);
SysCspDeptVo vo = new SysCspDeptVo(); SysCspDeptVo vo = new SysCspDeptVo();
if (CommonConstants.ONE_STRING.equals(registrationNow.getFeedbackType())) { if (CommonConstants.ONE_STRING.equals(registrationNow.getFeedbackType())) {
if (Common.isNotNull(registrationNow.getEmpDeptid())) {
vo.setDepartName(registrationNow.getEmpDeptname()); vo.setDepartName(registrationNow.getEmpDeptname());
vo.setDepartId(Long.valueOf(registrationNow.getEmpDeptid())); vo.setDepartId(Long.valueOf(registrationNow.getEmpDeptid()));
archivesDaprUtil.saveOrDeleteDeptRelation(vo);
} }
} else {
vo.setProjectId(registration.getEmpProjectId()); vo.setProjectId(registration.getEmpProjectId());
archivesDaprUtil.saveOrDeleteDeptRelation(vo); archivesDaprUtil.saveOrDeleteDeptRelation(vo);
}
baseMapper.updateById(registrationNow); baseMapper.updateById(registrationNow);
return R.ok(); return R.ok();
} }
......
...@@ -293,7 +293,7 @@ ...@@ -293,7 +293,7 @@
a.position, a.position,
if(a.feedback_type = '1','入职','离职') feedback_type, if(a.feedback_type = '1','入职','离职') feedback_type,
a.join_leave_date, a.join_leave_date,
if(a.process_status= '0','已接收',if(a.process_status= '1','待处理','已处理')) process_status, if(a.process_status= '0','已接收',if(a.process_status= '1','待处理',,if(a.process_status= '2','已处理','拒绝入职'))) process_status,
a.registor_username, a.registor_username,
a.emp_deptname, a.emp_deptname,
a.create_time a.create_time
......
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