Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
ef1c7e4f
You need to sign in or sign up before continuing.
Commit
ef1c7e4f
authored
Jan 16, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化修改
parent
872df294
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
152 additions
and
152 deletions
+152
-152
TVacationInfoController.java
...business/controller/vacation/TVacationInfoController.java
+18
-18
TVacationMonitorClearLogController.java
...ntroller/vacation/TVacationMonitorClearLogController.java
+6
-6
TVacationMonitorController.java
...iness/controller/vacation/TVacationMonitorController.java
+12
-12
TVacationRuleConfigController.java
...ss/controller/vacation/TVacationRuleConfigController.java
+6
-6
TVacationInfoMapper.java
...plus/v1/business/mapper/vacation/TVacationInfoMapper.java
+6
-6
TVacationMonitorClearLogMapper.java
...iness/mapper/vacation/TVacationMonitorClearLogMapper.java
+2
-2
TVacationMonitorMapper.java
...s/v1/business/mapper/vacation/TVacationMonitorMapper.java
+2
-2
TVacationRuleConfigMapper.java
...1/business/mapper/vacation/TVacationRuleConfigMapper.java
+2
-2
TBusLeaveService.java
...d/plus/v1/business/service/vacation/TBusLeaveService.java
+2
-2
TVacationInfoService.java
...us/v1/business/service/vacation/TVacationInfoService.java
+18
-18
TVacationMonitorClearLogService.java
...ess/service/vacation/TVacationMonitorClearLogService.java
+6
-6
TVacationMonitorService.java
...v1/business/service/vacation/TVacationMonitorService.java
+22
-22
TVacationRuleConfigService.java
...business/service/vacation/TVacationRuleConfigService.java
+8
-8
TBusLeaveServiceImpl.java
.../business/service/vacation/impl/TBusLeaveServiceImpl.java
+2
-2
TVacationInfoServiceImpl.java
...iness/service/vacation/impl/TVacationInfoServiceImpl.java
+6
-6
TVacationMonitorClearLogServiceImpl.java
...ce/vacation/impl/TVacationMonitorClearLogServiceImpl.java
+2
-2
TVacationMonitorServiceImpl.java
...ss/service/vacation/impl/TVacationMonitorServiceImpl.java
+24
-24
TVacationRuleConfigServiceImpl.java
...service/vacation/impl/TVacationRuleConfigServiceImpl.java
+8
-8
No files found.
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/controller/vacation/TVacationInfoController.java
View file @
ef1c7e4f
...
@@ -21,8 +21,8 @@ import java.util.List;
...
@@ -21,8 +21,8 @@ import java.util.List;
/**
/**
* 假勤信息表 controller
* 假勤信息表 controller
* @author:
wangweiguo
* @author:
huyc
* @date: 202
1-08-20
* @date: 202
3/1/13
*/
*/
@RestController
@RestController
@RequiredArgsConstructor
@RequiredArgsConstructor
...
@@ -36,8 +36,8 @@ public class TVacationInfoController {
...
@@ -36,8 +36,8 @@ public class TVacationInfoController {
* 分页查询: 条件分页查询
* 分页查询: 条件分页查询
* @param query 查询条件
* @param query 查询条件
* @return: R<IPage<TVacationInfoVO>>
* @return: R<IPage<TVacationInfoVO>>
* @author: wangweiguo
* @author: huyc
* @date: 2021-08-20
* @date: 2023/1/13
*/
*/
@Operation
(
summary
=
"分页查询"
,
description
=
"分页查询"
)
@Operation
(
summary
=
"分页查询"
,
description
=
"分页查询"
)
@GetMapping
(
"/getListByPage"
)
@GetMapping
(
"/getListByPage"
)
...
@@ -49,8 +49,8 @@ public class TVacationInfoController {
...
@@ -49,8 +49,8 @@ public class TVacationInfoController {
* 导入: 通过json串格式导入假勤信息
* 导入: 通过json串格式导入假勤信息
* @param jsonStr json字符串数据
* @param jsonStr json字符串数据
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/24
* @date: 2023/1/13
*/
*/
@Operation
(
summary
=
"导入: 通过json串格式导入假勤信息"
,
description
=
"导入: 通过json串格式导入假勤信息"
)
@Operation
(
summary
=
"导入: 通过json串格式导入假勤信息"
,
description
=
"导入: 通过json串格式导入假勤信息"
)
@PostMapping
(
"/batchImportByJsonStr"
)
@PostMapping
(
"/batchImportByJsonStr"
)
...
@@ -62,8 +62,8 @@ public class TVacationInfoController {
...
@@ -62,8 +62,8 @@ public class TVacationInfoController {
* 查询:根据条件出列表
* 查询:根据条件出列表
* @param query 查询条件
* @param query 查询条件
* @return: IPage<com.yifu.cloud.v1.hrobusiness.api.vo.vacation.TVacationInfoVO>>
* @return: IPage<com.yifu.cloud.v1.hrobusiness.api.vo.vacation.TVacationInfoVO>>
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/24
* @date: 2023/1/13
*/
*/
@Operation
(
summary
=
"查询:根据条件出列表"
,
description
=
"查询:根据条件出列表"
)
@Operation
(
summary
=
"查询:根据条件出列表"
,
description
=
"查询:根据条件出列表"
)
@GetMapping
(
"/getList"
)
@GetMapping
(
"/getList"
)
...
@@ -75,8 +75,8 @@ public class TVacationInfoController {
...
@@ -75,8 +75,8 @@ public class TVacationInfoController {
* 查询-详情:根据id查询数据
* 查询-详情:根据id查询数据
* @param id
* @param id
* @return: R<TVacationInfoVO>
* @return: R<TVacationInfoVO>
* @author: wangweiguo
* @author: huyc
* @date: 2021-08-24
* @date: 2023/1/13
*/
*/
@Operation
(
summary
=
"查询-详情:根据id查询数据"
,
description
=
"查询-详情:根据id查询数据"
)
@Operation
(
summary
=
"查询-详情:根据id查询数据"
,
description
=
"查询-详情:根据id查询数据"
)
@GetMapping
(
"/{id}"
)
@GetMapping
(
"/{id}"
)
...
@@ -88,8 +88,8 @@ public class TVacationInfoController {
...
@@ -88,8 +88,8 @@ public class TVacationInfoController {
* 添加:新增-单条-添加一条记录
* 添加:新增-单条-添加一条记录
* @param dto
* @param dto
* @return: R<TVacationInfo>
* @return: R<TVacationInfo>
* @author: wangweiguo
* @author: huyc
* @date: 2021-08-24
* @date: 2023/1/13
*/
*/
@Operation
(
summary
=
"添加:新增-单条-添加一条记录"
,
description
=
"添加:新增-单条-添加一条记录"
)
@Operation
(
summary
=
"添加:新增-单条-添加一条记录"
,
description
=
"添加:新增-单条-添加一条记录"
)
@PostMapping
@PostMapping
...
@@ -101,8 +101,8 @@ public class TVacationInfoController {
...
@@ -101,8 +101,8 @@ public class TVacationInfoController {
* 销假:单条-根据id更新记录
* 销假:单条-根据id更新记录
* @param dto dto
* @param dto dto
* @return: R<Boolean>
* @return: R<Boolean>
* @author: wangweiguo
* @author: huyc
* @date: 2021-08-24
* @date: 2023/1/13
*/
*/
@Operation
(
summary
=
"销假:单条-根据id更新"
,
description
=
"销假:单条-根据id更新"
)
@Operation
(
summary
=
"销假:单条-根据id更新"
,
description
=
"销假:单条-根据id更新"
)
@PostMapping
(
"/vacationEnd/{id}"
)
@PostMapping
(
"/vacationEnd/{id}"
)
...
@@ -114,8 +114,8 @@ public class TVacationInfoController {
...
@@ -114,8 +114,8 @@ public class TVacationInfoController {
* 删除-单条:根据id删除记录
* 删除-单条:根据id删除记录
* @param id
* @param id
* @return: R<Boolean>
* @return: R<Boolean>
* @author: wangweiguo
* @author: huyc
* @date: 2021-08-20
* @date: 2023/1/13
*/
*/
@Operation
(
summary
=
"根据id删除记录"
,
description
=
"根据id删除记录"
)
@Operation
(
summary
=
"根据id删除记录"
,
description
=
"根据id删除记录"
)
@DeleteMapping
(
"/{id}"
)
@DeleteMapping
(
"/{id}"
)
...
@@ -124,9 +124,9 @@ public class TVacationInfoController {
...
@@ -124,9 +124,9 @@ public class TVacationInfoController {
}
}
/**
/**
* @author wangweiguo
* @description 更新假勤信息中的冗余信息
* @description 更新假勤信息中的冗余信息
* @date 20:32 2021/8/24
* @author: huyc
* @date: 2023/1/13
* @param dtoList 更新冗余字段dto集合
* @param dtoList 更新冗余字段dto集合
* @return com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @return com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
**/
**/
...
...
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/controller/vacation/TVacationMonitorClearLogController.java
View file @
ef1c7e4f
...
@@ -15,8 +15,8 @@ import java.util.List;
...
@@ -15,8 +15,8 @@ import java.util.List;
/**
/**
* @description: 假期监控清零日志表 controller
* @description: 假期监控清零日志表 controller
* @author:
wangweiguo
* @author:
huyc
* @date: 202
1-08-16
* @date: 202
3/1/13
*/
*/
@RestController
@RestController
@AllArgsConstructor
@AllArgsConstructor
...
@@ -30,8 +30,8 @@ public class TVacationMonitorClearLogController {
...
@@ -30,8 +30,8 @@ public class TVacationMonitorClearLogController {
* @description: 查询-列表: 查询当前年假所有清零记录
* @description: 查询-列表: 查询当前年假所有清零记录
* @param vacationMonitorId 年假监控id
* @param vacationMonitorId 年假监控id
* @return: R<List<TVacationMonitorClearLogVO>>
* @return: R<List<TVacationMonitorClearLogVO>>
* @author: wangweiguo
* @author: huyc
* @date: 2021-08-16
* @date: 2023/1/13
*/
*/
@Operation
(
summary
=
"查询-列表: 查询当前年假所有清零记录"
,
description
=
"查询-列表: 查询当前年假所有清零记录"
)
@Operation
(
summary
=
"查询-列表: 查询当前年假所有清零记录"
,
description
=
"查询-列表: 查询当前年假所有清零记录"
)
@GetMapping
(
"/getList"
)
@GetMapping
(
"/getList"
)
...
@@ -43,8 +43,8 @@ public class TVacationMonitorClearLogController {
...
@@ -43,8 +43,8 @@ public class TVacationMonitorClearLogController {
* @description: 清零说明: 记录年假清零说明
* @description: 清零说明: 记录年假清零说明
* @param dto
* @param dto
* @return: R<Boolean>
* @return: R<Boolean>
* @author: wangweiguo
* @author: huyc
* @date: 2021-08-16
* @date: 2023/1/13
*/
*/
@Operation
(
summary
=
"清零说明: 记录年假清零说明"
,
description
=
"清零说明: 记录年假清零说明"
)
@Operation
(
summary
=
"清零说明: 记录年假清零说明"
,
description
=
"清零说明: 记录年假清零说明"
)
@PostMapping
(
"/clearNote"
)
@PostMapping
(
"/clearNote"
)
...
...
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/controller/vacation/TVacationMonitorController.java
View file @
ef1c7e4f
...
@@ -18,8 +18,8 @@ import java.util.List;
...
@@ -18,8 +18,8 @@ import java.util.List;
/**
/**
* @description: 假期监控表 controller
* @description: 假期监控表 controller
* @author:
wangweiguo
* @author:
huyc
* @date: 202
1-08-
13
* @date: 202
3/1/
13
*/
*/
@Slf4j
@Slf4j
@RestController
@RestController
...
@@ -34,8 +34,8 @@ public class TVacationMonitorController {
...
@@ -34,8 +34,8 @@ public class TVacationMonitorController {
* @description: 分页查询: 条件分页查询
* @description: 分页查询: 条件分页查询
* @param query 查询条件
* @param query 查询条件
* @return: R<IPage<TVacationMonitorVO>>
* @return: R<IPage<TVacationMonitorVO>>
* @author: wangweiguo
* @author: huyc
* @date: 2021-08-
13
* @date: 2023/1/
13
*/
*/
@Operation
(
summary
=
"分页查询: 条件分页查询"
,
description
=
"分页查询: 条件分页查询"
)
@Operation
(
summary
=
"分页查询: 条件分页查询"
,
description
=
"分页查询: 条件分页查询"
)
@GetMapping
(
"/getListByPage"
)
@GetMapping
(
"/getListByPage"
)
...
@@ -47,8 +47,8 @@ public class TVacationMonitorController {
...
@@ -47,8 +47,8 @@ public class TVacationMonitorController {
* @description: 导出:根据查询条件导出
* @description: 导出:根据查询条件导出
* @param query 查询条件
* @param query 查询条件
* @return: R<List<TVacationMonitorVO>>
* @return: R<List<TVacationMonitorVO>>
* @author: wangweiguo
* @author: huyc
* @date: 2021-08-
13
* @date: 2023/1/
13
*/
*/
@Operation
(
summary
=
"导出:根据查询条件导出"
,
description
=
"导出:根据查询条件导出"
)
@Operation
(
summary
=
"导出:根据查询条件导出"
,
description
=
"导出:根据查询条件导出"
)
@GetMapping
(
"/exportByParams"
)
@GetMapping
(
"/exportByParams"
)
...
@@ -60,8 +60,8 @@ public class TVacationMonitorController {
...
@@ -60,8 +60,8 @@ public class TVacationMonitorController {
* @description: 查询-剩余年假:根据身份证号查询剩余年假
* @description: 查询-剩余年假:根据身份证号查询剩余年假
* @param idcard
* @param idcard
* @return: com.yifu.cloud.v1.common.core.util.R<java.math.BigDecimal>
* @return: com.yifu.cloud.v1.common.core.util.R<java.math.BigDecimal>
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/17
* @date: 2023/1/13
*/
*/
@Operation
(
summary
=
"查询-剩余年假:根据身份证号查询剩余年假"
,
description
=
"查询-剩余年假:根据身份证号查询剩余年假"
)
@Operation
(
summary
=
"查询-剩余年假:根据身份证号查询剩余年假"
,
description
=
"查询-剩余年假:根据身份证号查询剩余年假"
)
@GetMapping
(
"getNotUsedVacationDurationByIdCard"
)
@GetMapping
(
"getNotUsedVacationDurationByIdCard"
)
...
@@ -72,8 +72,8 @@ public class TVacationMonitorController {
...
@@ -72,8 +72,8 @@ public class TVacationMonitorController {
/**
/**
* @description: 定时任务:内部服务调用,每天初始化员工年假信息
* @description: 定时任务:内部服务调用,每天初始化员工年假信息
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/17
* @date: 2023/1/13
*/
*/
@Inner
@Inner
@PostMapping
(
"/inner/buildMonitorDataForCurrentYear"
)
@PostMapping
(
"/inner/buildMonitorDataForCurrentYear"
)
...
@@ -84,8 +84,8 @@ public class TVacationMonitorController {
...
@@ -84,8 +84,8 @@ public class TVacationMonitorController {
/**
/**
* @description: 冗余更新:更新监控表中冗余的员工信息,电信工号和岗位
* @description: 冗余更新:更新监控表中冗余的员工信息,电信工号和岗位
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/2
3
* @date: 2023/1/1
3
*/
*/
@Inner
@Inner
@PostMapping
(
"/inner/updateRedundancyEmployeeFields"
)
@PostMapping
(
"/inner/updateRedundancyEmployeeFields"
)
...
...
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/controller/vacation/TVacationRuleConfigController.java
View file @
ef1c7e4f
...
@@ -16,8 +16,8 @@ import javax.validation.Valid;
...
@@ -16,8 +16,8 @@ import javax.validation.Valid;
/**
/**
* @description: 假期配置controller
* @description: 假期配置controller
* @author:
wangweiguo
* @author:
huyc
* @date: 202
1/8
/13
* @date: 202
3/1
/13
*/
*/
@AllArgsConstructor
@AllArgsConstructor
@RequestMapping
(
"/vacationRule"
)
@RequestMapping
(
"/vacationRule"
)
...
@@ -30,8 +30,8 @@ public class TVacationRuleConfigController {
...
@@ -30,8 +30,8 @@ public class TVacationRuleConfigController {
/**
/**
* @description: 获取年假配置规则
* @description: 获取年假配置规则
* @return: com.yifu.cloud.v1.common.core.util.R<com.yifu.cloud.v1.hrobusiness.api.vo.vacation.VacationRuleConfigVO>
* @return: com.yifu.cloud.v1.common.core.util.R<com.yifu.cloud.v1.hrobusiness.api.vo.vacation.VacationRuleConfigVO>
* @author: wangweiguo
* @author: huyc
* @date: 2021/8
/13
* @date: 2023/1
/13
*/
*/
@Operation
(
summary
=
"获取年假配置规则"
,
description
=
"获取年假配置规则"
)
@Operation
(
summary
=
"获取年假配置规则"
,
description
=
"获取年假配置规则"
)
@GetMapping
(
"/getVacationRuleConfig"
)
@GetMapping
(
"/getVacationRuleConfig"
)
...
@@ -47,8 +47,8 @@ public class TVacationRuleConfigController {
...
@@ -47,8 +47,8 @@ public class TVacationRuleConfigController {
* @description:
* @description:
* @param dto
* @param dto
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @author: wangweiguo
* @author: huyc
* @date: 2021/8
/13
* @date: 2023/1
/13
*/
*/
@Operation
(
summary
=
"新增或保存假期配置规则"
,
description
=
"新增或保存假期配置规则"
)
@Operation
(
summary
=
"新增或保存假期配置规则"
,
description
=
"新增或保存假期配置规则"
)
@PostMapping
(
"/addOrSave"
)
@PostMapping
(
"/addOrSave"
)
...
...
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/mapper/vacation/TVacationInfoMapper.java
View file @
ef1c7e4f
...
@@ -13,8 +13,8 @@ import java.util.List;
...
@@ -13,8 +13,8 @@ import java.util.List;
/**
/**
* @description: 假勤信息表 mapper
* @description: 假勤信息表 mapper
* @Entity com.yifu.cloud.v1.hrobusiness.api.entity.vacation.TVacationInfo
* @Entity com.yifu.cloud.v1.hrobusiness.api.entity.vacation.TVacationInfo
* @author:
wangweiguo
* @author:
huyc
* @date: 202
1-08-20
* @date: 202
3/1/13
*/
*/
@Mapper
@Mapper
public
interface
TVacationInfoMapper
extends
BaseMapper
<
TVacationInfo
>
{
public
interface
TVacationInfoMapper
extends
BaseMapper
<
TVacationInfo
>
{
...
@@ -23,8 +23,8 @@ public interface TVacationInfoMapper extends BaseMapper<TVacationInfo> {
...
@@ -23,8 +23,8 @@ public interface TVacationInfoMapper extends BaseMapper<TVacationInfo> {
* @description: 分页查询: 条件分页查询
* @description: 分页查询: 条件分页查询
* @param query 查询条件
* @param query 查询条件
* @return: R<IPage<TVacationInfoVO>>
* @return: R<IPage<TVacationInfoVO>>
* @author: wangweiguo
* @author: huyc
* @date: 2021-08-20
* @date: 2023/1/13
*/
*/
Page
<
TVacationInfoVO
>
getListByPage
(
Page
<
TVacationInfoVO
>
page
,
@Param
(
"query"
)
TVacationInfoQuery
query
);
Page
<
TVacationInfoVO
>
getListByPage
(
Page
<
TVacationInfoVO
>
page
,
@Param
(
"query"
)
TVacationInfoQuery
query
);
...
@@ -32,8 +32,8 @@ public interface TVacationInfoMapper extends BaseMapper<TVacationInfo> {
...
@@ -32,8 +32,8 @@ public interface TVacationInfoMapper extends BaseMapper<TVacationInfo> {
* @description: 列表查询查询: 条件列表查询
* @description: 列表查询查询: 条件列表查询
* @param query 查询条件
* @param query 查询条件
* @return: List<TVacationInfoVO>
* @return: List<TVacationInfoVO>
* @author: wangweiguo
* @author: huyc
* @date: 2021-08-24
* @date: 2023/1/13
*/
*/
List
<
TVacationInfoVO
>
getListByPage
(
@Param
(
"query"
)
TVacationInfoQuery
query
);
List
<
TVacationInfoVO
>
getListByPage
(
@Param
(
"query"
)
TVacationInfoQuery
query
);
...
...
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/mapper/vacation/TVacationMonitorClearLogMapper.java
View file @
ef1c7e4f
...
@@ -8,8 +8,8 @@ import org.apache.ibatis.annotations.Mapper;
...
@@ -8,8 +8,8 @@ import org.apache.ibatis.annotations.Mapper;
/**
/**
* @description: 假期监控清零日志表 mapper
* @description: 假期监控清零日志表 mapper
* @Entity com.yifu.cloud.v1.hrobusiness.api.entity.vacation.TVacationMonitorClearLog
* @Entity com.yifu.cloud.v1.hrobusiness.api.entity.vacation.TVacationMonitorClearLog
* @author:
wangweiguo
* @author:
huyc
* @date: 202
1-08-16
* @date: 202
3/1/13
*/
*/
@Mapper
@Mapper
public
interface
TVacationMonitorClearLogMapper
extends
BaseMapper
<
TVacationMonitorClearLog
>
{
public
interface
TVacationMonitorClearLogMapper
extends
BaseMapper
<
TVacationMonitorClearLog
>
{
...
...
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/mapper/vacation/TVacationMonitorMapper.java
View file @
ef1c7e4f
...
@@ -14,8 +14,8 @@ import java.util.List;
...
@@ -14,8 +14,8 @@ import java.util.List;
/**
/**
* @description: 假期监控表 mapper
* @description: 假期监控表 mapper
* @Entity generator.domain.TVacationMonitor
* @Entity generator.domain.TVacationMonitor
* @author:
wangweiguo
* @author:
huyc
* @date: 202
1-08-
13
* @date: 202
3/1/
13
*/
*/
@Mapper
@Mapper
public
interface
TVacationMonitorMapper
extends
BaseMapper
<
TVacationMonitor
>
{
public
interface
TVacationMonitorMapper
extends
BaseMapper
<
TVacationMonitor
>
{
...
...
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/mapper/vacation/TVacationRuleConfigMapper.java
View file @
ef1c7e4f
...
@@ -7,8 +7,8 @@ import org.apache.ibatis.annotations.Mapper;
...
@@ -7,8 +7,8 @@ import org.apache.ibatis.annotations.Mapper;
/**
/**
* @description: 假期配置表mapper
* @description: 假期配置表mapper
* @Entity generator.domain.TVacationRuleConfig
* @Entity generator.domain.TVacationRuleConfig
* @author:
wangweiguo
* @author:
huyc
* @date: 202
1/8
/13
* @date: 202
3/1
/13
*/
*/
@Mapper
@Mapper
public
interface
TVacationRuleConfigMapper
extends
BaseMapper
<
TVacationRuleConfig
>
{
public
interface
TVacationRuleConfigMapper
extends
BaseMapper
<
TVacationRuleConfig
>
{
...
...
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/service/vacation/TBusLeaveService.java
View file @
ef1c7e4f
...
@@ -11,8 +11,8 @@ import java.util.List;
...
@@ -11,8 +11,8 @@ import java.util.List;
/**
/**
* B端离职信息表
* B端离职信息表
*
*
* @author
hgw
* @author
: huyc
* @date
2021-08-17 17:02:47
* @date
: 2023/1/13
*/
*/
public
interface
TBusLeaveService
extends
IService
<
TBusLeave
>
{
public
interface
TBusLeaveService
extends
IService
<
TBusLeave
>
{
...
...
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/service/vacation/TVacationInfoService.java
View file @
ef1c7e4f
...
@@ -15,8 +15,8 @@ import java.util.List;
...
@@ -15,8 +15,8 @@ import java.util.List;
/**
/**
* 假勤信息表 service层
* 假勤信息表 service层
* @author:
wangweiguo
* @author:
huyc
* @date: 202
1-08-20
* @date: 202
3/1/13
*/
*/
public
interface
TVacationInfoService
extends
IService
<
TVacationInfo
>
{
public
interface
TVacationInfoService
extends
IService
<
TVacationInfo
>
{
...
@@ -24,8 +24,8 @@ public interface TVacationInfoService extends IService<TVacationInfo> {
...
@@ -24,8 +24,8 @@ public interface TVacationInfoService extends IService<TVacationInfo> {
* 分页查询: 条件分页查询
* 分页查询: 条件分页查询
* @param query 查询条件
* @param query 查询条件
* @return: R<IPage<TVacationInfoVO>>
* @return: R<IPage<TVacationInfoVO>>
* @author: wangweiguo
* @author: huyc
* @date: 2021-08-20
* @date: 2023/1/13
*/
*/
R
<
IPage
<
TVacationInfoVO
>>
getListByPage
(
TVacationInfoQuery
query
);
R
<
IPage
<
TVacationInfoVO
>>
getListByPage
(
TVacationInfoQuery
query
);
...
@@ -33,8 +33,8 @@ public interface TVacationInfoService extends IService<TVacationInfo> {
...
@@ -33,8 +33,8 @@ public interface TVacationInfoService extends IService<TVacationInfo> {
* 查询:根据条件出列表
* 查询:根据条件出列表
* @param query 查询条件
* @param query 查询条件
* @return: IPage<com.yifu.cloud.v1.hrobusiness.api.vo.vacation.TVacationInfoVO>>
* @return: IPage<com.yifu.cloud.v1.hrobusiness.api.vo.vacation.TVacationInfoVO>>
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/24
* @date: 2023/1/13
*/
*/
R
<
List
<
TVacationInfoVO
>>
getList
(
TVacationInfoQuery
query
);
R
<
List
<
TVacationInfoVO
>>
getList
(
TVacationInfoQuery
query
);
...
@@ -42,8 +42,8 @@ public interface TVacationInfoService extends IService<TVacationInfo> {
...
@@ -42,8 +42,8 @@ public interface TVacationInfoService extends IService<TVacationInfo> {
* 查询-详情:根据id查询数据
* 查询-详情:根据id查询数据
* @param id
* @param id
* @return: R<TVacationInfoVO>
* @return: R<TVacationInfoVO>
* @author: wangweiguo
* @author: huyc
* @date: 2021-08-24
* @date: 2023/1/13
*/
*/
R
<
TVacationInfoVO
>
getDataById
(
String
id
);
R
<
TVacationInfoVO
>
getDataById
(
String
id
);
...
@@ -51,8 +51,8 @@ public interface TVacationInfoService extends IService<TVacationInfo> {
...
@@ -51,8 +51,8 @@ public interface TVacationInfoService extends IService<TVacationInfo> {
* 销假:单条-根据id更新记录
* 销假:单条-根据id更新记录
* @param dto dto
* @param dto dto
* @return: R<Boolean>
* @return: R<Boolean>
* @author: wangweiguo
* @author: huyc
* @date: 2021-08-24
* @date: 2023/1/13
*/
*/
R
<
Boolean
>
vacationEnd
(
ChangeVacationStatusDTO
dto
);
R
<
Boolean
>
vacationEnd
(
ChangeVacationStatusDTO
dto
);
...
@@ -60,8 +60,8 @@ public interface TVacationInfoService extends IService<TVacationInfo> {
...
@@ -60,8 +60,8 @@ public interface TVacationInfoService extends IService<TVacationInfo> {
* 导入: 通过json串格式导入假勤信息
* 导入: 通过json串格式导入假勤信息
* @param jsonStr json字符串数据
* @param jsonStr json字符串数据
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/24
* @date: 2023/1/13
*/
*/
R
<
List
<
ErrorMessage
>>
batchImportByJsonStr
(
String
jsonStr
);
R
<
List
<
ErrorMessage
>>
batchImportByJsonStr
(
String
jsonStr
);
...
@@ -69,8 +69,8 @@ public interface TVacationInfoService extends IService<TVacationInfo> {
...
@@ -69,8 +69,8 @@ public interface TVacationInfoService extends IService<TVacationInfo> {
* 删除-单条:根据id删除记录
* 删除-单条:根据id删除记录
* @param id
* @param id
* @return: R<Boolean>
* @return: R<Boolean>
* @author: wangweiguo
* @author: huyc
* @date: 2021-08-20
* @date: 2023/1/13
*/
*/
R
<
Boolean
>
removeDataById
(
String
id
);
R
<
Boolean
>
removeDataById
(
String
id
);
...
@@ -78,15 +78,15 @@ public interface TVacationInfoService extends IService<TVacationInfo> {
...
@@ -78,15 +78,15 @@ public interface TVacationInfoService extends IService<TVacationInfo> {
* 添加:新增-单条-添加一条记录
* 添加:新增-单条-添加一条记录
* @param dto
* @param dto
* @return: R<TVacationInfo>
* @return: R<TVacationInfo>
* @author: wangweiguo
* @author: huyc
* @date: 2021-08-24
* @date: 2023/1/13
*/
*/
R
<
TVacationInfo
>
saveData
(
AddOrUpdateTVacationInfoDTO
dto
);
R
<
TVacationInfo
>
saveData
(
AddOrUpdateTVacationInfoDTO
dto
);
/**
/**
* @author wangweiguo
* @description 更新假勤信息中的冗余信息
* @description 更新假勤信息中的冗余信息
* @date 20:32 2021/8/24
* @author: huyc
* @date: 2023/1/13
* @param dtoList 更新冗余字段dto集合
* @param dtoList 更新冗余字段dto集合
* @return com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @return com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
**/
**/
...
...
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/service/vacation/TVacationMonitorClearLogService.java
View file @
ef1c7e4f
...
@@ -11,8 +11,8 @@ import java.util.List;
...
@@ -11,8 +11,8 @@ import java.util.List;
/**
/**
* @description: 假期监控清零日志表 service层
* @description: 假期监控清零日志表 service层
* @author:
wangweiguo
* @author:
huyc
* @date: 202
1-08-16
* @date: 202
3/1/13
*/
*/
public
interface
TVacationMonitorClearLogService
extends
IService
<
TVacationMonitorClearLog
>
{
public
interface
TVacationMonitorClearLogService
extends
IService
<
TVacationMonitorClearLog
>
{
...
@@ -20,8 +20,8 @@ public interface TVacationMonitorClearLogService extends IService<TVacationMonit
...
@@ -20,8 +20,8 @@ public interface TVacationMonitorClearLogService extends IService<TVacationMonit
* @description: 查询-列表: 查询当前年假所有清零记录
* @description: 查询-列表: 查询当前年假所有清零记录
* @param vacationMonitorId 年假监控id
* @param vacationMonitorId 年假监控id
* @return: R<List<TVacationMonitorClearLogVO>>
* @return: R<List<TVacationMonitorClearLogVO>>
* @author: wangweiguo
* @author: huyc
* @date: 2021-08-16
* @date: 2023/1/13
*/
*/
R
<
List
<
TVacationMonitorClearLogVO
>>
getList
(
String
vacationMonitorId
);
R
<
List
<
TVacationMonitorClearLogVO
>>
getList
(
String
vacationMonitorId
);
...
@@ -29,8 +29,8 @@ public interface TVacationMonitorClearLogService extends IService<TVacationMonit
...
@@ -29,8 +29,8 @@ public interface TVacationMonitorClearLogService extends IService<TVacationMonit
* @description: 清零说明: 记录年假清零说明
* @description: 清零说明: 记录年假清零说明
* @param dto
* @param dto
* @return: R<Boolean>
* @return: R<Boolean>
* @author: wangweiguo
* @author: huyc
* @date: 2021-08-16
* @date: 2023/1/13
*/
*/
R
<
Boolean
>
clearNote
(
AddVacationMonitorClearLogDTO
dto
);
R
<
Boolean
>
clearNote
(
AddVacationMonitorClearLogDTO
dto
);
}
}
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/service/vacation/TVacationMonitorService.java
View file @
ef1c7e4f
...
@@ -13,8 +13,8 @@ import java.util.List;
...
@@ -13,8 +13,8 @@ import java.util.List;
/**
/**
* @description: 假期监控表 service层
* @description: 假期监控表 service层
* @author:
wangweiguo
* @author:
huyc
* @date: 202
1-08-
13
* @date: 202
3/1/
13
*/
*/
public
interface
TVacationMonitorService
extends
IService
<
TVacationMonitor
>
{
public
interface
TVacationMonitorService
extends
IService
<
TVacationMonitor
>
{
...
@@ -22,8 +22,8 @@ public interface TVacationMonitorService extends IService<TVacationMonitor> {
...
@@ -22,8 +22,8 @@ public interface TVacationMonitorService extends IService<TVacationMonitor> {
* @description: 分页查询: 条件分页查询
* @description: 分页查询: 条件分页查询
* @param query 查询条件
* @param query 查询条件
* @return: R<IPage<TVacationMonitorVO>>
* @return: R<IPage<TVacationMonitorVO>>
* @author: wangweiguo
* @author: huyc
* @date: 2021-08-
13
* @date: 2023/1/
13
*/
*/
R
<
IPage
<
TVacationMonitorVO
>>
getListByPage
(
TVacationMonitorQuery
query
);
R
<
IPage
<
TVacationMonitorVO
>>
getListByPage
(
TVacationMonitorQuery
query
);
...
@@ -31,8 +31,8 @@ public interface TVacationMonitorService extends IService<TVacationMonitor> {
...
@@ -31,8 +31,8 @@ public interface TVacationMonitorService extends IService<TVacationMonitor> {
* @description: 导出:根据查询条件导出
* @description: 导出:根据查询条件导出
* @param query 查询条件
* @param query 查询条件
* @return: R<List<TVacationMonitorVO>>
* @return: R<List<TVacationMonitorVO>>
* @author: wangweiguo
* @author: huyc
* @date: 2021-08-
13
* @date: 2023/1/
13
*/
*/
R
<
List
<
TVacationMonitorVO
>>
exportByParams
(
TVacationMonitorQuery
query
);
R
<
List
<
TVacationMonitorVO
>>
exportByParams
(
TVacationMonitorQuery
query
);
...
@@ -40,8 +40,8 @@ public interface TVacationMonitorService extends IService<TVacationMonitor> {
...
@@ -40,8 +40,8 @@ public interface TVacationMonitorService extends IService<TVacationMonitor> {
* @description: 保存或者更新监控记录
* @description: 保存或者更新监控记录
* @param entity
* @param entity
* @return: boolean
* @return: boolean
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/16
* @date: 2023/1/13
*/
*/
boolean
saveOrUpdateData
(
TVacationMonitor
entity
);
boolean
saveOrUpdateData
(
TVacationMonitor
entity
);
...
@@ -49,8 +49,8 @@ public interface TVacationMonitorService extends IService<TVacationMonitor> {
...
@@ -49,8 +49,8 @@ public interface TVacationMonitorService extends IService<TVacationMonitor> {
* @description: 批量保存 OR 新增
* @description: 批量保存 OR 新增
* @param list
* @param list
* @return: boolean
* @return: boolean
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/16
* @date: 2023/1/13
*/
*/
boolean
batchSaveOrUpdateData
(
List
<
TVacationMonitor
>
list
);
boolean
batchSaveOrUpdateData
(
List
<
TVacationMonitor
>
list
);
...
@@ -58,24 +58,24 @@ public interface TVacationMonitorService extends IService<TVacationMonitor> {
...
@@ -58,24 +58,24 @@ public interface TVacationMonitorService extends IService<TVacationMonitor> {
* @description: 查询:根据身份证号查询剩余年假
* @description: 查询:根据身份证号查询剩余年假
* @param idcard
* @param idcard
* @return: com.yifu.cloud.v1.common.core.util.R<java.math.BigDecimal>
* @return: com.yifu.cloud.v1.common.core.util.R<java.math.BigDecimal>
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/17
* @date: 2023/1/13
*/
*/
R
<
BigDecimal
>
getNotUsedVacationDurationByIdCard
(
String
idcard
);
R
<
BigDecimal
>
getNotUsedVacationDurationByIdCard
(
String
idcard
);
/**
/**
* @description: 定时任务:内部服务调用,每天初始化员工年假信息
* @description: 定时任务:内部服务调用,每天初始化员工年假信息
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/17
* @date: 2023/1/13
*/
*/
R
<
Boolean
>
buildMonitorData
();
R
<
Boolean
>
buildMonitorData
();
/**
/**
* @description: 冗余更新:更新监控表中冗余的员工信息,电信工号和岗位
* @description: 冗余更新:更新监控表中冗余的员工信息,电信工号和岗位
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/2
3
* @date: 2023/1/1
3
*/
*/
R
<
Boolean
>
updateRedundancyEmployeeFields
(
List
<
UpdateVacationRedundancyDTO
>
dtoList
);
R
<
Boolean
>
updateRedundancyEmployeeFields
(
List
<
UpdateVacationRedundancyDTO
>
dtoList
);
...
@@ -85,8 +85,8 @@ public interface TVacationMonitorService extends IService<TVacationMonitor> {
...
@@ -85,8 +85,8 @@ public interface TVacationMonitorService extends IService<TVacationMonitor> {
* @param vacationDuration 假期时长
* @param vacationDuration 假期时长
* @param year 年份
* @param year 年份
* @return: boolean
* @return: boolean
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/24
* @date: 2023/1/13
*/
*/
boolean
releaseVacationDuration
(
String
empIdcard
,
BigDecimal
vacationDuration
,
String
year
);
boolean
releaseVacationDuration
(
String
empIdcard
,
BigDecimal
vacationDuration
,
String
year
);
...
@@ -96,8 +96,8 @@ public interface TVacationMonitorService extends IService<TVacationMonitor> {
...
@@ -96,8 +96,8 @@ public interface TVacationMonitorService extends IService<TVacationMonitor> {
* @param vacationDuration 假期时长
* @param vacationDuration 假期时长
* @param year 年份
* @param year 年份
* @return: boolean
* @return: boolean
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/24
* @date: 2023/1/13
*/
*/
boolean
consumeVacationDuration
(
String
empIdcard
,
BigDecimal
vacationDuration
,
String
year
);
boolean
consumeVacationDuration
(
String
empIdcard
,
BigDecimal
vacationDuration
,
String
year
);
...
@@ -106,8 +106,8 @@ public interface TVacationMonitorService extends IService<TVacationMonitor> {
...
@@ -106,8 +106,8 @@ public interface TVacationMonitorService extends IService<TVacationMonitor> {
* @param empIdcard 身份证号
* @param empIdcard 身份证号
* @param year 假勤年份
* @param year 假勤年份
* @return: com.yifu.cloud.v1.hrobusiness.api.entity.vacation.TVacationMonitor
* @return: com.yifu.cloud.v1.hrobusiness.api.entity.vacation.TVacationMonitor
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/24
* @date: 2023/1/13
*/
*/
TVacationMonitor
getMonitorByEmpIdcardAndYear
(
String
empIdcard
,
String
year
);
TVacationMonitor
getMonitorByEmpIdcardAndYear
(
String
empIdcard
,
String
year
);
}
}
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/service/vacation/TVacationRuleConfigService.java
View file @
ef1c7e4f
...
@@ -11,16 +11,16 @@ import java.time.LocalDateTime;
...
@@ -11,16 +11,16 @@ import java.time.LocalDateTime;
/**
/**
* @description: 假期配置 service
* @description: 假期配置 service
* @author:
wangweiguo
* @author:
huyc
* @date: 202
1/8
/13
* @date: 202
3/1
/13
*/
*/
public
interface
TVacationRuleConfigService
extends
IService
<
TVacationRuleConfig
>
{
public
interface
TVacationRuleConfigService
extends
IService
<
TVacationRuleConfig
>
{
/**
/**
* @description: 获取年假配置规则
* @description: 获取年假配置规则
* @return: com.yifu.cloud.v1.common.core.util.R<com.yifu.cloud.v1.hrobusiness.api.vo.vacation.VacationRuleConfigVO>
* @return: com.yifu.cloud.v1.common.core.util.R<com.yifu.cloud.v1.hrobusiness.api.vo.vacation.VacationRuleConfigVO>
* @author: wangweiguo
* @author: huyc
* @date: 2021/8
/13
* @date: 2023/1
/13
*/
*/
R
<
VacationRuleConfigVO
>
getVacationRuleConfig
();
R
<
VacationRuleConfigVO
>
getVacationRuleConfig
();
...
@@ -29,8 +29,8 @@ public interface TVacationRuleConfigService extends IService<TVacationRuleConfig
...
@@ -29,8 +29,8 @@ public interface TVacationRuleConfigService extends IService<TVacationRuleConfig
* @param user
* @param user
* @param dto
* @param dto
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @author: wangweiguo
* @author: huyc
* @date: 2021/8
/13
* @date: 2023/1
/13
*/
*/
R
<
Boolean
>
addOrSave
(
YifuUser
user
,
AddOrSaveVacationRuleDTO
dto
);
R
<
Boolean
>
addOrSave
(
YifuUser
user
,
AddOrSaveVacationRuleDTO
dto
);
...
@@ -38,8 +38,8 @@ public interface TVacationRuleConfigService extends IService<TVacationRuleConfig
...
@@ -38,8 +38,8 @@ public interface TVacationRuleConfigService extends IService<TVacationRuleConfig
* @description: 根据入职时间返回年假天数
* @description: 根据入职时间返回年假天数
* @param enjoinDate 入职时间
* @param enjoinDate 入职时间
* @return: java.lang.Integer 年假天数
* @return: java.lang.Integer 年假天数
* @author: wangweiguo
* @author: huyc
* @date: 2021/8
/13
* @date: 2023/1
/13
*/
*/
Integer
annualLeaveCalculationFormula
(
LocalDateTime
enjoinDate
);
Integer
annualLeaveCalculationFormula
(
LocalDateTime
enjoinDate
);
}
}
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/service/vacation/impl/TBusLeaveServiceImpl.java
View file @
ef1c7e4f
...
@@ -14,8 +14,8 @@ import java.util.List;
...
@@ -14,8 +14,8 @@ import java.util.List;
/**
/**
* B端离职信息表
* B端离职信息表
*
*
* @author
hgw
* @author
: huyc
* @date
2021-08-17 17:02:47
* @date
: 2023/1/13
*/
*/
@Service
(
"tBusLeaveService"
)
@Service
(
"tBusLeaveService"
)
public
class
TBusLeaveServiceImpl
extends
ServiceImpl
<
TBusLeaveMapper
,
TBusLeave
>
implements
TBusLeaveService
{
public
class
TBusLeaveServiceImpl
extends
ServiceImpl
<
TBusLeaveMapper
,
TBusLeave
>
implements
TBusLeaveService
{
...
...
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/service/vacation/impl/TVacationInfoServiceImpl.java
View file @
ef1c7e4f
...
@@ -47,8 +47,8 @@ import java.util.concurrent.locks.ReentrantLock;
...
@@ -47,8 +47,8 @@ import java.util.concurrent.locks.ReentrantLock;
/**
/**
* @description: 假勤信息表 service实现层
* @description: 假勤信息表 service实现层
* @author:
wangweiguo
* @author:
huyc
* @date: 202
1-08-20
* @date: 202
3/1/13
*/
*/
@AllArgsConstructor
@AllArgsConstructor
@Service
@Service
...
@@ -69,8 +69,8 @@ implements TVacationInfoService {
...
@@ -69,8 +69,8 @@ implements TVacationInfoService {
* @description: 分页查询: 条件分页查询
* @description: 分页查询: 条件分页查询
* @param query 查询条件
* @param query 查询条件
* @return: R<IPage<TVacationInfoVO>>
* @return: R<IPage<TVacationInfoVO>>
* @author: wangweiguo
* @author: huyc
* @date: 2021-08-24
* @date: 2023/1/13
*/
*/
@Override
@Override
public
R
<
IPage
<
TVacationInfoVO
>>
getListByPage
(
TVacationInfoQuery
query
)
{
public
R
<
IPage
<
TVacationInfoVO
>>
getListByPage
(
TVacationInfoQuery
query
)
{
...
@@ -84,8 +84,8 @@ implements TVacationInfoService {
...
@@ -84,8 +84,8 @@ implements TVacationInfoService {
* @description: 查询:根据条件出列表
* @description: 查询:根据条件出列表
* @param query 查询条件
* @param query 查询条件
* @return: IPage<com.yifu.cloud.v1.hrobusiness.api.vo.vacation.TVacationInfoVO>>
* @return: IPage<com.yifu.cloud.v1.hrobusiness.api.vo.vacation.TVacationInfoVO>>
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/24
* @date: 2023/1/13
*/
*/
@Override
@Override
public
R
<
List
<
TVacationInfoVO
>>
getList
(
TVacationInfoQuery
query
)
{
public
R
<
List
<
TVacationInfoVO
>>
getList
(
TVacationInfoQuery
query
)
{
...
...
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/service/vacation/impl/TVacationMonitorClearLogServiceImpl.java
View file @
ef1c7e4f
...
@@ -25,8 +25,8 @@ import static com.yifu.cloud.plus.v1.business.util.BusinessResultErrorMsg.*;
...
@@ -25,8 +25,8 @@ import static com.yifu.cloud.plus.v1.business.util.BusinessResultErrorMsg.*;
/**
/**
* @description: 假期监控清零日志表 service实现层
* @description: 假期监控清零日志表 service实现层
* @author:
wangweiguo
* @author:
huyc
* @date: 202
1-08-16
* @date: 202
3/1/13
*/
*/
@Service
@Service
@AllArgsConstructor
@AllArgsConstructor
...
...
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/service/vacation/impl/TVacationMonitorServiceImpl.java
View file @
ef1c7e4f
...
@@ -34,8 +34,8 @@ import java.util.stream.Collectors;
...
@@ -34,8 +34,8 @@ import java.util.stream.Collectors;
/**
/**
* @description: 假期监控表 service实现层
* @description: 假期监控表 service实现层
* @author:
wangweiguo
* @author:
huyc
* @date: 202
1-08-
13
* @date: 202
3/1/
13
*/
*/
@Service
@Service
@AllArgsConstructor
@AllArgsConstructor
...
@@ -50,8 +50,8 @@ implements TVacationMonitorService {
...
@@ -50,8 +50,8 @@ implements TVacationMonitorService {
* @description: 分页查询: 条件分页查询
* @description: 分页查询: 条件分页查询
* @param query 查询条件
* @param query 查询条件
* @return: R<IPage<TVacationMonitorVO>>
* @return: R<IPage<TVacationMonitorVO>>
* @author: wangweiguo
* @author: huyc
* @date: 2021-08-
13
* @date: 2023/1/
13
*/
*/
@Override
@Override
public
R
<
IPage
<
TVacationMonitorVO
>>
getListByPage
(
TVacationMonitorQuery
query
)
{
public
R
<
IPage
<
TVacationMonitorVO
>>
getListByPage
(
TVacationMonitorQuery
query
)
{
...
@@ -68,8 +68,8 @@ implements TVacationMonitorService {
...
@@ -68,8 +68,8 @@ implements TVacationMonitorService {
* @description: 导出:根据查询条件导出
* @description: 导出:根据查询条件导出
* @param query 查询条件
* @param query 查询条件
* @return: R<List<TVacationMonitorVO>>
* @return: R<List<TVacationMonitorVO>>
* @author: wangweiguo
* @author: huyc
* @date: 2021-08-
13
* @date: 2023/1/
13
*/
*/
@Override
@Override
public
R
<
List
<
TVacationMonitorVO
>>
exportByParams
(
TVacationMonitorQuery
query
)
{
public
R
<
List
<
TVacationMonitorVO
>>
exportByParams
(
TVacationMonitorQuery
query
)
{
...
@@ -82,8 +82,8 @@ implements TVacationMonitorService {
...
@@ -82,8 +82,8 @@ implements TVacationMonitorService {
* @description: 保存或者更新监控记录
* @description: 保存或者更新监控记录
* @param entity
* @param entity
* @return: boolean
* @return: boolean
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/16
* @date: 2023/1/13
*/
*/
@Override
@Override
public
boolean
saveOrUpdateData
(
TVacationMonitor
entity
)
{
public
boolean
saveOrUpdateData
(
TVacationMonitor
entity
)
{
...
@@ -95,8 +95,8 @@ implements TVacationMonitorService {
...
@@ -95,8 +95,8 @@ implements TVacationMonitorService {
* @description: 批量保存 OR 新增
* @description: 批量保存 OR 新增
* @param list
* @param list
* @return: boolean
* @return: boolean
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/16
* @date: 2023/1/13
*/
*/
@Override
@Override
public
boolean
batchSaveOrUpdateData
(
List
<
TVacationMonitor
>
list
)
{
public
boolean
batchSaveOrUpdateData
(
List
<
TVacationMonitor
>
list
)
{
...
@@ -113,8 +113,8 @@ implements TVacationMonitorService {
...
@@ -113,8 +113,8 @@ implements TVacationMonitorService {
* @description: 查询-剩余年假:根据身份证号查询剩余年假
* @description: 查询-剩余年假:根据身份证号查询剩余年假
* @param idcard
* @param idcard
* @return: com.yifu.cloud.v1.common.core.util.R<java.math.BigDecimal>
* @return: com.yifu.cloud.v1.common.core.util.R<java.math.BigDecimal>
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/17
* @date: 2023/1/13
*/
*/
@Override
@Override
public
R
<
BigDecimal
>
getNotUsedVacationDurationByIdCard
(
String
idcard
)
{
public
R
<
BigDecimal
>
getNotUsedVacationDurationByIdCard
(
String
idcard
)
{
...
@@ -132,8 +132,8 @@ implements TVacationMonitorService {
...
@@ -132,8 +132,8 @@ implements TVacationMonitorService {
/**
/**
* @description: 定时任务:内部服务调用,每天初始化员工年假信息
* @description: 定时任务:内部服务调用,每天初始化员工年假信息
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/17
* @date: 2023/1/13
*/
*/
@Override
@Override
public
R
<
Boolean
>
buildMonitorData
()
{
public
R
<
Boolean
>
buildMonitorData
()
{
...
@@ -175,8 +175,8 @@ implements TVacationMonitorService {
...
@@ -175,8 +175,8 @@ implements TVacationMonitorService {
/**
/**
* @description: 冗余更新:更新监控表中冗余的员工信息,电信工号和岗位
* @description: 冗余更新:更新监控表中冗余的员工信息,电信工号和岗位
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/2
3
* @date: 2023/1/1
3
*/
*/
@Override
@Override
public
R
<
Boolean
>
updateRedundancyEmployeeFields
(
List
<
UpdateVacationRedundancyDTO
>
dtoList
)
{
public
R
<
Boolean
>
updateRedundancyEmployeeFields
(
List
<
UpdateVacationRedundancyDTO
>
dtoList
)
{
...
@@ -198,8 +198,8 @@ implements TVacationMonitorService {
...
@@ -198,8 +198,8 @@ implements TVacationMonitorService {
* @param vacationDuration 假期时长
* @param vacationDuration 假期时长
* @param year 年份
* @param year 年份
* @return: boolean
* @return: boolean
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/24
* @date: 2023/1/13
*/
*/
@Override
@Override
public
boolean
releaseVacationDuration
(
String
empIdcard
,
BigDecimal
vacationDuration
,
String
year
)
{
public
boolean
releaseVacationDuration
(
String
empIdcard
,
BigDecimal
vacationDuration
,
String
year
)
{
...
@@ -214,8 +214,8 @@ implements TVacationMonitorService {
...
@@ -214,8 +214,8 @@ implements TVacationMonitorService {
* @param vacationDuration 假期时长
* @param vacationDuration 假期时长
* @param year 年份
* @param year 年份
* @return: boolean
* @return: boolean
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/24
* @date: 2023/1/13
*/
*/
@Override
@Override
public
boolean
consumeVacationDuration
(
String
empIdcard
,
BigDecimal
vacationDuration
,
String
year
)
{
public
boolean
consumeVacationDuration
(
String
empIdcard
,
BigDecimal
vacationDuration
,
String
year
)
{
...
@@ -229,8 +229,8 @@ implements TVacationMonitorService {
...
@@ -229,8 +229,8 @@ implements TVacationMonitorService {
* @param empIdcard 身份证号
* @param empIdcard 身份证号
* @param year 假勤年份
* @param year 假勤年份
* @return: com.yifu.cloud.v1.hrobusiness.api.entity.vacation.TVacationMonitor
* @return: com.yifu.cloud.v1.hrobusiness.api.entity.vacation.TVacationMonitor
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/24
* @date: 2023/1/13
*/
*/
@Override
@Override
public
TVacationMonitor
getMonitorByEmpIdcardAndYear
(
String
empIdcard
,
String
year
)
{
public
TVacationMonitor
getMonitorByEmpIdcardAndYear
(
String
empIdcard
,
String
year
)
{
...
@@ -244,8 +244,8 @@ implements TVacationMonitorService {
...
@@ -244,8 +244,8 @@ implements TVacationMonitorService {
* @description: 保存前,属性赋值
* @description: 保存前,属性赋值
* @param entity
* @param entity
* @return: void
* @return: void
* @author: wangweiguo
* @author: huyc
* @date: 2021/8/16
* @date: 2023/1/13
*/
*/
private
void
beforeSaveInit
(
TVacationMonitor
entity
)
{
private
void
beforeSaveInit
(
TVacationMonitor
entity
)
{
if
(
null
!=
entity
)
{
if
(
null
!=
entity
)
{
...
...
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/service/vacation/impl/TVacationRuleConfigServiceImpl.java
View file @
ef1c7e4f
...
@@ -21,8 +21,8 @@ import java.time.temporal.TemporalAdjusters;
...
@@ -21,8 +21,8 @@ import java.time.temporal.TemporalAdjusters;
/**
/**
* @description: 假期配置 service实现层
* @description: 假期配置 service实现层
* @author:
wangweiguo
* @author:
huyc
* @date: 202
1/8
/13
* @date: 202
3/1
/13
*/
*/
@Service
@Service
public
class
TVacationRuleConfigServiceImpl
extends
ServiceImpl
<
TVacationRuleConfigMapper
,
TVacationRuleConfig
>
public
class
TVacationRuleConfigServiceImpl
extends
ServiceImpl
<
TVacationRuleConfigMapper
,
TVacationRuleConfig
>
...
@@ -33,8 +33,8 @@ implements TVacationRuleConfigService {
...
@@ -33,8 +33,8 @@ implements TVacationRuleConfigService {
/**
/**
* @description: 获取年假配置规则
* @description: 获取年假配置规则
* @return: com.yifu.cloud.v1.common.core.util.R<com.yifu.cloud.v1.hrobusiness.api.vo.vacation.VacationRuleConfigVO>
* @return: com.yifu.cloud.v1.common.core.util.R<com.yifu.cloud.v1.hrobusiness.api.vo.vacation.VacationRuleConfigVO>
* @author: wangweiguo
* @author: huyc
* @date: 2021/8
/13
* @date: 2023/1
/13
*/
*/
@Override
@Override
public
R
<
VacationRuleConfigVO
>
getVacationRuleConfig
()
{
public
R
<
VacationRuleConfigVO
>
getVacationRuleConfig
()
{
...
@@ -50,8 +50,8 @@ implements TVacationRuleConfigService {
...
@@ -50,8 +50,8 @@ implements TVacationRuleConfigService {
* @param user
* @param user
* @param dto
* @param dto
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @author: wangweiguo
* @author: huyc
* @date: 2021/8
/13
* @date: 2023/1
/13
*/
*/
@Override
@Override
public
R
<
Boolean
>
addOrSave
(
YifuUser
user
,
AddOrSaveVacationRuleDTO
dto
)
{
public
R
<
Boolean
>
addOrSave
(
YifuUser
user
,
AddOrSaveVacationRuleDTO
dto
)
{
...
@@ -80,8 +80,8 @@ implements TVacationRuleConfigService {
...
@@ -80,8 +80,8 @@ implements TVacationRuleConfigService {
* @description: 根据入职时间返回年假天数
* @description: 根据入职时间返回年假天数
* @param enjoinDate 入职时间
* @param enjoinDate 入职时间
* @return: java.lang.Integer 年假天数
* @return: java.lang.Integer 年假天数
* @author:
wangweiguo
* @author:
huyc
* @date: 202
1/8
/13
* @date: 202
3/1
/13
*/
*/
@Override
@Override
public
Integer
annualLeaveCalculationFormula
(
LocalDateTime
enjoinDate
)
{
public
Integer
annualLeaveCalculationFormula
(
LocalDateTime
enjoinDate
)
{
...
...
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