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
a71889e7
Commit
a71889e7
authored
Jan 13, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
导出优化
parent
f0412bfb
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
20 additions
and
16 deletions
+20
-16
TBusinessEmployeeExtendInfo.java
.../v1/yifu/archives/entity/TBusinessEmployeeExtendInfo.java
+2
-1
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+2
-1
TVacationMonitor.java
...ud/plus/v1/business/entity/vacation/TVacationMonitor.java
+7
-5
TVacationMonitorClearLog.java
...v1/business/entity/vacation/TVacationMonitorClearLog.java
+1
-1
TVacationRuleConfig.java
...plus/v1/business/entity/vacation/TVacationRuleConfig.java
+5
-5
TVacationMonitorVO.java
...loud/plus/v1/business/vo/vacation/TVacationMonitorVO.java
+1
-1
VacationRuleConfigVO.java
...ud/plus/v1/business/vo/vacation/VacationRuleConfigVO.java
+1
-1
TVacationRuleConfigMapper.xml
...z/src/main/resources/mapper/TVacationRuleConfigMapper.xml
+1
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TBusinessEmployeeExtendInfo.java
View file @
a71889e7
...
...
@@ -8,6 +8,7 @@ import lombok.Data;
import
lombok.ToString
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
import
java.util.Collection
;
import
java.util.List
;
import
java.util.stream.Collectors
;
...
...
@@ -111,7 +112,7 @@ public class TBusinessEmployeeExtendInfo extends Model<TBusinessEmployeeExtendIn
/**
* B端维护的入职时间
*/
private
LocalDate
businessEnjoinDate
;
private
LocalDate
Time
businessEnjoinDate
;
/**
* B端维护的离职原因
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
a71889e7
...
...
@@ -55,6 +55,7 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSocialProperties;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprUpmsProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.insurances.util.LocalDateUtil
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -1670,7 +1671,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
businessVo
.
setDepartCode
(
tBusinessEmployeeExtendInfo
.
getDepartCode
());
businessVo
.
setExtendId
(
tBusinessEmployeeExtendInfo
.
getId
());
if
(
null
!=
tBusinessEmployeeExtendInfo
.
getBusinessEnjoinDate
())
{
businessVo
.
setBusinessEnjoinDate
(
tBusinessEmployeeExtendInfo
.
getBusinessEnjoinDate
());
businessVo
.
setBusinessEnjoinDate
(
tBusinessEmployeeExtendInfo
.
getBusinessEnjoinDate
()
.
toLocalDate
()
);
}
if
(
StringUtils
.
isNotBlank
(
tBusinessEmployeeExtendInfo
.
getBusinessPost
()))
{
businessVo
.
setBusinessPost
(
tBusinessEmployeeExtendInfo
.
getBusinessPost
());
...
...
yifu-business/yifu-business-api/src/main/java/com/yifu/cloud/plus/v1/business/entity/vacation/TVacationMonitor.java
View file @
a71889e7
...
...
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.extension.activerecord.Model
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.math.BigDecimal
;
...
...
@@ -17,11 +18,12 @@ import java.time.LocalDateTime;
@TableName
(
value
=
"t_vacation_monitor"
)
@Data
public
class
TVacationMonitor
extends
Model
<
TVacationMonitor
>
{
/**
* 主键
*/
@TableId
(
type
=
IdType
.
AUTO
)
private
Integer
id
;
/**
*
*/
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@Schema
(
description
=
""
)
private
String
id
;
/**
* 年份
...
...
yifu-business/yifu-business-api/src/main/java/com/yifu/cloud/plus/v1/business/entity/vacation/TVacationMonitorClearLog.java
View file @
a71889e7
...
...
@@ -56,7 +56,7 @@ public class TVacationMonitorClearLog extends Model<TVacationMonitorClearLog> {
/**
* 年假监控id
*/
private
Integer
vacationMonitorId
;
private
String
vacationMonitorId
;
@TableField
(
exist
=
false
)
private
static
final
long
serialVersionUID
=
1L
;
...
...
yifu-business/yifu-business-api/src/main/java/com/yifu/cloud/plus/v1/business/entity/vacation/TVacationRuleConfig.java
View file @
a71889e7
...
...
@@ -20,11 +20,11 @@ import java.time.LocalDateTime;
@TableName
(
value
=
"t_vacation_rule_config"
)
@Data
public
class
TVacationRuleConfig
extends
Model
<
TVacationRuleConfig
>
{
/**
* 主键
*/
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
private
Integer
id
;
/**
*
*/
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
private
String
id
;
/**
* 假期类型 1年假
...
...
yifu-business/yifu-business-api/src/main/java/com/yifu/cloud/plus/v1/business/vo/vacation/TVacationMonitorVO.java
View file @
a71889e7
...
...
@@ -24,7 +24,7 @@ public class TVacationMonitorVO implements Serializable {
* 主键
*/
@Schema
(
description
=
"主键"
)
private
Integer
id
;
private
String
id
;
/**
* 年份
...
...
yifu-business/yifu-business-api/src/main/java/com/yifu/cloud/plus/v1/business/vo/vacation/VacationRuleConfigVO.java
View file @
a71889e7
...
...
@@ -22,7 +22,7 @@ public class VacationRuleConfigVO implements Serializable {
* 主键
*/
@Schema
(
description
=
"主键"
)
private
Integer
id
;
private
String
id
;
/**
* 假期类型 1年假
...
...
yifu-business/yifu-business-biz/src/main/resources/mapper/TVacationRuleConfigMapper.xml
View file @
a71889e7
...
...
@@ -5,7 +5,7 @@
<mapper
namespace=
"com.yifu.cloud.plus.v1.business.mapper.vacation.TVacationRuleConfigMapper"
>
<resultMap
id=
"BaseResultMap"
type=
"com.yifu.cloud.plus.v1.business.entity.vacation.TVacationRuleConfig"
>
<id
property=
"id"
column=
"ID"
jdbcType=
"
INTEGE
R"
/>
<id
property=
"id"
column=
"ID"
jdbcType=
"
VARCHA
R"
/>
<result
property=
"type"
column=
"TYPE"
jdbcType=
"CHAR"
/>
<result
property=
"vacationAutoInit"
column=
"VACATION_AUTO_INIT"
jdbcType=
"CHAR"
/>
<result
property=
"vacationInitDate"
column=
"VACATION_INIT_DATE"
jdbcType=
"DATE"
/>
...
...
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