Commit 886438fb authored by hongguangwu's avatar hongguangwu

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

parents 298fd652 42dec84f
package com.yifu.cloud.plus.v1.csp.vo; package com.yifu.cloud.plus.v1.csp.vo;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
...@@ -52,6 +53,7 @@ public class EmployeeRegistrationExportVo implements Serializable { ...@@ -52,6 +53,7 @@ public class EmployeeRegistrationExportVo implements Serializable {
@ExcelAttribute(name = "入/离职日期", isDate = true) @ExcelAttribute(name = "入/离职日期", isDate = true)
@Schema(description = "入/离职日期") @Schema(description = "入/离职日期")
@ExcelProperty("入/离职日期") @ExcelProperty("入/离职日期")
@DateTimeFormat("yyyy-MM-dd")
private Date joinLeaveDate; private Date joinLeaveDate;
@ExcelAttribute(name = "登记人") @ExcelAttribute(name = "登记人")
......
package com.yifu.cloud.plus.v1.csp.vo; package com.yifu.cloud.plus.v1.csp.vo;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
...@@ -62,6 +63,7 @@ public class EmployeeRegistrationHrExportVo implements Serializable { ...@@ -62,6 +63,7 @@ public class EmployeeRegistrationHrExportVo implements Serializable {
@ExcelAttribute(name = "入/离职日期", isDate = true) @ExcelAttribute(name = "入/离职日期", isDate = true)
@Schema(description = "入/离职日期") @Schema(description = "入/离职日期")
@ExcelProperty("入/离职日期") @ExcelProperty("入/离职日期")
@DateTimeFormat("yyyy-MM-dd")
private Date joinLeaveDate; private Date joinLeaveDate;
@ExcelAttribute(name = "登记人") @ExcelAttribute(name = "登记人")
......
...@@ -24,8 +24,8 @@ public class EmployeeRegistrationVo extends RowIndex implements Serializable { ...@@ -24,8 +24,8 @@ public class EmployeeRegistrationVo extends RowIndex implements Serializable {
* 员工姓名 * 员工姓名
*/ */
@NotBlank(message = "员工姓名 不能为空") @NotBlank(message = "员工姓名 不能为空")
@Length(max = 50, message = "员工姓名 不能超过50个字符") @Length(max = 20, message = "员工姓名 不能超过20个字符")
@ExcelAttribute(name = "员工姓名", isNotEmpty = true, errorInfo = "员工姓名不能为空", maxLength = 50) @ExcelAttribute(name = "员工姓名", isNotEmpty = true, errorInfo = "员工姓名不能为空", maxLength = 20)
@Schema(description = "员工姓名") @Schema(description = "员工姓名")
@ExcelProperty("员工姓名") @ExcelProperty("员工姓名")
private String employeeName; private String employeeName;
......
...@@ -369,9 +369,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -369,9 +369,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
return R.failed(RegistConstants.NO_DATA_TO_HANDLE); return R.failed(RegistConstants.NO_DATA_TO_HANDLE);
} }
registrationNow.setProcessStatus(CommonConstants.ZERO_STRING); registrationNow.setProcessStatus(CommonConstants.ZERO_STRING);
baseMapper.updateById(registrationNow);
logService.saveLog(registration.getId(), CommonConstants.ZERO_STRING,RegistConstants.CONFIRM_SUBMIT, registration.getProjectCreateTime(), logService.saveLog(registration.getId(), CommonConstants.ZERO_STRING,RegistConstants.CONFIRM_SUBMIT, registration.getProjectCreateTime(),
registration.getRegistorUsername(),RegistConstants.BEFORE_IN_PROJECT); registrationNow.getRegistorUsername(),RegistConstants.BEFORE_IN_PROJECT);
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