Skip to content

Y
yifu-mvp
Commit f480da60 authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

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

parents 5ae9e3f1 ef1c7e4f
Show whitespace changes
Inline Side-by-side
Showing with 187 additions and 182 deletions
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/BusinessEmployeeExtendVO.java
View file @ f480da60
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
......@@ -102,11 +103,13 @@ public class BusinessEmployeeExtendVO implements Serializable {
/**
* B端维护的离职时间
*/
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
private LocalDateTime businessLeaveDate;
/**
* B端维护的入职时间
*/
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
private LocalDateTime businessEnjoinDate;
/**
......
yifu-business/yifu-business-api/src/main/java/com/yifu/cloud/plus/v1/business/dto/vacation/AddVacationMonitorClearLogDTO.java
View file @ f480da60
......@@ -24,12 +24,12 @@ public class AddVacationMonitorClearLogDTO implements Serializable {
*/
@NotNull(message = "年假监控id不能为空")
@Schema(description = "年假监控id")
Integer vacationMonitorId;
private String vacationMonitorId;
/**
* 清零说明
*/
@Schema(description = "清零说明")
String clearNote;
private String clearNote;
}
yifu-business/yifu-business-api/src/main/java/com/yifu/cloud/plus/v1/business/entity/vacation/TVacationInfo.java
View file @ f480da60
......@@ -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/TVacationMonitor.java
View file @ f480da60
......@@ -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;
......@@ -18,10 +19,11 @@ import java.time.LocalDateTime;
@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 @ f480da60
......@@ -46,7 +46,7 @@ public class TVacationMonitorClearLog extends Model<TVacationMonitorClearLog> {
/**
* 清零人id
*/
private Integer clearUserId;
private String clearUserId;
/**
* 清零时间
......@@ -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 @ f480da60
......@@ -21,10 +21,10 @@ import java.time.LocalDateTime;
@Data
public class TVacationRuleConfig extends Model<TVacationRuleConfig> {
/**
* 主键
*
*/
@TableId(type = IdType.ASSIGN_ID)
private Integer 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 @ f480da60
......@@ -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 @ f480da60
......@@ -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/java/com/yifu/cloud/plus/v1/business/controller/vacation/TVacationInfoController.java
View file @ f480da60
......@@ -21,8 +21,8 @@ import java.util.List;
/**
* 假勤信息表 controller
* @author: wangweiguo
* @date: 2021-08-20
* @author: huyc
* @date: 2023/1/13
*/
@RestController
@RequiredArgsConstructor
......@@ -36,8 +36,8 @@ public class TVacationInfoController {
* 分页查询: 条件分页查询
* @param query 查询条件
* @return: R<IPage<TVacationInfoVO>>
* @author: wangweiguo
* @date: 2021-08-20
* @author: huyc
* @date: 2023/1/13
*/
@Operation(summary = "分页查询", description = "分页查询")
@GetMapping("/getListByPage")
......@@ -49,8 +49,8 @@ public class TVacationInfoController {
* 导入: 通过json串格式导入假勤信息
* @param jsonStr json字符串数据
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @author: wangweiguo
* @date: 2021/8/24
* @author: huyc
* @date: 2023/1/13
*/
@Operation(summary = "导入: 通过json串格式导入假勤信息", description = "导入: 通过json串格式导入假勤信息")
@PostMapping("/batchImportByJsonStr")
......@@ -62,8 +62,8 @@ public class TVacationInfoController {
* 查询：根据条件出列表
* @param query 查询条件
* @return: IPage<com.yifu.cloud.v1.hrobusiness.api.vo.vacation.TVacationInfoVO>>
* @author: wangweiguo
* @date: 2021/8/24
* @author: huyc
* @date: 2023/1/13
*/
@Operation(summary = "查询：根据条件出列表", description = "查询：根据条件出列表")
@GetMapping("/getList")
......@@ -75,8 +75,8 @@ public class TVacationInfoController {
* 查询-详情：根据id查询数据
* @param id
* @return: R<TVacationInfoVO>
* @author: wangweiguo
* @date: 2021-08-24
* @author: huyc
* @date: 2023/1/13
*/
@Operation(summary = "查询-详情：根据id查询数据", description = "查询-详情：根据id查询数据")
@GetMapping("/{id}")
......@@ -88,8 +88,8 @@ public class TVacationInfoController {
* 添加：新增-单条-添加一条记录
* @param dto
* @return: R<TVacationInfo>
* @author: wangweiguo
* @date: 2021-08-24
* @author: huyc
* @date: 2023/1/13
*/
@Operation(summary = "添加：新增-单条-添加一条记录", description = "添加：新增-单条-添加一条记录")
@PostMapping
......@@ -101,8 +101,8 @@ public class TVacationInfoController {
* 销假：单条-根据id更新记录
* @param dto dto
* @return: R<Boolean>
* @author: wangweiguo
* @date: 2021-08-24
* @author: huyc
* @date: 2023/1/13
*/
@Operation(summary = "销假：单条-根据id更新", description = "销假：单条-根据id更新")
@PostMapping("/vacationEnd/{id}")
......@@ -114,8 +114,8 @@ public class TVacationInfoController {
* 删除-单条：根据id删除记录
* @param id
* @return: R<Boolean>
* @author: wangweiguo
* @date: 2021-08-20
* @author: huyc
* @date: 2023/1/13
*/
@Operation(summary = "根据id删除记录", description = "根据id删除记录")
@DeleteMapping("/{id}")
......@@ -124,9 +124,9 @@ public class TVacationInfoController {
}
/**
* @author wangweiguo
* @description 更新假勤信息中的冗余信息
* @date 20:32 2021/8/24
* @author: huyc
* @date: 2023/1/13
* @param dtoList 更新冗余字段dto集合
* @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 @ f480da60
......@@ -15,8 +15,8 @@ import java.util.List;
/**
* @description: 假期监控清零日志表 controller
* @author: wangweiguo
* @date: 2021-08-16
* @author: huyc
* @date: 2023/1/13
*/
@RestController
@AllArgsConstructor
......@@ -30,12 +30,12 @@ public class TVacationMonitorClearLogController {
* @description: 查询-列表: 查询当前年假所有清零记录
* @param vacationMonitorId 年假监控id
* @return: R<List<TVacationMonitorClearLogVO>>
* @author: wangweiguo
* @date: 2021-08-16
* @author: huyc
* @date: 2023/1/13
*/
@Operation(summary = "查询-列表: 查询当前年假所有清零记录", description = "查询-列表: 查询当前年假所有清零记录")
@GetMapping("/getList")
public R<List<TVacationMonitorClearLogVO>> getList(@RequestParam("vacationMonitorId") @Parameter(description = "年假监控id", required = true) Integer vacationMonitorId) {
public R<List<TVacationMonitorClearLogVO>> getList(@RequestParam("vacationMonitorId") @Parameter(description = "年假监控id", required = true) String vacationMonitorId) {
return this.tVacationMonitorClearLogService.getList(vacationMonitorId);
}
......@@ -43,8 +43,8 @@ public class TVacationMonitorClearLogController {
* @description: 清零说明: 记录年假清零说明
* @param dto
* @return: R<Boolean>
* @author: wangweiguo
* @date: 2021-08-16
* @author: huyc
* @date: 2023/1/13
*/
@Operation(summary = "清零说明: 记录年假清零说明", description = "清零说明: 记录年假清零说明")
@PostMapping("/clearNote")
......
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/controller/vacation/TVacationMonitorController.java
View file @ f480da60
......@@ -18,8 +18,8 @@ import java.util.List;
/**
* @description: 假期监控表 controller
* @author: wangweiguo
* @date: 2021-08-13
* @author: huyc
* @date: 2023/1/13
*/
@Slf4j
@RestController
......@@ -34,8 +34,8 @@ public class TVacationMonitorController {
* @description: 分页查询: 条件分页查询
* @param query 查询条件
* @return: R<IPage<TVacationMonitorVO>>
* @author: wangweiguo
* @date: 2021-08-13
* @author: huyc
* @date: 2023/1/13
*/
@Operation(summary = "分页查询: 条件分页查询", description = "分页查询: 条件分页查询")
@GetMapping("/getListByPage")
......@@ -47,8 +47,8 @@ public class TVacationMonitorController {
* @description: 导出：根据查询条件导出
* @param query 查询条件
* @return: R<List<TVacationMonitorVO>>
* @author: wangweiguo
* @date: 2021-08-13
* @author: huyc
* @date: 2023/1/13
*/
@Operation(summary = "导出：根据查询条件导出", description = "导出：根据查询条件导出")
@GetMapping("/exportByParams")
......@@ -60,8 +60,8 @@ public class TVacationMonitorController {
* @description: 查询-剩余年假：根据身份证号查询剩余年假
* @param idcard
* @return: com.yifu.cloud.v1.common.core.util.R<java.math.BigDecimal>
* @author: wangweiguo
* @date: 2021/8/17
* @author: huyc
* @date: 2023/1/13
*/
@Operation(summary = "查询-剩余年假：根据身份证号查询剩余年假", description = "查询-剩余年假：根据身份证号查询剩余年假")
@GetMapping("getNotUsedVacationDurationByIdCard")
......@@ -72,8 +72,8 @@ public class TVacationMonitorController {
/**
* @description: 定时任务：内部服务调用，每天初始化员工年假信息
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @author: wangweiguo
* @date: 2021/8/17
* @author: huyc
* @date: 2023/1/13
*/
@Inner
@PostMapping("/inner/buildMonitorDataForCurrentYear")
......@@ -84,8 +84,8 @@ public class TVacationMonitorController {
/**
* @description: 冗余更新：更新监控表中冗余的员工信息，电信工号和岗位
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @author: wangweiguo
* @date: 2021/8/23
* @author: huyc
* @date: 2023/1/13
*/
@Inner
@PostMapping("/inner/updateRedundancyEmployeeFields")
......
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/controller/vacation/TVacationRuleConfigController.java
View file @ f480da60
......@@ -16,8 +16,8 @@ import javax.validation.Valid;
/**
* @description: 假期配置controller
* @author: wangweiguo
* @date: 2021/8/13
* @author: huyc
* @date: 2023/1/13
*/
@AllArgsConstructor
@RequestMapping("/vacationRule")
......@@ -30,8 +30,8 @@ public class TVacationRuleConfigController {
/**
* @description: 获取年假配置规则
* @return: com.yifu.cloud.v1.common.core.util.R<com.yifu.cloud.v1.hrobusiness.api.vo.vacation.VacationRuleConfigVO>
* @author: wangweiguo
* @date: 2021/8/13
* @author: huyc
* @date: 2023/1/13
*/
@Operation(summary = "获取年假配置规则", description = "获取年假配置规则")
@GetMapping("/getVacationRuleConfig")
......@@ -47,8 +47,8 @@ public class TVacationRuleConfigController {
* @description:
* @param dto
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @author: wangweiguo
* @date: 2021/8/13
* @author: huyc
* @date: 2023/1/13
*/
@Operation(summary = "新增或保存假期配置规则", description = "新增或保存假期配置规则")
@PostMapping("/addOrSave")
......
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/mapper/vacation/TVacationInfoMapper.java
View file @ f480da60
......@@ -13,8 +13,8 @@ import java.util.List;
/**
* @description: 假勤信息表 mapper
* @Entity com.yifu.cloud.v1.hrobusiness.api.entity.vacation.TVacationInfo
* @author: wangweiguo
* @date: 2021-08-20
* @author: huyc
* @date: 2023/1/13
*/
@Mapper
public interface TVacationInfoMapper extends BaseMapper<TVacationInfo> {
......@@ -23,8 +23,8 @@ public interface TVacationInfoMapper extends BaseMapper<TVacationInfo> {
* @description: 分页查询: 条件分页查询
* @param query 查询条件
* @return: R<IPage<TVacationInfoVO>>
* @author: wangweiguo
* @date: 2021-08-20
* @author: huyc
* @date: 2023/1/13
*/
Page<TVacationInfoVO> getListByPage(Page<TVacationInfoVO> page, @Param("query") TVacationInfoQuery query);
......@@ -32,8 +32,8 @@ public interface TVacationInfoMapper extends BaseMapper<TVacationInfo> {
* @description: 列表查询查询: 条件列表查询
* @param query 查询条件
* @return: List<TVacationInfoVO>
* @author: wangweiguo
* @date: 2021-08-24
* @author: huyc
* @date: 2023/1/13
*/
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 @ f480da60
......@@ -8,8 +8,8 @@ import org.apache.ibatis.annotations.Mapper;
/**
* @description: 假期监控清零日志表 mapper
* @Entity com.yifu.cloud.v1.hrobusiness.api.entity.vacation.TVacationMonitorClearLog
* @author: wangweiguo
* @date: 2021-08-16
* @author: huyc
* @date: 2023/1/13
*/
@Mapper
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 @ f480da60
......@@ -14,8 +14,8 @@ import java.util.List;
/**
* @description: 假期监控表 mapper
* @Entity generator.domain.TVacationMonitor
* @author: wangweiguo
* @date: 2021-08-13
* @author: huyc
* @date: 2023/1/13
*/
@Mapper
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 @ f480da60
......@@ -7,8 +7,8 @@ import org.apache.ibatis.annotations.Mapper;
/**
* @description: 假期配置表mapper
* @Entity generator.domain.TVacationRuleConfig
* @author: wangweiguo
* @date: 2021/8/13
* @author: huyc
* @date: 2023/1/13
*/
@Mapper
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 @ f480da60
......@@ -11,8 +11,8 @@ import java.util.List;
/**
* B端离职信息表
*
* @author hgw
* @date 2021-08-17 17:02:47
* @author: huyc
* @date: 2023/1/13
*/
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 @ f480da60
......@@ -15,8 +15,8 @@ import java.util.List;
/**
* 假勤信息表 service层
* @author: wangweiguo
* @date: 2021-08-20
* @author: huyc
* @date: 2023/1/13
*/
public interface TVacationInfoService extends IService<TVacationInfo> {
......@@ -24,8 +24,8 @@ public interface TVacationInfoService extends IService<TVacationInfo> {
* 分页查询: 条件分页查询
* @param query 查询条件
* @return: R<IPage<TVacationInfoVO>>
* @author: wangweiguo
* @date: 2021-08-20
* @author: huyc
* @date: 2023/1/13
*/
R<IPage<TVacationInfoVO>> getListByPage(TVacationInfoQuery query);
......@@ -33,8 +33,8 @@ public interface TVacationInfoService extends IService<TVacationInfo> {
* 查询：根据条件出列表
* @param query 查询条件
* @return: IPage<com.yifu.cloud.v1.hrobusiness.api.vo.vacation.TVacationInfoVO>>
* @author: wangweiguo
* @date: 2021/8/24
* @author: huyc
* @date: 2023/1/13
*/
R<List<TVacationInfoVO>> getList(TVacationInfoQuery query);
......@@ -42,8 +42,8 @@ public interface TVacationInfoService extends IService<TVacationInfo> {
* 查询-详情：根据id查询数据
* @param id
* @return: R<TVacationInfoVO>
* @author: wangweiguo
* @date: 2021-08-24
* @author: huyc
* @date: 2023/1/13
*/
R<TVacationInfoVO> getDataById(String id);
......@@ -51,8 +51,8 @@ public interface TVacationInfoService extends IService<TVacationInfo> {
* 销假：单条-根据id更新记录
* @param dto dto
* @return: R<Boolean>
* @author: wangweiguo
* @date: 2021-08-24
* @author: huyc
* @date: 2023/1/13
*/
R<Boolean> vacationEnd(ChangeVacationStatusDTO dto);
......@@ -60,8 +60,8 @@ public interface TVacationInfoService extends IService<TVacationInfo> {
* 导入: 通过json串格式导入假勤信息
* @param jsonStr json字符串数据
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @author: wangweiguo
* @date: 2021/8/24
* @author: huyc
* @date: 2023/1/13
*/
R<List<ErrorMessage>> batchImportByJsonStr(String jsonStr);
......@@ -69,8 +69,8 @@ public interface TVacationInfoService extends IService<TVacationInfo> {
* 删除-单条：根据id删除记录
* @param id
* @return: R<Boolean>
* @author: wangweiguo
* @date: 2021-08-20
* @author: huyc
* @date: 2023/1/13
*/
R<Boolean> removeDataById(String id);
......@@ -78,15 +78,15 @@ public interface TVacationInfoService extends IService<TVacationInfo> {
* 添加：新增-单条-添加一条记录
* @param dto
* @return: R<TVacationInfo>
* @author: wangweiguo
* @date: 2021-08-24
* @author: huyc
* @date: 2023/1/13
*/
R<TVacationInfo> saveData(AddOrUpdateTVacationInfoDTO dto);
/**
* @author wangweiguo
* @description 更新假勤信息中的冗余信息
* @date 20:32 2021/8/24
* @author: huyc
* @date: 2023/1/13
* @param dtoList 更新冗余字段dto集合
* @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 @ f480da60
......@@ -11,8 +11,8 @@ import java.util.List;
/**
* @description: 假期监控清零日志表 service层
* @author: wangweiguo
* @date: 2021-08-16
* @author: huyc
* @date: 2023/1/13
*/
public interface TVacationMonitorClearLogService extends IService<TVacationMonitorClearLog> {
......@@ -20,17 +20,17 @@ public interface TVacationMonitorClearLogService extends IService<TVacationMonit
* @description: 查询-列表: 查询当前年假所有清零记录
* @param vacationMonitorId 年假监控id
* @return: R<List<TVacationMonitorClearLogVO>>
* @author: wangweiguo
* @date: 2021-08-16
* @author: huyc
* @date: 2023/1/13
*/
R<List<TVacationMonitorClearLogVO>> getList(Integer vacationMonitorId);
R<List<TVacationMonitorClearLogVO>> getList(String vacationMonitorId);
/**
* @description: 清零说明: 记录年假清零说明
* @param dto
* @return: R<Boolean>
* @author: wangweiguo
* @date: 2021-08-16
* @author: huyc
* @date: 2023/1/13
*/
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 @ f480da60
......@@ -13,8 +13,8 @@ import java.util.List;
/**
* @description: 假期监控表 service层
* @author: wangweiguo
* @date: 2021-08-13
* @author: huyc
* @date: 2023/1/13
*/
public interface TVacationMonitorService extends IService<TVacationMonitor> {
......@@ -22,8 +22,8 @@ public interface TVacationMonitorService extends IService<TVacationMonitor> {
* @description: 分页查询: 条件分页查询
* @param query 查询条件
* @return: R<IPage<TVacationMonitorVO>>
* @author: wangweiguo
* @date: 2021-08-13
* @author: huyc
* @date: 2023/1/13
*/
R<IPage<TVacationMonitorVO>> getListByPage(TVacationMonitorQuery query);
......@@ -31,8 +31,8 @@ public interface TVacationMonitorService extends IService<TVacationMonitor> {
* @description: 导出：根据查询条件导出
* @param query 查询条件
* @return: R<List<TVacationMonitorVO>>
* @author: wangweiguo
* @date: 2021-08-13
* @author: huyc
* @date: 2023/1/13
*/
R<List<TVacationMonitorVO>> exportByParams(TVacationMonitorQuery query);
......@@ -40,8 +40,8 @@ public interface TVacationMonitorService extends IService<TVacationMonitor> {
* @description: 保存或者更新监控记录
* @param entity
* @return: boolean
* @author: wangweiguo
* @date: 2021/8/16
* @author: huyc
* @date: 2023/1/13
*/
boolean saveOrUpdateData(TVacationMonitor entity);
......@@ -49,8 +49,8 @@ public interface TVacationMonitorService extends IService<TVacationMonitor> {
* @description: 批量保存 OR 新增
* @param list
* @return: boolean
* @author: wangweiguo
* @date: 2021/8/16
* @author: huyc
* @date: 2023/1/13
*/
boolean batchSaveOrUpdateData(List<TVacationMonitor> list);
......@@ -58,24 +58,24 @@ public interface TVacationMonitorService extends IService<TVacationMonitor> {
* @description: 查询：根据身份证号查询剩余年假
* @param idcard
* @return: com.yifu.cloud.v1.common.core.util.R<java.math.BigDecimal>
* @author: wangweiguo
* @date: 2021/8/17
* @author: huyc
* @date: 2023/1/13
*/
R<BigDecimal> getNotUsedVacationDurationByIdCard(String idcard);
/**
* @description: 定时任务：内部服务调用，每天初始化员工年假信息
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @author: wangweiguo
* @date: 2021/8/17
* @author: huyc
* @date: 2023/1/13
*/
R<Boolean> buildMonitorData();
/**
* @description: 冗余更新：更新监控表中冗余的员工信息，电信工号和岗位
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @author: wangweiguo
* @date: 2021/8/23
* @author: huyc
* @date: 2023/1/13
*/
R<Boolean> updateRedundancyEmployeeFields(List<UpdateVacationRedundancyDTO> dtoList);
......@@ -85,8 +85,8 @@ public interface TVacationMonitorService extends IService<TVacationMonitor> {
* @param vacationDuration 假期时长
* @param year 年份
* @return: boolean
* @author: wangweiguo
* @date: 2021/8/24
* @author: huyc
* @date: 2023/1/13
*/
boolean releaseVacationDuration(String empIdcard, BigDecimal vacationDuration, String year);
......@@ -96,8 +96,8 @@ public interface TVacationMonitorService extends IService<TVacationMonitor> {
* @param vacationDuration 假期时长
* @param year 年份
* @return: boolean
* @author: wangweiguo
* @date: 2021/8/24
* @author: huyc
* @date: 2023/1/13
*/
boolean consumeVacationDuration(String empIdcard, BigDecimal vacationDuration, String year);
......@@ -106,8 +106,8 @@ public interface TVacationMonitorService extends IService<TVacationMonitor> {
* @param empIdcard 身份证号
* @param year 假勤年份
* @return: com.yifu.cloud.v1.hrobusiness.api.entity.vacation.TVacationMonitor
* @author: wangweiguo
* @date: 2021/8/24
* @author: huyc
* @date: 2023/1/13
*/
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 @ f480da60
......@@ -11,16 +11,16 @@ import java.time.LocalDateTime;
/**
* @description: 假期配置 service
* @author: wangweiguo
* @date: 2021/8/13
* @author: huyc
* @date: 2023/1/13
*/
public interface TVacationRuleConfigService extends IService<TVacationRuleConfig> {
/**
* @description: 获取年假配置规则
* @return: com.yifu.cloud.v1.common.core.util.R<com.yifu.cloud.v1.hrobusiness.api.vo.vacation.VacationRuleConfigVO>
* @author: wangweiguo
* @date: 2021/8/13
* @author: huyc
* @date: 2023/1/13
*/
R<VacationRuleConfigVO> getVacationRuleConfig();
......@@ -29,8 +29,8 @@ public interface TVacationRuleConfigService extends IService<TVacationRuleConfig
* @param user
* @param dto
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @author: wangweiguo
* @date: 2021/8/13
* @author: huyc
* @date: 2023/1/13
*/
R<Boolean> addOrSave(YifuUser user, AddOrSaveVacationRuleDTO dto);
......@@ -38,8 +38,8 @@ public interface TVacationRuleConfigService extends IService<TVacationRuleConfig
* @description: 根据入职时间返回年假天数
* @param enjoinDate 入职时间
* @return: java.lang.Integer 年假天数
* @author: wangweiguo
* @date: 2021/8/13
* @author: huyc
* @date: 2023/1/13
*/
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 @ f480da60
......@@ -14,8 +14,8 @@ import java.util.List;
/**
* B端离职信息表
*
* @author hgw
* @date 2021-08-17 17:02:47
* @author: huyc
* @date: 2023/1/13
*/
@Service("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 @ f480da60
......@@ -47,8 +47,8 @@ import java.util.concurrent.locks.ReentrantLock;
/**
* @description: 假勤信息表 service实现层
* @author: wangweiguo
* @date: 2021-08-20
* @author: huyc
* @date: 2023/1/13
*/
@AllArgsConstructor
@Service
......@@ -69,8 +69,8 @@ implements TVacationInfoService {
* @description: 分页查询: 条件分页查询
* @param query 查询条件
* @return: R<IPage<TVacationInfoVO>>
* @author: wangweiguo
* @date: 2021-08-24
* @author: huyc
* @date: 2023/1/13
*/
@Override
public R<IPage<TVacationInfoVO>> getListByPage(TVacationInfoQuery query) {
......@@ -84,8 +84,8 @@ implements TVacationInfoService {
* @description: 查询：根据条件出列表
* @param query 查询条件
* @return: IPage<com.yifu.cloud.v1.hrobusiness.api.vo.vacation.TVacationInfoVO>>
* @author: wangweiguo
* @date: 2021/8/24
* @author: huyc
* @date: 2023/1/13
*/
@Override
public R<List<TVacationInfoVO>> getList(TVacationInfoQuery query) {
......@@ -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 @ f480da60
......@@ -25,8 +25,8 @@ import static com.yifu.cloud.plus.v1.business.util.BusinessResultErrorMsg.*;
/**
* @description: 假期监控清零日志表 service实现层
* @author: wangweiguo
* @date: 2021-08-16
* @author: huyc
* @date: 2023/1/13
*/
@Service
@AllArgsConstructor
......@@ -43,7 +43,7 @@ implements TVacationMonitorClearLogService {
* @Date: 2023/1/6 11:14
*/
@Override
public R<List<TVacationMonitorClearLogVO>> getList(Integer vacationMonitorId) {
public R<List<TVacationMonitorClearLogVO>> getList(String vacationMonitorId) {
if (vacationMonitorId == null) {
return R.ok(null,VACATION_MONITOR_ID_IS_NOT_NULL);
}
......@@ -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/java/com/yifu/cloud/plus/v1/business/service/vacation/impl/TVacationMonitorServiceImpl.java
View file @ f480da60
......@@ -34,8 +34,8 @@ import java.util.stream.Collectors;
/**
* @description: 假期监控表 service实现层
* @author: wangweiguo
* @date: 2021-08-13
* @author: huyc
* @date: 2023/1/13
*/
@Service
@AllArgsConstructor
......@@ -50,8 +50,8 @@ implements TVacationMonitorService {
* @description: 分页查询: 条件分页查询
* @param query 查询条件
* @return: R<IPage<TVacationMonitorVO>>
* @author: wangweiguo
* @date: 2021-08-13
* @author: huyc
* @date: 2023/1/13
*/
@Override
public R<IPage<TVacationMonitorVO>> getListByPage(TVacationMonitorQuery query) {
......@@ -68,8 +68,8 @@ implements TVacationMonitorService {
* @description: 导出：根据查询条件导出
* @param query 查询条件
* @return: R<List<TVacationMonitorVO>>
* @author: wangweiguo
* @date: 2021-08-13
* @author: huyc
* @date: 2023/1/13
*/
@Override
public R<List<TVacationMonitorVO>> exportByParams(TVacationMonitorQuery query) {
......@@ -82,8 +82,8 @@ implements TVacationMonitorService {
* @description: 保存或者更新监控记录
* @param entity
* @return: boolean
* @author: wangweiguo
* @date: 2021/8/16
* @author: huyc
* @date: 2023/1/13
*/
@Override
public boolean saveOrUpdateData(TVacationMonitor entity) {
......@@ -95,8 +95,8 @@ implements TVacationMonitorService {
* @description: 批量保存 OR 新增
* @param list
* @return: boolean
* @author: wangweiguo
* @date: 2021/8/16
* @author: huyc
* @date: 2023/1/13
*/
@Override
public boolean batchSaveOrUpdateData(List<TVacationMonitor> list) {
......@@ -113,8 +113,8 @@ implements TVacationMonitorService {
* @description: 查询-剩余年假：根据身份证号查询剩余年假
* @param idcard
* @return: com.yifu.cloud.v1.common.core.util.R<java.math.BigDecimal>
* @author: wangweiguo
* @date: 2021/8/17
* @author: huyc
* @date: 2023/1/13
*/
@Override
public R<BigDecimal> getNotUsedVacationDurationByIdCard(String idcard) {
......@@ -132,8 +132,8 @@ implements TVacationMonitorService {
/**
* @description: 定时任务：内部服务调用，每天初始化员工年假信息
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @author: wangweiguo
* @date: 2021/8/17
* @author: huyc
* @date: 2023/1/13
*/
@Override
public R<Boolean> buildMonitorData() {
......@@ -144,7 +144,7 @@ implements TVacationMonitorService {
if (R.isSuccess(listR) && Common.isNotNull(listR.getData()) && Common.isNotNull(listR.getData().getExtendVO())) {
List<BusinessEmployeeExtendVO> list = listR.getData().getExtendVO();
List<TVacationMonitor> collect = list.stream().map(vo -> {
TVacationMonitor monitor = null;
TVacationMonitor monitor;
if (null != vo.getBusinessEnjoinDate()) {
String curentYear = String.valueOf(LocalDate.now().getYear());
monitor = this.lambdaQuery()
......@@ -175,8 +175,8 @@ implements TVacationMonitorService {
/**
* @description: 冗余更新：更新监控表中冗余的员工信息，电信工号和岗位
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @author: wangweiguo
* @date: 2021/8/23
* @author: huyc
* @date: 2023/1/13
*/
@Override
public R<Boolean> updateRedundancyEmployeeFields(List<UpdateVacationRedundancyDTO> dtoList) {
......@@ -198,8 +198,8 @@ implements TVacationMonitorService {
* @param vacationDuration 假期时长
* @param year 年份
* @return: boolean
* @author: wangweiguo
* @date: 2021/8/24
* @author: huyc
* @date: 2023/1/13
*/
@Override
public boolean releaseVacationDuration(String empIdcard, BigDecimal vacationDuration, String year) {
......@@ -214,8 +214,8 @@ implements TVacationMonitorService {
* @param vacationDuration 假期时长
* @param year 年份
* @return: boolean
* @author: wangweiguo
* @date: 2021/8/24
* @author: huyc
* @date: 2023/1/13
*/
@Override
public boolean consumeVacationDuration(String empIdcard, BigDecimal vacationDuration, String year) {
......@@ -229,8 +229,8 @@ implements TVacationMonitorService {
* @param empIdcard 身份证号
* @param year 假勤年份
* @return: com.yifu.cloud.v1.hrobusiness.api.entity.vacation.TVacationMonitor
* @author: wangweiguo
* @date: 2021/8/24
* @author: huyc
* @date: 2023/1/13
*/
@Override
public TVacationMonitor getMonitorByEmpIdcardAndYear(String empIdcard, String year) {
......@@ -244,8 +244,8 @@ implements TVacationMonitorService {
* @description: 保存前，属性赋值
* @param entity
* @return: void
* @author: wangweiguo
* @date: 2021/8/16
* @author: huyc
* @date: 2023/1/13
*/
private void beforeSaveInit(TVacationMonitor 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 @ f480da60
......@@ -21,8 +21,8 @@ import java.time.temporal.TemporalAdjusters;
/**
* @description: 假期配置 service实现层
* @author: wangweiguo
* @date: 2021/8/13
* @author: huyc
* @date: 2023/1/13
*/
@Service
public class TVacationRuleConfigServiceImpl extends ServiceImpl<TVacationRuleConfigMapper, TVacationRuleConfig>
......@@ -33,8 +33,8 @@ implements TVacationRuleConfigService {
/**
* @description: 获取年假配置规则
* @return: com.yifu.cloud.v1.common.core.util.R<com.yifu.cloud.v1.hrobusiness.api.vo.vacation.VacationRuleConfigVO>
* @author: wangweiguo
* @date: 2021/8/13
* @author: huyc
* @date: 2023/1/13
*/
@Override
public R<VacationRuleConfigVO> getVacationRuleConfig() {
......@@ -50,8 +50,8 @@ implements TVacationRuleConfigService {
* @param user
* @param dto
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Boolean>
* @author: wangweiguo
* @date: 2021/8/13
* @author: huyc
* @date: 2023/1/13
*/
@Override
public R<Boolean> addOrSave(YifuUser user, AddOrSaveVacationRuleDTO dto) {
......@@ -80,8 +80,8 @@ implements TVacationRuleConfigService {
* @description: 根据入职时间返回年假天数
* @param enjoinDate 入职时间
* @return: java.lang.Integer 年假天数
* @author: wangweiguo
* @date: 2021/8/13
* @author: huyc
* @date: 2023/1/13
*/
@Override
public Integer annualLeaveCalculationFormula(LocalDateTime enjoinDate) {
......
yifu-business/yifu-business-biz/src/main/resources/mapper/TVacationMonitorClearLogMapper.xml
View file @ f480da60
......@@ -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="INTEGER"/>
<result property="clearUserId" column="CLEAR_USER_ID" jdbcType="VARCHAR"/>
<result property="clearTime" column="CLEAR_TIME" jdbcType="TIMESTAMP"/>
<result property="vacationMonitorId" column="VACATION_MONITOR_ID" jdbcType="INTEGER"/>
</resultMap>
......
yifu-business/yifu-business-biz/src/main/resources/mapper/TVacationRuleConfigMapper.xml
View file @ f480da60
......@@ -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="INTEGER"/>
<id property="id" column="ID" jdbcType="VARCHAR"/>
<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"/>
......
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
View file @ f480da60
......@@ -369,7 +369,7 @@ public class ArchivesDaprUtil {
* @return
**/
public R<TBusinessDataListVo> getNotLeaveExtendList() {
R<TBusinessDataListVo> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/customerBusiness/temployeeBusiness/inner/getNotLeaveExtendList" , "", TBusinessEmployeeExtendInfo.class, SecurityConstants.FROM_IN);
R<TBusinessDataListVo> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/customerBusiness/temployeeBusiness/inner/getNotLeaveExtendList" , "", TBusinessDataListVo.class, SecurityConstants.FROM_IN);
if (Common.isEmpty(res)){
return R.failed("获取所有非离职员工拓展表信息失败！");
}
......
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