Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
872df294
Commit
872df294
authored
Jan 13, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化修改
parent
7c8d096d
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
8 deletions
+8
-8
TVacationInfo.java
...cloud/plus/v1/business/entity/vacation/TVacationInfo.java
+2
-2
TVacationMonitorClearLog.java
...v1/business/entity/vacation/TVacationMonitorClearLog.java
+1
-1
TVacationInfoServiceImpl.java
...iness/service/vacation/impl/TVacationInfoServiceImpl.java
+3
-3
TVacationMonitorClearLogServiceImpl.java
...ce/vacation/impl/TVacationMonitorClearLogServiceImpl.java
+1
-1
TVacationMonitorClearLogMapper.xml
.../main/resources/mapper/TVacationMonitorClearLogMapper.xml
+1
-1
No files found.
yifu-business/yifu-business-api/src/main/java/com/yifu/cloud/plus/v1/business/entity/vacation/TVacationInfo.java
View file @
872df294
...
...
@@ -91,12 +91,12 @@ public class TVacationInfo implements Serializable {
/**
* 创建人id
*/
private
Integer
createUserId
;
private
String
createUserId
;
/**
* 更新人id
*/
private
Integer
updateUserId
;
private
String
updateUserId
;
/**
* 假勤状态 0待休 1休假中 2到期待销假 3已销假
...
...
yifu-business/yifu-business-api/src/main/java/com/yifu/cloud/plus/v1/business/entity/vacation/TVacationMonitorClearLog.java
View file @
872df294
...
...
@@ -46,7 +46,7 @@ public class TVacationMonitorClearLog extends Model<TVacationMonitorClearLog> {
/**
* 清零人id
*/
private
Integer
clearUserId
;
private
String
clearUserId
;
/**
* 清零时间
...
...
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/service/vacation/impl/TVacationInfoServiceImpl.java
View file @
872df294
...
...
@@ -130,7 +130,7 @@ implements TVacationInfoService {
entity
.
setVacationNote
(
dto
.
getVacationNote
());
entity
.
setActuralVacationEndTime
(
dto
.
getActuralVacationEndTime
());
entity
.
setUpdateUser
(
user
.
getNickname
());
entity
.
setUpdateUserId
(
Integer
.
valueOf
(
user
.
getId
()
));
entity
.
setUpdateUserId
(
user
.
getId
(
));
entity
.
setUpdateTime
(
LocalDateTime
.
now
());
boolean
isSuccess
=
this
.
updateById
(
entity
);
return
R
.
ok
(
isSuccess
,
CommonConstants
.
RESULT_DATA_SUCESS
);
...
...
@@ -239,7 +239,7 @@ implements TVacationInfoService {
LocalDate
vacationStart
=
dto
.
getVacationStartTime
();
BeanUtil
.
copyProperties
(
dto
,
entity
,
CopyOptions
.
create
().
setIgnoreNullValue
(
true
).
setIgnoreProperties
(
"vacationEndTime"
,
"vacationStartTime"
));
entity
.
setCreateUser
(
user
.
getNickname
());
entity
.
setCreateUserId
(
Integer
.
valueOf
(
user
.
getId
()
));
entity
.
setCreateUserId
(
user
.
getId
(
));
entity
.
setBusinessPost
(
businessEmployeeExtend
.
getBusinessPost
());
entity
.
setEmpName
(
businessEmployeeExtend
.
getEmpName
());
entity
.
setEmpIdcard
(
businessEmployeeExtend
.
getEmpIdcard
());
...
...
@@ -351,7 +351,7 @@ implements TVacationInfoService {
TVacationInfo
entity
=
new
TVacationInfo
();
BeanUtil
.
copyProperties
(
dto
,
entity
);
entity
.
setCreateUser
(
user
.
getNickname
());
entity
.
setCreateUserId
(
Integer
.
valueOf
(
user
.
getId
()
));
entity
.
setCreateUserId
(
user
.
getId
(
));
entity
.
setCreateTime
(
LocalDateTime
.
now
());
if
(
StringUtils
.
equals
(
BusinessCommonContants
.
YEAR_VACATION_VALUE
,
entity
.
getVacationType
()))
{
String
vacationYear
=
String
.
valueOf
(
dto
.
getVacationStartTime
().
getYear
());
...
...
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/service/vacation/impl/TVacationMonitorClearLogServiceImpl.java
View file @
872df294
...
...
@@ -90,7 +90,7 @@ implements TVacationMonitorClearLogService {
log
.
setVacationYear
(
vacationMonitor
.
getVacationYear
());
log
.
setClearDuration
(
vacationMonitor
.
getNotUsedVacationDuration
());
log
.
setClearUser
(
user
.
getNickname
());
log
.
setClearUserId
(
Integer
.
valueOf
(
user
.
getId
()
));
log
.
setClearUserId
(
user
.
getId
(
));
log
.
setClearTime
(
LocalDateTime
.
now
());
boolean
isSuccess
=
this
.
save
(
log
);
...
...
yifu-business/yifu-business-biz/src/main/resources/mapper/TVacationMonitorClearLogMapper.xml
View file @
872df294
...
...
@@ -10,7 +10,7 @@
<result
property=
"clearDuration"
column=
"CLEAR_DURATION"
jdbcType=
"DECIMAL"
/>
<result
property=
"vacationYear"
column=
"VACATION_YEAR"
jdbcType=
"CHAR"
/>
<result
property=
"clearUser"
column=
"CLEAR_USER"
jdbcType=
"VARCHAR"
/>
<result
property=
"clearUserId"
column=
"CLEAR_USER_ID"
jdbcType=
"
INTEGE
R"
/>
<result
property=
"clearUserId"
column=
"CLEAR_USER_ID"
jdbcType=
"
VARCHA
R"
/>
<result
property=
"clearTime"
column=
"CLEAR_TIME"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"vacationMonitorId"
column=
"VACATION_MONITOR_ID"
jdbcType=
"INTEGER"
/>
</resultMap>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment