Commit 872df294 authored by huyuchen's avatar huyuchen

优化修改

parent 7c8d096d
...@@ -91,12 +91,12 @@ public class TVacationInfo implements Serializable { ...@@ -91,12 +91,12 @@ public class TVacationInfo implements Serializable {
/** /**
* 创建人id * 创建人id
*/ */
private Integer createUserId; private String createUserId;
/** /**
* 更新人id * 更新人id
*/ */
private Integer updateUserId; private String updateUserId;
/** /**
* 假勤状态 0待休 1休假中 2到期待销假 3已销假 * 假勤状态 0待休 1休假中 2到期待销假 3已销假
......
...@@ -46,7 +46,7 @@ public class TVacationMonitorClearLog extends Model<TVacationMonitorClearLog> { ...@@ -46,7 +46,7 @@ public class TVacationMonitorClearLog extends Model<TVacationMonitorClearLog> {
/** /**
* 清零人id * 清零人id
*/ */
private Integer clearUserId; private String clearUserId;
/** /**
* 清零时间 * 清零时间
......
...@@ -130,7 +130,7 @@ implements TVacationInfoService { ...@@ -130,7 +130,7 @@ implements TVacationInfoService {
entity.setVacationNote(dto.getVacationNote()); entity.setVacationNote(dto.getVacationNote());
entity.setActuralVacationEndTime(dto.getActuralVacationEndTime()); entity.setActuralVacationEndTime(dto.getActuralVacationEndTime());
entity.setUpdateUser(user.getNickname()); entity.setUpdateUser(user.getNickname());
entity.setUpdateUserId(Integer.valueOf(user.getId())); entity.setUpdateUserId(user.getId());
entity.setUpdateTime(LocalDateTime.now()); entity.setUpdateTime(LocalDateTime.now());
boolean isSuccess = this.updateById(entity); boolean isSuccess = this.updateById(entity);
return R.ok(isSuccess,CommonConstants.RESULT_DATA_SUCESS); return R.ok(isSuccess,CommonConstants.RESULT_DATA_SUCESS);
...@@ -239,7 +239,7 @@ implements TVacationInfoService { ...@@ -239,7 +239,7 @@ implements TVacationInfoService {
LocalDate vacationStart = dto.getVacationStartTime(); LocalDate vacationStart = dto.getVacationStartTime();
BeanUtil.copyProperties(dto, entity, CopyOptions.create().setIgnoreNullValue(true).setIgnoreProperties("vacationEndTime", "vacationStartTime")); BeanUtil.copyProperties(dto, entity, CopyOptions.create().setIgnoreNullValue(true).setIgnoreProperties("vacationEndTime", "vacationStartTime"));
entity.setCreateUser(user.getNickname()); entity.setCreateUser(user.getNickname());
entity.setCreateUserId(Integer.valueOf(user.getId())); entity.setCreateUserId(user.getId());
entity.setBusinessPost(businessEmployeeExtend.getBusinessPost()); entity.setBusinessPost(businessEmployeeExtend.getBusinessPost());
entity.setEmpName(businessEmployeeExtend.getEmpName()); entity.setEmpName(businessEmployeeExtend.getEmpName());
entity.setEmpIdcard(businessEmployeeExtend.getEmpIdcard()); entity.setEmpIdcard(businessEmployeeExtend.getEmpIdcard());
...@@ -351,7 +351,7 @@ implements TVacationInfoService { ...@@ -351,7 +351,7 @@ implements TVacationInfoService {
TVacationInfo entity = new TVacationInfo(); TVacationInfo entity = new TVacationInfo();
BeanUtil.copyProperties(dto, entity); BeanUtil.copyProperties(dto, entity);
entity.setCreateUser(user.getNickname()); entity.setCreateUser(user.getNickname());
entity.setCreateUserId(Integer.valueOf(user.getId())); entity.setCreateUserId(user.getId());
entity.setCreateTime(LocalDateTime.now()); entity.setCreateTime(LocalDateTime.now());
if (StringUtils.equals(BusinessCommonContants.YEAR_VACATION_VALUE, entity.getVacationType())) { if (StringUtils.equals(BusinessCommonContants.YEAR_VACATION_VALUE, entity.getVacationType())) {
String vacationYear = String.valueOf(dto.getVacationStartTime().getYear()); String vacationYear = String.valueOf(dto.getVacationStartTime().getYear());
......
...@@ -90,7 +90,7 @@ implements TVacationMonitorClearLogService { ...@@ -90,7 +90,7 @@ implements TVacationMonitorClearLogService {
log.setVacationYear(vacationMonitor.getVacationYear()); log.setVacationYear(vacationMonitor.getVacationYear());
log.setClearDuration(vacationMonitor.getNotUsedVacationDuration()); log.setClearDuration(vacationMonitor.getNotUsedVacationDuration());
log.setClearUser(user.getNickname()); log.setClearUser(user.getNickname());
log.setClearUserId(Integer.valueOf(user.getId())); log.setClearUserId(user.getId());
log.setClearTime(LocalDateTime.now()); log.setClearTime(LocalDateTime.now());
boolean isSuccess = this.save(log); boolean isSuccess = this.save(log);
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<result property="clearDuration" column="CLEAR_DURATION" jdbcType="DECIMAL"/> <result property="clearDuration" column="CLEAR_DURATION" jdbcType="DECIMAL"/>
<result property="vacationYear" column="VACATION_YEAR" jdbcType="CHAR"/> <result property="vacationYear" column="VACATION_YEAR" jdbcType="CHAR"/>
<result property="clearUser" column="CLEAR_USER" jdbcType="VARCHAR"/> <result property="clearUser" column="CLEAR_USER" jdbcType="VARCHAR"/>
<result property="clearUserId" column="CLEAR_USER_ID" jdbcType="INTEGER"/> <result property="clearUserId" column="CLEAR_USER_ID" jdbcType="VARCHAR"/>
<result property="clearTime" column="CLEAR_TIME" jdbcType="TIMESTAMP"/> <result property="clearTime" column="CLEAR_TIME" jdbcType="TIMESTAMP"/>
<result property="vacationMonitorId" column="VACATION_MONITOR_ID" jdbcType="INTEGER"/> <result property="vacationMonitorId" column="VACATION_MONITOR_ID" jdbcType="INTEGER"/>
</resultMap> </resultMap>
......
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