Commit 584294f8 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.7' into MVP1.7.7

parents 6fcb0d3d eaf7652d
...@@ -78,7 +78,7 @@ public class EmployeeRegistration extends BaseEntity { ...@@ -78,7 +78,7 @@ public class EmployeeRegistration extends BaseEntity {
@Schema(description = "客服手机号") @Schema(description = "客服手机号")
private String customerPhone; private String customerPhone;
@Schema(description = "客服姓名") @Schema(description = "客服姓名")
private String customerUsername; private String customerUsername;
......
...@@ -298,16 +298,17 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -298,16 +298,17 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
} }
//点击“接收确认”的时候,监测到该人员该项目下已有在项的档案时,再次提醒:该人员已在项, //点击“接收确认”的时候,监测到该人员该项目下已有在项的档案时,再次提醒:该人员已在项,
//状态将更新成“已处理”;处理记录中,针对此情况,记录真实的进项时间,备注:先于登记入项 //状态将更新成“已处理”;处理记录中,针对此情况,记录真实的进项时间,备注:先于登记入项
if (CommonConstants.ONE_STRING.equals(registration.getFeedbackType())) { if (CommonConstants.ONE_STRING.equals(registrationNow.getFeedbackType())) {
EmpProjectStatusVo vo = new EmpProjectStatusVo(); EmpProjectStatusVo vo = new EmpProjectStatusVo();
vo.setEmpIdcard(registration.getEmpIdcard()); vo.setEmpIdcard(registrationNow.getEmpIdcard());
vo.setDeptNo(registration.getDeptNo()); vo.setDeptNo(registrationNow.getDeptNo());
EmpProjectStatusVo exit = getEmpProjectStatus(vo); EmpProjectStatusVo exit = getEmpProjectStatus(vo);
if (Common.isNotNull(exit)) { if (Common.isNotNull(exit)) {
return R.ok(CommonConstants.ONE_STRING); return R.ok(CommonConstants.ONE_STRING);
} }
} }
baseMapper.updateById(registration); registrationNow.setProcessStatus(CommonConstants.ZERO_STRING);
baseMapper.updateById(registrationNow);
return R.ok(); return R.ok();
} }
...@@ -316,7 +317,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -316,7 +317,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if (Common.isEmpty(registrationNow) || !CommonConstants.ONE_STRING.equals(registrationNow.getProcessStatus())) { if (Common.isEmpty(registrationNow) || !CommonConstants.ONE_STRING.equals(registrationNow.getProcessStatus())) {
return R.failed(RegistConstants.NO_DATA_TO_HANDLE); return R.failed(RegistConstants.NO_DATA_TO_HANDLE);
} }
baseMapper.updateById(registration); registrationNow.setProcessStatus(CommonConstants.ZERO_STRING);
baseMapper.updateById(registrationNow);
return R.ok(); return R.ok();
} }
......
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