Commit a741fa42 authored by huyuchen's avatar huyuchen

huych-入离职登记提交

parent 376a886b
...@@ -19,4 +19,10 @@ public class RegistConstants { ...@@ -19,4 +19,10 @@ public class RegistConstants {
public static final String EMP_PROJECT_EXIT_CHECK = "未找到该人员对应的在项信息!"; public static final String EMP_PROJECT_EXIT_CHECK = "未找到该人员对应的在项信息!";
public static final String CONFIRM_SUBMIT = "确认接收";
public static final String BEFORE_IN_PROJECT = "先于登记入项";
public static final String MESSAGE_REGIST = "信息登记";
} }
...@@ -9,6 +9,7 @@ import io.swagger.v3.oas.annotations.media.Schema; ...@@ -9,6 +9,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
/** /**
...@@ -81,6 +82,9 @@ public class EmployeeRegistration extends BaseEntity { ...@@ -81,6 +82,9 @@ public class EmployeeRegistration extends BaseEntity {
@Schema(description = "客服姓名") @Schema(description = "客服姓名")
private String customerUsername; private String customerUsername;
@Schema(description = "客服姓名")
private LocalDateTime projectCreateTime;
} }
...@@ -8,6 +8,7 @@ import lombok.Data; ...@@ -8,6 +8,7 @@ import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* 入离职登记表 * 入离职登记表
...@@ -62,4 +63,12 @@ public class EmployeeRegistrationSearchVo extends EmployeeRegistration { ...@@ -62,4 +63,12 @@ public class EmployeeRegistrationSearchVo extends EmployeeRegistration {
@TableField(exist = false) @TableField(exist = false)
private Date joinTimeEnd; private Date joinTimeEnd;
@Schema(description = "就职岗位数组")
@TableField(exist = false)
private List<String> postList;
@Schema(description = "处理状态数组")
@TableField(exist = false)
private List<String> statusList;
} }
...@@ -24,7 +24,7 @@ public class EmployeeRegistrationVo extends RowIndex implements Serializable { ...@@ -24,7 +24,7 @@ public class EmployeeRegistrationVo extends RowIndex implements Serializable {
* 员工姓名 * 员工姓名
*/ */
@NotBlank(message = "员工姓名 不能为空") @NotBlank(message = "员工姓名 不能为空")
@Length(max = 50, message = "员工姓名 不能超过50 个字符") @Length(max = 50, message = "员工姓名 不能超过50个字符")
@ExcelAttribute(name = "员工姓名", isNotEmpty = true, errorInfo = "员工姓名不能为空", maxLength = 50) @ExcelAttribute(name = "员工姓名", isNotEmpty = true, errorInfo = "员工姓名不能为空", maxLength = 50)
@Schema(description = "员工姓名") @Schema(description = "员工姓名")
@ExcelProperty("员工姓名") @ExcelProperty("员工姓名")
...@@ -34,7 +34,7 @@ public class EmployeeRegistrationVo extends RowIndex implements Serializable { ...@@ -34,7 +34,7 @@ public class EmployeeRegistrationVo extends RowIndex implements Serializable {
* 身份证号 * 身份证号
*/ */
@NotBlank(message = "身份证号不能为空") @NotBlank(message = "身份证号不能为空")
@Length(max = 18, message = "身份证号不能超过18 个字符") @Length(max = 18, message = "身份证号不能超过18个字符")
@ExcelAttribute(name = "身份证号", isNotEmpty = true, errorInfo = "身份证号不能为空", maxLength = 18) @ExcelAttribute(name = "身份证号", isNotEmpty = true, errorInfo = "身份证号不能为空", maxLength = 18)
@Schema(description = "身份证号") @Schema(description = "身份证号")
@ExcelProperty("身份证号") @ExcelProperty("身份证号")
...@@ -44,7 +44,7 @@ public class EmployeeRegistrationVo extends RowIndex implements Serializable { ...@@ -44,7 +44,7 @@ public class EmployeeRegistrationVo extends RowIndex implements Serializable {
* 员工手机号 * 员工手机号
*/ */
@NotBlank(message = "员工手机号 不能为空") @NotBlank(message = "员工手机号 不能为空")
@Length(max = 11, message = "员工手机号不能超过11 个字符") @Length(max = 11, message = "员工手机号不能超过11个字符")
@ExcelAttribute(name = "员工手机号", isNotEmpty = true, errorInfo = "员工手机号不能为空", maxLength = 11) @ExcelAttribute(name = "员工手机号", isNotEmpty = true, errorInfo = "员工手机号不能为空", maxLength = 11)
@Schema(description = "员工手机号") @Schema(description = "员工手机号")
@ExcelProperty("员工手机号") @ExcelProperty("员工手机号")
...@@ -62,7 +62,7 @@ public class EmployeeRegistrationVo extends RowIndex implements Serializable { ...@@ -62,7 +62,7 @@ public class EmployeeRegistrationVo extends RowIndex implements Serializable {
/** /**
* 反馈类型 1入职 2离职 * 反馈类型 1入职 2离职
*/ */
@ExcelAttribute(name = "反馈类型") @ExcelAttribute(name = "反馈类型", readConverterExp = "1=入职,2=离职")
@Schema(description = "反馈类型") @Schema(description = "反馈类型")
@ExcelProperty("反馈类型") @ExcelProperty("反馈类型")
private String feedbackType; private String feedbackType;
......
...@@ -86,7 +86,7 @@ public class EmployeeRegistrationController { ...@@ -86,7 +86,7 @@ public class EmployeeRegistrationController {
} }
/** /**
* 修改入离职登记表 * 入离职登记表确认接收
* *
* @param employeeRegistration 入离职登记表 * @param employeeRegistration 入离职登记表
* @return R * @return R
......
...@@ -16,6 +16,7 @@ import com.yifu.cloud.plus.v1.csp.constants.RegistConstants; ...@@ -16,6 +16,7 @@ import com.yifu.cloud.plus.v1.csp.constants.RegistConstants;
import com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration; import com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration;
import com.yifu.cloud.plus.v1.csp.mapper.EmployeeRegistrationMapper; import com.yifu.cloud.plus.v1.csp.mapper.EmployeeRegistrationMapper;
import com.yifu.cloud.plus.v1.csp.service.EmployeeRegistrationService; import com.yifu.cloud.plus.v1.csp.service.EmployeeRegistrationService;
import com.yifu.cloud.plus.v1.csp.service.TOperationLogService;
import com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationExportVo; import com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationExportVo;
import com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationHrExportVo; import com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationHrExportVo;
import com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationSearchVo; import com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationSearchVo;
...@@ -41,6 +42,7 @@ import javax.servlet.ServletOutputStream; ...@@ -41,6 +42,7 @@ import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.InputStream; import java.io.InputStream;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -67,6 +69,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -67,6 +69,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
@Autowired @Autowired
private ArchivesDaprUtil archivesDaprUtil; private ArchivesDaprUtil archivesDaprUtil;
private final TOperationLogService logService;
/** /**
* 入离职登记表简单分页查询 * 入离职登记表简单分页查询
* *
...@@ -241,11 +245,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -241,11 +245,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
private void importEmployeeRegistration(List<EmployeeRegistrationVo> excelVOList, private void importEmployeeRegistration(List<EmployeeRegistrationVo> excelVOList,
List<ErrorMessage> errorMessageList,YifuUser user,TSettleDomainSelectVo selectVo) { List<ErrorMessage> errorMessageList,YifuUser user,TSettleDomainSelectVo selectVo) {
List<EmployeeRegistration> successList = new ArrayList<>(); List<EmployeeRegistration> successList = new ArrayList<>();
Map<String, String> exitMap = new HashMap<>(); Map<String, String> exitMap = new HashMap<>();
EmployeeRegistrationVo excel;
for (int i = 0; i < excelVOList.size(); i++) { for (int i = 0; i < excelVOList.size(); i++) {
EmployeeRegistrationVo excel = excelVOList.get(i); excel = excelVOList.get(i);
// 插入 // 插入
EmployeeRegistration insert = new EmployeeRegistration(); EmployeeRegistration insert = new EmployeeRegistration();
BeanUtil.copyProperties(excel, insert); BeanUtil.copyProperties(excel, insert);
...@@ -270,7 +274,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -270,7 +274,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
} }
initRegistInfo(insert,user, selectVo); initRegistInfo(insert,user, selectVo);
successList.add(insert); successList.add(insert);
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_SUCCESS));
} }
// 执行数据插入操作 组装 // 执行数据插入操作 组装
if (!successList.isEmpty()) { if (!successList.isEmpty()) {
...@@ -288,6 +291,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -288,6 +291,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
} else { } else {
baseMapper.insert(registration); baseMapper.insert(registration);
} }
//操作记录
logService.saveLog(registration.getId(), CommonConstants.ZERO_STRING,RegistConstants.MESSAGE_REGIST, LocalDateTime.now(),
registration.getRegistorUsername(),null);
return R.ok(); return R.ok();
} }
...@@ -304,11 +310,13 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -304,11 +310,13 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
vo.setDeptNo(registrationNow.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(registration.getProjectCreateTime());
} }
} }
registrationNow.setProcessStatus(CommonConstants.ZERO_STRING); registrationNow.setProcessStatus(CommonConstants.ZERO_STRING);
baseMapper.updateById(registrationNow); baseMapper.updateById(registrationNow);
logService.saveLog(registration.getId(), CommonConstants.ZERO_STRING,RegistConstants.CONFIRM_SUBMIT, LocalDateTime.now(),
registration.getRegistorUsername(),null);
return R.ok(); return R.ok();
} }
...@@ -319,6 +327,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -319,6 +327,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
} }
registrationNow.setProcessStatus(CommonConstants.ZERO_STRING); registrationNow.setProcessStatus(CommonConstants.ZERO_STRING);
baseMapper.updateById(registrationNow); baseMapper.updateById(registrationNow);
logService.saveLog(registration.getId(), CommonConstants.ZERO_STRING,RegistConstants.CONFIRM_SUBMIT, registration.getProjectCreateTime(),
registration.getRegistorUsername(),RegistConstants.BEFORE_IN_PROJECT);
return R.ok(); return R.ok();
} }
......
...@@ -100,9 +100,12 @@ ...@@ -100,9 +100,12 @@
<if test="employeeRegistration.empPhone != null and employeeRegistration.empPhone.trim() != ''"> <if test="employeeRegistration.empPhone != null and employeeRegistration.empPhone.trim() != ''">
AND a.emp_phone like CONCAT(#{employeeRegistration.empPhone},'%') AND a.emp_phone like CONCAT(#{employeeRegistration.empPhone},'%')
</if> </if>
<if test="employeeRegistration.position != null and employeeRegistration.position.trim() != ''"> <if test="employeeRegistration.postList != null">
AND a.position = #{employeeRegistration.position} AND a.position in
</if> <foreach item="item" index="index" collection="employeeRegistration.postList" open="(" separator="," close=")">
'${item}'
</foreach>
</if>
<if test="employeeRegistration.feedbackType != null and employeeRegistration.feedbackType.trim() != ''"> <if test="employeeRegistration.feedbackType != null and employeeRegistration.feedbackType.trim() != ''">
AND a.feedback_type = #{employeeRegistration.feedbackType} AND a.feedback_type = #{employeeRegistration.feedbackType}
</if> </if>
...@@ -121,14 +124,17 @@ ...@@ -121,14 +124,17 @@
<if test="employeeRegistration.joinLeaveDate != null"> <if test="employeeRegistration.joinLeaveDate != null">
AND a.join_leave_date = #{employeeRegistration.joinLeaveDate} AND a.join_leave_date = #{employeeRegistration.joinLeaveDate}
</if> </if>
<if test="employeeRegistration.processStatus != null and employeeRegistration.processStatus.trim() != ''"> <if test="employeeRegistration.statusList != null">
AND a.process_status = #{employeeRegistration.processStatus} AND a.process_status in
<foreach item="item" index="index" collection="employeeRegistration.statusList" open="(" separator="," close=")">
'${item}'
</foreach>
</if> </if>
<if test="employeeRegistration.registorUsername != null and employeeRegistration.registorUsername.trim() != ''"> <if test="employeeRegistration.registorUsername != null and employeeRegistration.registorUsername.trim() != ''">
AND a.registor_username = #{employeeRegistration.registorUsername} AND a.registor_username = #{employeeRegistration.registorUsername}
</if> </if>
<if test="employeeRegistration.registorDeptname != null and employeeRegistration.registorDeptname.trim() != ''"> <if test="employeeRegistration.registorDeptname != null and employeeRegistration.registorDeptname.trim() != ''">
AND a.registor_deptname like CONCAT(#{employeeRegistration.registorDeptname},'%') AND a.registor_deptname like CONCAT(#{employeeRegistration.registorDeptname},'%')
</if> </if>
<if test="employeeRegistration.registorDeptid != null and employeeRegistration.registorDeptid.trim() != ''"> <if test="employeeRegistration.registorDeptid != null and employeeRegistration.registorDeptid.trim() != ''">
AND a.registor_deptid = #{employeeRegistration.registorDeptid} AND a.registor_deptid = #{employeeRegistration.registorDeptid}
......
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