Compare commits
8 Commits
f1534f5c08
...
fee01d624f
Author | SHA1 | Date | |
---|---|---|---|
![]() |
fee01d624f | ||
![]() |
219355d61c | ||
![]() |
c036b480a8 | ||
![]() |
6ee977938c | ||
![]() |
06628f8a5e | ||
![]() |
6e96ad104e | ||
![]() |
cb121fd473 | ||
![]() |
aab2bc5d34 |
@ -30,4 +30,8 @@ public interface ErrorCodeConstants {
|
||||
ErrorCode HYSGL_NOT_EXISTS = new ErrorCode(1_011_009_000, "会议室管理不存在");
|
||||
// ========== 领导日程安排 1_011_010_000, ==========
|
||||
ErrorCode RCGL_NOT_EXISTS = new ErrorCode(1_011_010_000, "领导日程安排不存在");
|
||||
// ========== 考勤管理数据 1_011_011_000 ==========
|
||||
ErrorCode KQDATA_NOT_EXISTS = new ErrorCode(1_011_011_000, "考勤管理数据不存在");
|
||||
// ========== 考勤管理 1_011_012_000 ==========
|
||||
ErrorCode KQGL_NOT_EXISTS = new ErrorCode(1_011_012_000, "考勤管理不存在");
|
||||
}
|
||||
|
@ -0,0 +1,95 @@
|
||||
package cn.iocoder.yudao.module.home.controller.admin.kqdata;
|
||||
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import javax.annotation.Resource;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
|
||||
import javax.validation.constraints.*;
|
||||
import javax.validation.*;
|
||||
import javax.servlet.http.*;
|
||||
import java.util.*;
|
||||
import java.io.IOException;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
||||
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
||||
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
||||
|
||||
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
|
||||
|
||||
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
|
||||
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
|
||||
|
||||
import cn.iocoder.yudao.module.home.controller.admin.kqdata.vo.*;
|
||||
import cn.iocoder.yudao.module.home.dal.dataobject.kqdata.KqdataDO;
|
||||
import cn.iocoder.yudao.module.home.service.kqdata.KqdataService;
|
||||
|
||||
@Tag(name = "管理后台 - 考勤数据")
|
||||
@RestController
|
||||
@RequestMapping("/home/kqdata")
|
||||
@Validated
|
||||
public class KqdataController {
|
||||
|
||||
@Resource
|
||||
private KqdataService kqdataService;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建考勤数据")
|
||||
@PreAuthorize("@ss.hasPermission('home:kqdata:create')")
|
||||
public CommonResult<Long> createKqdata(@Valid @RequestBody KqdataSaveReqVO createReqVO) {
|
||||
return success(kqdataService.createKqdata(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新考勤数据")
|
||||
@PreAuthorize("@ss.hasPermission('home:kqdata:update')")
|
||||
public CommonResult<Boolean> updateKqdata(@Valid @RequestBody KqdataSaveReqVO updateReqVO) {
|
||||
kqdataService.updateKqdata(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除考勤数据")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('home:kqdata:delete')")
|
||||
public CommonResult<Boolean> deleteKqdata(@RequestParam("id") Long id) {
|
||||
kqdataService.deleteKqdata(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得考勤数据")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('home:kqdata:query')")
|
||||
public CommonResult<KqdataRespVO> getKqdata(@RequestParam("id") Long id) {
|
||||
KqdataDO kqdata = kqdataService.getKqdata(id);
|
||||
return success(BeanUtils.toBean(kqdata, KqdataRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得考勤数据分页")
|
||||
@PreAuthorize("@ss.hasPermission('home:kqdata:query')")
|
||||
public CommonResult<PageResult<KqdataRespVO>> getKqdataPage(@Valid KqdataPageReqVO pageReqVO) {
|
||||
PageResult<KqdataDO> pageResult = kqdataService.getKqdataPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, KqdataRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出考勤数据 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('home:kqdata:export')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportKqdataExcel(@Valid KqdataPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<KqdataDO> list = kqdataService.getKqdataPage(pageReqVO).getList();
|
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "考勤数据.xls", "数据", KqdataRespVO.class,
|
||||
BeanUtils.toBean(list, KqdataRespVO.class));
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,52 @@
|
||||
package cn.iocoder.yudao.module.home.controller.admin.kqdata.vo;
|
||||
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
||||
@Schema(description = "管理后台 - 考勤数据分页 Request VO")
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
public class KqdataPageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "id", example = "3518")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "员工", example = "赵六")
|
||||
private String userName;
|
||||
|
||||
@Schema(description = "员工id", example = "24276")
|
||||
private Long userId;
|
||||
|
||||
@Schema(description = "部门", example = "李四")
|
||||
private String deptName;
|
||||
|
||||
@Schema(description = "部门id", example = "29100")
|
||||
private Long deptId;
|
||||
|
||||
@Schema(description = "工作状态", example = "2")
|
||||
private String dayStatus;
|
||||
|
||||
@Schema(description = "标识")
|
||||
private Long tokey;
|
||||
|
||||
@Schema(description = "工作天数")
|
||||
private Integer workDay;
|
||||
|
||||
@Schema(description = "加班天数")
|
||||
private Integer overDay;
|
||||
|
||||
@Schema(description = "年班天数")
|
||||
private Integer yoverDay;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] createTime;
|
||||
|
||||
}
|
@ -0,0 +1,59 @@
|
||||
package cn.iocoder.yudao.module.home.controller.admin.kqdata.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import java.time.LocalDateTime;
|
||||
import com.alibaba.excel.annotation.*;
|
||||
|
||||
@Schema(description = "管理后台 - 考勤数据 Response VO")
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class KqdataRespVO {
|
||||
|
||||
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "3518")
|
||||
@ExcelProperty("id")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "员工", example = "赵六")
|
||||
@ExcelProperty("员工")
|
||||
private String userName;
|
||||
|
||||
@Schema(description = "员工id", example = "24276")
|
||||
@ExcelProperty("员工id")
|
||||
private Long userId;
|
||||
|
||||
@Schema(description = "部门", example = "李四")
|
||||
@ExcelProperty("部门")
|
||||
private String deptName;
|
||||
|
||||
@Schema(description = "部门id", example = "29100")
|
||||
@ExcelProperty("部门id")
|
||||
private Long deptId;
|
||||
|
||||
@Schema(description = "工作状态", example = "2")
|
||||
@ExcelProperty("工作状态")
|
||||
private String dayStatus;
|
||||
|
||||
@Schema(description = "标识")
|
||||
@ExcelProperty("标识")
|
||||
private Long tokey;
|
||||
|
||||
@Schema(description = "工作天数")
|
||||
@ExcelProperty("工作天数")
|
||||
private Integer workDay;
|
||||
|
||||
@Schema(description = "加班天数")
|
||||
@ExcelProperty("加班天数")
|
||||
private Integer overDay;
|
||||
|
||||
@Schema(description = "年班天数")
|
||||
@ExcelProperty("年班天数")
|
||||
private Integer yoverDay;
|
||||
|
||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
}
|
@ -0,0 +1,42 @@
|
||||
package cn.iocoder.yudao.module.home.controller.admin.kqdata.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
@Schema(description = "管理后台 - 考勤数据新增/修改 Request VO")
|
||||
@Data
|
||||
public class KqdataSaveReqVO {
|
||||
|
||||
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "3518")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "员工", example = "赵六")
|
||||
private String userName;
|
||||
|
||||
@Schema(description = "员工id", example = "24276")
|
||||
private Long userId;
|
||||
|
||||
@Schema(description = "部门", example = "李四")
|
||||
private String deptName;
|
||||
|
||||
@Schema(description = "部门id", example = "29100")
|
||||
private Long deptId;
|
||||
|
||||
@Schema(description = "工作状态", example = "2")
|
||||
private String dayStatus;
|
||||
|
||||
@Schema(description = "标识")
|
||||
private Long tokey;
|
||||
|
||||
@Schema(description = "工作天数")
|
||||
private Integer workDay;
|
||||
|
||||
@Schema(description = "加班天数")
|
||||
private Integer overDay;
|
||||
|
||||
@Schema(description = "年班天数")
|
||||
private Integer yoverDay;
|
||||
|
||||
}
|
@ -0,0 +1,97 @@
|
||||
package cn.iocoder.yudao.module.home.controller.admin.kqgl;
|
||||
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import javax.annotation.Resource;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
|
||||
import javax.validation.constraints.*;
|
||||
import javax.validation.*;
|
||||
import javax.servlet.http.*;
|
||||
import java.util.*;
|
||||
import java.io.IOException;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
||||
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
||||
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
||||
|
||||
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
|
||||
|
||||
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
|
||||
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
|
||||
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
|
||||
|
||||
import cn.iocoder.yudao.module.home.controller.admin.kqgl.vo.*;
|
||||
import cn.iocoder.yudao.module.home.dal.dataobject.kqgl.KqglDO;
|
||||
import cn.iocoder.yudao.module.home.service.kqgl.KqglService;
|
||||
|
||||
@Tag(name = "管理后台 - 考勤管理")
|
||||
@RestController
|
||||
@RequestMapping("/home/kqgl")
|
||||
@Validated
|
||||
public class KqglController {
|
||||
|
||||
@Resource
|
||||
private KqglService kqglService;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建考勤管理")
|
||||
@PreAuthorize("@ss.hasPermission('home:kqgl:create')")
|
||||
public CommonResult<Long> createKqgl(@Valid @RequestBody KqglSaveReqVO createReqVO) {
|
||||
return success(kqglService.createKqgl(getLoginUserId(), createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新考勤管理")
|
||||
@PreAuthorize("@ss.hasPermission('home:kqgl:update')")
|
||||
public CommonResult<Boolean> updateKqgl(@Valid @RequestBody KqglSaveReqVO updateReqVO) {
|
||||
kqglService.updateKqgl(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除考勤管理")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('home:kqgl:delete')")
|
||||
public CommonResult<Boolean> deleteKqgl(@RequestParam("id") Long id) {
|
||||
kqglService.deleteKqgl(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得考勤管理")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('home:kqgl:query')")
|
||||
public CommonResult<KqglRespVO> getKqgl(@RequestParam("id") Long id) {
|
||||
KqglDO kqgl = kqglService.getKqgl(id);
|
||||
return success(BeanUtils.toBean(kqgl, KqglRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得考勤管理分页")
|
||||
@PreAuthorize("@ss.hasPermission('home:kqgl:query')")
|
||||
public CommonResult<PageResult<KqglRespVO>> getKqglPage(@Valid KqglPageReqVO pageReqVO) {
|
||||
PageResult<KqglDO> pageResult = kqglService.getKqglPage(pageReqVO);
|
||||
// PageResult<KqglDO> pageResult = kqglService.getKqglPage(getLoginUserId(), pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, KqglRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出考勤管理 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('home:kqgl:export')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportKqglExcel(@Valid KqglPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<KqglDO> list = kqglService.getKqglPage(pageReqVO).getList();
|
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "考勤管理.xls", "数据", KqglRespVO.class,
|
||||
BeanUtils.toBean(list, KqglRespVO.class));
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,44 @@
|
||||
package cn.iocoder.yudao.module.home.controller.admin.kqgl.vo;
|
||||
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
||||
@Schema(description = "管理后台 - 考勤管理分页 Request VO")
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
public class KqglPageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "流程状态", example = "1")
|
||||
private Integer status;
|
||||
|
||||
@Schema(description = "id", example = "16688")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "用户id", example = "26505")
|
||||
private Long userId;
|
||||
|
||||
@Schema(description = "用户名字", example = "李四")
|
||||
private String userName;
|
||||
|
||||
@Schema(description = "部门id", example = "18108")
|
||||
private Long deptId;
|
||||
|
||||
@Schema(description = "部门名字", example = "张三")
|
||||
private String deptName;
|
||||
|
||||
@Schema(description = "考勤日期")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] date;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] createTime;
|
||||
|
||||
}
|
@ -0,0 +1,50 @@
|
||||
package cn.iocoder.yudao.module.home.controller.admin.kqgl.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import java.time.LocalDateTime;
|
||||
import com.alibaba.excel.annotation.*;
|
||||
|
||||
@Schema(description = "管理后台 - 考勤管理 Response VO")
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class KqglRespVO {
|
||||
|
||||
@Schema(description = "流程实例的编号", example = "20058")
|
||||
@ExcelProperty("流程实例的编号")
|
||||
private String processInstanceId;
|
||||
|
||||
@Schema(description = "流程状态", example = "1")
|
||||
private Integer status;
|
||||
|
||||
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "16688")
|
||||
@ExcelProperty("id")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "用户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "26505")
|
||||
@ExcelProperty("用户id")
|
||||
private Long userId;
|
||||
|
||||
@Schema(description = "用户名字", example = "李四")
|
||||
@ExcelProperty("用户名字")
|
||||
private String userName;
|
||||
|
||||
@Schema(description = "部门id", requiredMode = Schema.RequiredMode.REQUIRED, example = "18108")
|
||||
@ExcelProperty("部门id")
|
||||
private Long deptId;
|
||||
|
||||
@Schema(description = "部门名字", example = "张三")
|
||||
@ExcelProperty("部门名字")
|
||||
private String deptName;
|
||||
|
||||
@Schema(description = "考勤日期", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("考勤日期")
|
||||
private LocalDateTime date;
|
||||
|
||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
}
|
@ -0,0 +1,38 @@
|
||||
package cn.iocoder.yudao.module.home.controller.admin.kqgl.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import javax.validation.constraints.*;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "管理后台 - 考勤管理新增/修改 Request VO")
|
||||
@Data
|
||||
public class KqglSaveReqVO {
|
||||
|
||||
@Schema(description = "发起人自选审批人 Map", example = "{taskKey1: [1, 2]}")
|
||||
private Map<String, List<Long>> startUserSelectAssignees;
|
||||
|
||||
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "16688")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "用户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "26505")
|
||||
@NotNull(message = "用户id不能为空")
|
||||
private Long userId;
|
||||
|
||||
@Schema(description = "用户名字", example = "李四")
|
||||
private String userName;
|
||||
|
||||
@Schema(description = "部门id", requiredMode = Schema.RequiredMode.REQUIRED, example = "18108")
|
||||
@NotNull(message = "部门id不能为空")
|
||||
private Long deptId;
|
||||
|
||||
@Schema(description = "部门名字", example = "张三")
|
||||
private String deptName;
|
||||
|
||||
@Schema(description = "考勤日期", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@NotNull(message = "考勤日期不能为空")
|
||||
private LocalDateTime date;
|
||||
|
||||
}
|
@ -0,0 +1,67 @@
|
||||
package cn.iocoder.yudao.module.home.dal.dataobject.kqdata;
|
||||
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalDateTime;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||
|
||||
/**
|
||||
* 考勤数据 DO
|
||||
*
|
||||
* @author 君风
|
||||
*/
|
||||
@TableName("oa_kqdata")
|
||||
@KeySequence("oa_kqdata_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class KqdataDO extends BaseDO {
|
||||
|
||||
/**
|
||||
* id
|
||||
*/
|
||||
@TableId
|
||||
private Long id;
|
||||
/**
|
||||
* 员工
|
||||
*/
|
||||
private String userName;
|
||||
/**
|
||||
* 员工id
|
||||
*/
|
||||
private Long userId;
|
||||
/**
|
||||
* 部门
|
||||
*/
|
||||
private String deptName;
|
||||
/**
|
||||
* 部门id
|
||||
*/
|
||||
private Long deptId;
|
||||
/**
|
||||
* 工作状态
|
||||
*/
|
||||
private String dayStatus;
|
||||
/**
|
||||
* 标识
|
||||
*/
|
||||
private Long tokey;
|
||||
/**
|
||||
* 工作天数
|
||||
*/
|
||||
private Integer workDay;
|
||||
/**
|
||||
* 加班天数
|
||||
*/
|
||||
private Integer overDay;
|
||||
/**
|
||||
* 年班天数
|
||||
*/
|
||||
private Integer yoverDay;
|
||||
|
||||
}
|
@ -0,0 +1,68 @@
|
||||
package cn.iocoder.yudao.module.home.dal.dataobject.kqgl;
|
||||
|
||||
import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalDateTime;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||
|
||||
/**
|
||||
* 考勤管理 DO
|
||||
*
|
||||
* @author 君风
|
||||
*/
|
||||
@TableName("oa_kqgl")
|
||||
@KeySequence("oa_kqgl_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class KqglDO extends BaseDO {
|
||||
|
||||
/**
|
||||
* 审批结果
|
||||
* 审批状态
|
||||
* 枚举 {@link BpmTaskStatusEnum}
|
||||
* 考虑到简单,所以直接复用了 BpmProcessInstanceStatusEnum 枚举,也可以自己定义一个枚举哈
|
||||
*/
|
||||
private Integer status;
|
||||
|
||||
/**
|
||||
* 对应的流程编号
|
||||
* 发起的流程的id
|
||||
* 关联 ProcessInstance 的 id 属性
|
||||
*/
|
||||
private String processInstanceId;
|
||||
|
||||
/**
|
||||
* id
|
||||
*/
|
||||
@TableId
|
||||
private Long id;
|
||||
/**
|
||||
* 用户id
|
||||
*/
|
||||
private Long userId;
|
||||
/**
|
||||
* 用户名字
|
||||
*/
|
||||
private String userName;
|
||||
/**
|
||||
* 部门id
|
||||
*/
|
||||
private Long deptId;
|
||||
/**
|
||||
* 部门名字
|
||||
*/
|
||||
private String deptName;
|
||||
/**
|
||||
* 考勤日期
|
||||
*/
|
||||
private LocalDateTime date;
|
||||
|
||||
}
|
@ -0,0 +1,36 @@
|
||||
package cn.iocoder.yudao.module.home.dal.mysql.kqdata;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import cn.iocoder.yudao.module.home.dal.dataobject.kqdata.KqdataDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import cn.iocoder.yudao.module.home.controller.admin.kqdata.vo.*;
|
||||
|
||||
/**
|
||||
* 考勤数据 Mapper
|
||||
*
|
||||
* @author 君风
|
||||
*/
|
||||
@Mapper
|
||||
public interface KqdataMapper extends BaseMapperX<KqdataDO> {
|
||||
|
||||
default PageResult<KqdataDO> selectPage(KqdataPageReqVO reqVO) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<KqdataDO>()
|
||||
.eqIfPresent(KqdataDO::getId, reqVO.getId())
|
||||
.likeIfPresent(KqdataDO::getUserName, reqVO.getUserName())
|
||||
.eqIfPresent(KqdataDO::getUserId, reqVO.getUserId())
|
||||
.likeIfPresent(KqdataDO::getDeptName, reqVO.getDeptName())
|
||||
.eqIfPresent(KqdataDO::getDeptId, reqVO.getDeptId())
|
||||
.eqIfPresent(KqdataDO::getDayStatus, reqVO.getDayStatus())
|
||||
.eqIfPresent(KqdataDO::getTokey, reqVO.getTokey())
|
||||
.eqIfPresent(KqdataDO::getWorkDay, reqVO.getWorkDay())
|
||||
.eqIfPresent(KqdataDO::getOverDay, reqVO.getOverDay())
|
||||
.eqIfPresent(KqdataDO::getYoverDay, reqVO.getYoverDay())
|
||||
.betweenIfPresent(KqdataDO::getCreateTime, reqVO.getCreateTime())
|
||||
.orderByDesc(KqdataDO::getId));
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,43 @@
|
||||
package cn.iocoder.yudao.module.home.dal.mysql.kqgl;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import cn.iocoder.yudao.module.home.dal.dataobject.kqgl.KqglDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import cn.iocoder.yudao.module.home.controller.admin.kqgl.vo.*;
|
||||
|
||||
/**
|
||||
* 考勤管理 Mapper
|
||||
*
|
||||
* @author 君风
|
||||
*/
|
||||
@Mapper
|
||||
public interface KqglMapper extends BaseMapperX<KqglDO> {
|
||||
|
||||
default PageResult<KqglDO> selectPage(KqglPageReqVO reqVO) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<KqglDO>()
|
||||
.eqIfPresent(KqglDO::getId, reqVO.getId())
|
||||
.eqIfPresent(KqglDO::getUserId, reqVO.getUserId())
|
||||
.likeIfPresent(KqglDO::getUserName, reqVO.getUserName())
|
||||
.eqIfPresent(KqglDO::getDeptId, reqVO.getDeptId())
|
||||
.likeIfPresent(KqglDO::getDeptName, reqVO.getDeptName())
|
||||
.betweenIfPresent(KqglDO::getDate, reqVO.getDate())
|
||||
.betweenIfPresent(KqglDO::getCreateTime, reqVO.getCreateTime())
|
||||
.orderByDesc(KqglDO::getId));
|
||||
}
|
||||
default PageResult<KqglDO> selectPage(Long userId, KqglPageReqVO reqVO) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<KqglDO>()
|
||||
.eqIfPresent(KqglDO::getId, reqVO.getId())
|
||||
.eqIfPresent(KqglDO::getUserId, userId)
|
||||
.likeIfPresent(KqglDO::getUserName, reqVO.getUserName())
|
||||
.eqIfPresent(KqglDO::getDeptId, reqVO.getDeptId())
|
||||
.likeIfPresent(KqglDO::getDeptName, reqVO.getDeptName())
|
||||
.betweenIfPresent(KqglDO::getDate, reqVO.getDate())
|
||||
.betweenIfPresent(KqglDO::getCreateTime, reqVO.getCreateTime())
|
||||
.orderByDesc(KqglDO::getId));
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,55 @@
|
||||
package cn.iocoder.yudao.module.home.service.kqdata;
|
||||
|
||||
import java.util.*;
|
||||
import javax.validation.*;
|
||||
import cn.iocoder.yudao.module.home.controller.admin.kqdata.vo.*;
|
||||
import cn.iocoder.yudao.module.home.dal.dataobject.kqdata.KqdataDO;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
|
||||
/**
|
||||
* 考勤数据 Service 接口
|
||||
*
|
||||
* @author 君风
|
||||
*/
|
||||
public interface KqdataService {
|
||||
|
||||
/**
|
||||
* 创建考勤数据
|
||||
*
|
||||
* @param createReqVO 创建信息
|
||||
* @return 编号
|
||||
*/
|
||||
Long createKqdata(@Valid KqdataSaveReqVO createReqVO);
|
||||
|
||||
/**
|
||||
* 更新考勤数据
|
||||
*
|
||||
* @param updateReqVO 更新信息
|
||||
*/
|
||||
void updateKqdata(@Valid KqdataSaveReqVO updateReqVO);
|
||||
|
||||
/**
|
||||
* 删除考勤数据
|
||||
*
|
||||
* @param id 编号
|
||||
*/
|
||||
void deleteKqdata(Long id);
|
||||
|
||||
/**
|
||||
* 获得考勤数据
|
||||
*
|
||||
* @param id 编号
|
||||
* @return 考勤数据
|
||||
*/
|
||||
KqdataDO getKqdata(Long id);
|
||||
|
||||
/**
|
||||
* 获得考勤数据分页
|
||||
*
|
||||
* @param pageReqVO 分页查询
|
||||
* @return 考勤数据分页
|
||||
*/
|
||||
PageResult<KqdataDO> getKqdataPage(KqdataPageReqVO pageReqVO);
|
||||
|
||||
}
|
@ -0,0 +1,74 @@
|
||||
package cn.iocoder.yudao.module.home.service.kqdata;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
import javax.annotation.Resource;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.*;
|
||||
import cn.iocoder.yudao.module.home.controller.admin.kqdata.vo.*;
|
||||
import cn.iocoder.yudao.module.home.dal.dataobject.kqdata.KqdataDO;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
||||
|
||||
import cn.iocoder.yudao.module.home.dal.mysql.kqdata.KqdataMapper;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
|
||||
import static cn.iocoder.yudao.module.home.enums.ErrorCodeConstants.*;
|
||||
|
||||
/**
|
||||
* 考勤数据 Service 实现类
|
||||
*
|
||||
* @author 君风
|
||||
*/
|
||||
@Service
|
||||
@Validated
|
||||
public class KqdataServiceImpl implements KqdataService {
|
||||
|
||||
@Resource
|
||||
private KqdataMapper kqdataMapper;
|
||||
|
||||
@Override
|
||||
public Long createKqdata(KqdataSaveReqVO createReqVO) {
|
||||
// 插入
|
||||
KqdataDO kqdata = BeanUtils.toBean(createReqVO, KqdataDO.class);
|
||||
kqdataMapper.insert(kqdata);
|
||||
// 返回
|
||||
return kqdata.getId();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateKqdata(KqdataSaveReqVO updateReqVO) {
|
||||
// 校验存在
|
||||
validateKqdataExists(updateReqVO.getId());
|
||||
// 更新
|
||||
KqdataDO updateObj = BeanUtils.toBean(updateReqVO, KqdataDO.class);
|
||||
kqdataMapper.updateById(updateObj);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteKqdata(Long id) {
|
||||
// 校验存在
|
||||
validateKqdataExists(id);
|
||||
// 删除
|
||||
kqdataMapper.deleteById(id);
|
||||
}
|
||||
|
||||
private void validateKqdataExists(Long id) {
|
||||
if (kqdataMapper.selectById(id) == null) {
|
||||
throw exception(KQDATA_NOT_EXISTS);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public KqdataDO getKqdata(Long id) {
|
||||
return kqdataMapper.selectById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResult<KqdataDO> getKqdataPage(KqdataPageReqVO pageReqVO) {
|
||||
return kqdataMapper.selectPage(pageReqVO);
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,65 @@
|
||||
package cn.iocoder.yudao.module.home.service.kqgl;
|
||||
|
||||
import java.util.*;
|
||||
import javax.validation.*;
|
||||
import cn.iocoder.yudao.module.home.controller.admin.kqgl.vo.*;
|
||||
import cn.iocoder.yudao.module.home.dal.dataobject.kqgl.KqglDO;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
|
||||
/**
|
||||
* 考勤管理 Service 接口
|
||||
*
|
||||
* @author 君风
|
||||
*/
|
||||
public interface KqglService {
|
||||
|
||||
/**
|
||||
* 创建考勤管理
|
||||
*
|
||||
* @param createReqVO 创建信息
|
||||
* @return 编号
|
||||
*/
|
||||
Long createKqgl(@Valid KqglSaveReqVO createReqVO);
|
||||
Long createKqgl(Long userId, @Valid KqglSaveReqVO createReqVO);
|
||||
|
||||
/**
|
||||
* 更新考勤管理
|
||||
*
|
||||
* @param updateReqVO 更新信息
|
||||
*/
|
||||
void updateKqgl(@Valid KqglSaveReqVO updateReqVO);
|
||||
|
||||
/**
|
||||
* 删除考勤管理
|
||||
*
|
||||
* @param id 编号
|
||||
*/
|
||||
void deleteKqgl(Long id);
|
||||
|
||||
/**
|
||||
* 获得考勤管理
|
||||
*
|
||||
* @param id 编号
|
||||
* @return 考勤管理
|
||||
*/
|
||||
KqglDO getKqgl(Long id);
|
||||
|
||||
/**
|
||||
* 获得考勤管理分页
|
||||
*
|
||||
* @param pageReqVO 分页查询
|
||||
* @return 考勤管理分页
|
||||
*/
|
||||
PageResult<KqglDO> getKqglPage(KqglPageReqVO pageReqVO);
|
||||
PageResult<KqglDO> getKqglPage(Long userId, KqglPageReqVO pageReqVO);
|
||||
|
||||
/**
|
||||
* 更新请假申请的状态
|
||||
*
|
||||
* @param id 编号
|
||||
* @param status 结果
|
||||
*/
|
||||
void updateClglStatus(Long id, Integer status);
|
||||
|
||||
}
|
@ -0,0 +1,114 @@
|
||||
package cn.iocoder.yudao.module.home.service.kqgl;
|
||||
|
||||
import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
|
||||
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
|
||||
import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
|
||||
import cn.iocoder.yudao.module.home.dal.dataobject.clgl.ClglDO;
|
||||
import org.springframework.stereotype.Service;
|
||||
import javax.annotation.Resource;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.*;
|
||||
import cn.iocoder.yudao.module.home.controller.admin.kqgl.vo.*;
|
||||
import cn.iocoder.yudao.module.home.dal.dataobject.kqgl.KqglDO;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
||||
|
||||
import cn.iocoder.yudao.module.home.dal.mysql.kqgl.KqglMapper;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
|
||||
import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.KNOWLEDGE_NOT_EXISTS;
|
||||
import static cn.iocoder.yudao.module.home.enums.ErrorCodeConstants.*;
|
||||
|
||||
/**
|
||||
* 考勤管理 Service 实现类
|
||||
*
|
||||
* @author 君风
|
||||
*/
|
||||
@Service
|
||||
@Validated
|
||||
public class KqglServiceImpl implements KqglService {
|
||||
public static final String PROCESS_KEY = "kqgl-001";
|
||||
@Resource
|
||||
private KqglMapper kqglMapper;
|
||||
@Resource
|
||||
private BpmProcessInstanceApi processInstanceApi;
|
||||
|
||||
@Override
|
||||
public Long createKqgl(Long userId, KqglSaveReqVO createReqVO) {
|
||||
// 插入
|
||||
KqglDO kqgl = BeanUtils.toBean(createReqVO, KqglDO.class)
|
||||
.setUserId(userId).setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
|
||||
kqglMapper.insert(kqgl);
|
||||
Map<String, Object> processInstanceVariables = new HashMap<>();
|
||||
String processInstanceId = processInstanceApi.createProcessInstance(userId,
|
||||
new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY)
|
||||
.setVariables(processInstanceVariables).setBusinessKey(String.valueOf(kqgl.getId()))
|
||||
.setStartUserSelectAssignees(createReqVO.getStartUserSelectAssignees()));
|
||||
// 将工作流的编号,更新到 OA 请假单中
|
||||
kqglMapper.updateById(new KqglDO().setId(kqgl.getId()).setProcessInstanceId(processInstanceId));
|
||||
// 返回
|
||||
return kqgl.getId();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Long createKqgl(KqglSaveReqVO createReqVO) {
|
||||
// 插入
|
||||
KqglDO kqgl = BeanUtils.toBean(createReqVO, KqglDO.class);
|
||||
kqglMapper.insert(kqgl);
|
||||
// 返回
|
||||
return kqgl.getId();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateKqgl(KqglSaveReqVO updateReqVO) {
|
||||
// 校验存在
|
||||
validateKqglExists(updateReqVO.getId());
|
||||
// 更新
|
||||
KqglDO updateObj = BeanUtils.toBean(updateReqVO, KqglDO.class);
|
||||
kqglMapper.updateById(updateObj);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteKqgl(Long id) {
|
||||
// 校验存在
|
||||
validateKqglExists(id);
|
||||
// 删除
|
||||
kqglMapper.deleteById(id);
|
||||
}
|
||||
|
||||
private void validateKqglExists(Long id) {
|
||||
if (kqglMapper.selectById(id) == null) {
|
||||
throw exception(KQGL_NOT_EXISTS);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public KqglDO getKqgl(Long id) {
|
||||
return kqglMapper.selectById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResult<KqglDO> getKqglPage(KqglPageReqVO pageReqVO) {
|
||||
return kqglMapper.selectPage(pageReqVO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResult<KqglDO> getKqglPage(Long userId,KqglPageReqVO pageReqVO) {
|
||||
return kqglMapper.selectPage(userId, pageReqVO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateClglStatus(Long id, Integer status) {
|
||||
validateLeaveExists(id);
|
||||
kqglMapper.updateById(new KqglDO().setId(id).setStatus(status));
|
||||
}
|
||||
private void validateLeaveExists(Long id) {
|
||||
if (kqglMapper.selectById(id) == null) {
|
||||
throw exception(KNOWLEDGE_NOT_EXISTS);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,26 @@
|
||||
package cn.iocoder.yudao.module.home.service.kqgl.listener;
|
||||
|
||||
import cn.iocoder.yudao.module.bpm.event.BpmProcessInstanceStatusEvent;
|
||||
import cn.iocoder.yudao.module.bpm.event.BpmProcessInstanceStatusEventListener;
|
||||
import cn.iocoder.yudao.module.home.service.kqgl.KqglService;
|
||||
import cn.iocoder.yudao.module.home.service.kqgl.KqglServiceImpl;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
@Component
|
||||
public class BpmKqglStatusListener extends BpmProcessInstanceStatusEventListener {
|
||||
|
||||
@Resource
|
||||
private KqglService kqglService;
|
||||
|
||||
@Override
|
||||
protected String getProcessDefinitionKey() {
|
||||
return KqglServiceImpl.PROCESS_KEY;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onEvent(BpmProcessInstanceStatusEvent event) {
|
||||
kqglService.updateClglStatus(Long.parseLong(event.getBusinessKey()), event.getStatus());
|
||||
}
|
||||
}
|
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="cn.iocoder.yudao.module.home.dal.mysql.kqdata.KqdataMapper">
|
||||
|
||||
<!--
|
||||
一般情况下,尽可能使用 Mapper 进行 CRUD 增删改查即可。
|
||||
无法满足的场景,例如说多表关联查询,才使用 XML 编写 SQL。
|
||||
代码生成器暂时只生成 Mapper XML 文件本身,更多推荐 MybatisX 快速开发插件来生成查询。
|
||||
文档可见:https://www.iocoder.cn/MyBatis/x-plugins/
|
||||
-->
|
||||
|
||||
</mapper>
|
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="cn.iocoder.yudao.module.home.dal.mysql.kqgl.KqglMapper">
|
||||
|
||||
<!--
|
||||
一般情况下,尽可能使用 Mapper 进行 CRUD 增删改查即可。
|
||||
无法满足的场景,例如说多表关联查询,才使用 XML 编写 SQL。
|
||||
代码生成器暂时只生成 Mapper XML 文件本身,更多推荐 MybatisX 快速开发插件来生成查询。
|
||||
文档可见:https://www.iocoder.cn/MyBatis/x-plugins/
|
||||
-->
|
||||
|
||||
</mapper>
|
@ -0,0 +1,170 @@
|
||||
package cn.iocoder.yudao.module.home.service.kqdata;
|
||||
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.boot.test.mock.mockito.MockBean;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
|
||||
|
||||
import cn.iocoder.yudao.module.home.controller.admin.kqdata.vo.*;
|
||||
import cn.iocoder.yudao.module.home.dal.dataobject.kqdata.KqdataDO;
|
||||
import cn.iocoder.yudao.module.home.dal.mysql.kqdata.KqdataMapper;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import org.springframework.context.annotation.Import;
|
||||
import java.util.*;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static cn.hutool.core.util.RandomUtil.*;
|
||||
import static cn.iocoder.yudao.module.home.enums.ErrorCodeConstants.*;
|
||||
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
|
||||
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
|
||||
import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.*;
|
||||
import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*;
|
||||
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
/**
|
||||
* {@link KqdataServiceImpl} 的单元测试类
|
||||
*
|
||||
* @author 君风
|
||||
*/
|
||||
@Import(KqdataServiceImpl.class)
|
||||
public class KqdataServiceImplTest extends BaseDbUnitTest {
|
||||
|
||||
@Resource
|
||||
private KqdataServiceImpl kqdataService;
|
||||
|
||||
@Resource
|
||||
private KqdataMapper kqdataMapper;
|
||||
|
||||
@Test
|
||||
public void testCreateKqdata_success() {
|
||||
// 准备参数
|
||||
KqdataSaveReqVO createReqVO = randomPojo(KqdataSaveReqVO.class).setId(null);
|
||||
|
||||
// 调用
|
||||
Long kqdataId = kqdataService.createKqdata(createReqVO);
|
||||
// 断言
|
||||
assertNotNull(kqdataId);
|
||||
// 校验记录的属性是否正确
|
||||
KqdataDO kqdata = kqdataMapper.selectById(kqdataId);
|
||||
assertPojoEquals(createReqVO, kqdata, "id");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUpdateKqdata_success() {
|
||||
// mock 数据
|
||||
KqdataDO dbKqdata = randomPojo(KqdataDO.class);
|
||||
kqdataMapper.insert(dbKqdata);// @Sql: 先插入出一条存在的数据
|
||||
// 准备参数
|
||||
KqdataSaveReqVO updateReqVO = randomPojo(KqdataSaveReqVO.class, o -> {
|
||||
o.setId(dbKqdata.getId()); // 设置更新的 ID
|
||||
});
|
||||
|
||||
// 调用
|
||||
kqdataService.updateKqdata(updateReqVO);
|
||||
// 校验是否更新正确
|
||||
KqdataDO kqdata = kqdataMapper.selectById(updateReqVO.getId()); // 获取最新的
|
||||
assertPojoEquals(updateReqVO, kqdata);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUpdateKqdata_notExists() {
|
||||
// 准备参数
|
||||
KqdataSaveReqVO updateReqVO = randomPojo(KqdataSaveReqVO.class);
|
||||
|
||||
// 调用, 并断言异常
|
||||
assertServiceException(() -> kqdataService.updateKqdata(updateReqVO), KQDATA_NOT_EXISTS);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testDeleteKqdata_success() {
|
||||
// mock 数据
|
||||
KqdataDO dbKqdata = randomPojo(KqdataDO.class);
|
||||
kqdataMapper.insert(dbKqdata);// @Sql: 先插入出一条存在的数据
|
||||
// 准备参数
|
||||
Long id = dbKqdata.getId();
|
||||
|
||||
// 调用
|
||||
kqdataService.deleteKqdata(id);
|
||||
// 校验数据不存在了
|
||||
assertNull(kqdataMapper.selectById(id));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testDeleteKqdata_notExists() {
|
||||
// 准备参数
|
||||
Long id = randomLongId();
|
||||
|
||||
// 调用, 并断言异常
|
||||
assertServiceException(() -> kqdataService.deleteKqdata(id), KQDATA_NOT_EXISTS);
|
||||
}
|
||||
|
||||
@Test
|
||||
@Disabled // TODO 请修改 null 为需要的值,然后删除 @Disabled 注解
|
||||
public void testGetKqdataPage() {
|
||||
// mock 数据
|
||||
KqdataDO dbKqdata = randomPojo(KqdataDO.class, o -> { // 等会查询到
|
||||
o.setId(null);
|
||||
o.setUserName(null);
|
||||
o.setUserId(null);
|
||||
o.setDeptName(null);
|
||||
o.setDeptId(null);
|
||||
o.setDayStatus(null);
|
||||
o.setKey(null);
|
||||
o.setWorkDay(null);
|
||||
o.setOverDay(null);
|
||||
o.setYoverDay(null);
|
||||
o.setCreateTime(null);
|
||||
});
|
||||
kqdataMapper.insert(dbKqdata);
|
||||
// 测试 id 不匹配
|
||||
kqdataMapper.insert(cloneIgnoreId(dbKqdata, o -> o.setId(null)));
|
||||
// 测试 userName 不匹配
|
||||
kqdataMapper.insert(cloneIgnoreId(dbKqdata, o -> o.setUserName(null)));
|
||||
// 测试 userId 不匹配
|
||||
kqdataMapper.insert(cloneIgnoreId(dbKqdata, o -> o.setUserId(null)));
|
||||
// 测试 deptName 不匹配
|
||||
kqdataMapper.insert(cloneIgnoreId(dbKqdata, o -> o.setDeptName(null)));
|
||||
// 测试 deptId 不匹配
|
||||
kqdataMapper.insert(cloneIgnoreId(dbKqdata, o -> o.setDeptId(null)));
|
||||
// 测试 dayStatus 不匹配
|
||||
kqdataMapper.insert(cloneIgnoreId(dbKqdata, o -> o.setDayStatus(null)));
|
||||
// 测试 key 不匹配
|
||||
kqdataMapper.insert(cloneIgnoreId(dbKqdata, o -> o.setKey(null)));
|
||||
// 测试 workDay 不匹配
|
||||
kqdataMapper.insert(cloneIgnoreId(dbKqdata, o -> o.setWorkDay(null)));
|
||||
// 测试 overDay 不匹配
|
||||
kqdataMapper.insert(cloneIgnoreId(dbKqdata, o -> o.setOverDay(null)));
|
||||
// 测试 yoverDay 不匹配
|
||||
kqdataMapper.insert(cloneIgnoreId(dbKqdata, o -> o.setYoverDay(null)));
|
||||
// 测试 createTime 不匹配
|
||||
kqdataMapper.insert(cloneIgnoreId(dbKqdata, o -> o.setCreateTime(null)));
|
||||
// 准备参数
|
||||
KqdataPageReqVO reqVO = new KqdataPageReqVO();
|
||||
reqVO.setId(null);
|
||||
reqVO.setUserName(null);
|
||||
reqVO.setUserId(null);
|
||||
reqVO.setDeptName(null);
|
||||
reqVO.setDeptId(null);
|
||||
reqVO.setDayStatus(null);
|
||||
reqVO.setKey(null);
|
||||
reqVO.setWorkDay(null);
|
||||
reqVO.setOverDay(null);
|
||||
reqVO.setYoverDay(null);
|
||||
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
|
||||
|
||||
// 调用
|
||||
PageResult<KqdataDO> pageResult = kqdataService.getKqdataPage(reqVO);
|
||||
// 断言
|
||||
assertEquals(1, pageResult.getTotal());
|
||||
assertEquals(1, pageResult.getList().size());
|
||||
assertPojoEquals(dbKqdata, pageResult.getList().get(0));
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,154 @@
|
||||
package cn.iocoder.yudao.module.home.service.kqgl;
|
||||
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.boot.test.mock.mockito.MockBean;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
|
||||
|
||||
import cn.iocoder.yudao.module.home.controller.admin.kqgl.vo.*;
|
||||
import cn.iocoder.yudao.module.home.dal.dataobject.kqgl.KqglDO;
|
||||
import cn.iocoder.yudao.module.home.dal.mysql.kqgl.KqglMapper;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import org.springframework.context.annotation.Import;
|
||||
import java.util.*;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static cn.hutool.core.util.RandomUtil.*;
|
||||
import static cn.iocoder.yudao.module.home.enums.ErrorCodeConstants.*;
|
||||
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
|
||||
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
|
||||
import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.*;
|
||||
import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*;
|
||||
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
/**
|
||||
* {@link KqglServiceImpl} 的单元测试类
|
||||
*
|
||||
* @author 君风
|
||||
*/
|
||||
@Import(KqglServiceImpl.class)
|
||||
public class KqglServiceImplTest extends BaseDbUnitTest {
|
||||
|
||||
@Resource
|
||||
private KqglServiceImpl kqglService;
|
||||
|
||||
@Resource
|
||||
private KqglMapper kqglMapper;
|
||||
|
||||
@Test
|
||||
public void testCreateKqgl_success() {
|
||||
// 准备参数
|
||||
KqglSaveReqVO createReqVO = randomPojo(KqglSaveReqVO.class).setId(null);
|
||||
|
||||
// 调用
|
||||
Long kqglId = kqglService.createKqgl(createReqVO);
|
||||
// 断言
|
||||
assertNotNull(kqglId);
|
||||
// 校验记录的属性是否正确
|
||||
KqglDO kqgl = kqglMapper.selectById(kqglId);
|
||||
assertPojoEquals(createReqVO, kqgl, "id");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUpdateKqgl_success() {
|
||||
// mock 数据
|
||||
KqglDO dbKqgl = randomPojo(KqglDO.class);
|
||||
kqglMapper.insert(dbKqgl);// @Sql: 先插入出一条存在的数据
|
||||
// 准备参数
|
||||
KqglSaveReqVO updateReqVO = randomPojo(KqglSaveReqVO.class, o -> {
|
||||
o.setId(dbKqgl.getId()); // 设置更新的 ID
|
||||
});
|
||||
|
||||
// 调用
|
||||
kqglService.updateKqgl(updateReqVO);
|
||||
// 校验是否更新正确
|
||||
KqglDO kqgl = kqglMapper.selectById(updateReqVO.getId()); // 获取最新的
|
||||
assertPojoEquals(updateReqVO, kqgl);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUpdateKqgl_notExists() {
|
||||
// 准备参数
|
||||
KqglSaveReqVO updateReqVO = randomPojo(KqglSaveReqVO.class);
|
||||
|
||||
// 调用, 并断言异常
|
||||
assertServiceException(() -> kqglService.updateKqgl(updateReqVO), KQGL_NOT_EXISTS);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testDeleteKqgl_success() {
|
||||
// mock 数据
|
||||
KqglDO dbKqgl = randomPojo(KqglDO.class);
|
||||
kqglMapper.insert(dbKqgl);// @Sql: 先插入出一条存在的数据
|
||||
// 准备参数
|
||||
Long id = dbKqgl.getId();
|
||||
|
||||
// 调用
|
||||
kqglService.deleteKqgl(id);
|
||||
// 校验数据不存在了
|
||||
assertNull(kqglMapper.selectById(id));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testDeleteKqgl_notExists() {
|
||||
// 准备参数
|
||||
Long id = randomLongId();
|
||||
|
||||
// 调用, 并断言异常
|
||||
assertServiceException(() -> kqglService.deleteKqgl(id), KQGL_NOT_EXISTS);
|
||||
}
|
||||
|
||||
@Test
|
||||
@Disabled // TODO 请修改 null 为需要的值,然后删除 @Disabled 注解
|
||||
public void testGetKqglPage() {
|
||||
// mock 数据
|
||||
KqglDO dbKqgl = randomPojo(KqglDO.class, o -> { // 等会查询到
|
||||
o.setId(null);
|
||||
o.setUserId(null);
|
||||
o.setUserName(null);
|
||||
o.setDeptId(null);
|
||||
o.setDeptName(null);
|
||||
o.setDate(null);
|
||||
o.setCreateTime(null);
|
||||
});
|
||||
kqglMapper.insert(dbKqgl);
|
||||
// 测试 id 不匹配
|
||||
kqglMapper.insert(cloneIgnoreId(dbKqgl, o -> o.setId(null)));
|
||||
// 测试 userId 不匹配
|
||||
kqglMapper.insert(cloneIgnoreId(dbKqgl, o -> o.setUserId(null)));
|
||||
// 测试 userName 不匹配
|
||||
kqglMapper.insert(cloneIgnoreId(dbKqgl, o -> o.setUserName(null)));
|
||||
// 测试 deptId 不匹配
|
||||
kqglMapper.insert(cloneIgnoreId(dbKqgl, o -> o.setDeptId(null)));
|
||||
// 测试 deptName 不匹配
|
||||
kqglMapper.insert(cloneIgnoreId(dbKqgl, o -> o.setDeptName(null)));
|
||||
// 测试 date 不匹配
|
||||
kqglMapper.insert(cloneIgnoreId(dbKqgl, o -> o.setDate(null)));
|
||||
// 测试 createTime 不匹配
|
||||
kqglMapper.insert(cloneIgnoreId(dbKqgl, o -> o.setCreateTime(null)));
|
||||
// 准备参数
|
||||
KqglPageReqVO reqVO = new KqglPageReqVO();
|
||||
reqVO.setId(null);
|
||||
reqVO.setUserId(null);
|
||||
reqVO.setUserName(null);
|
||||
reqVO.setDeptId(null);
|
||||
reqVO.setDeptName(null);
|
||||
reqVO.setDate(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
|
||||
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
|
||||
|
||||
// 调用
|
||||
PageResult<KqglDO> pageResult = kqglService.getKqglPage(reqVO);
|
||||
// 断言
|
||||
assertEquals(1, pageResult.getTotal());
|
||||
assertEquals(1, pageResult.getList().size());
|
||||
assertPojoEquals(dbKqgl, pageResult.getList().get(0));
|
||||
}
|
||||
|
||||
}
|
@ -7,3 +7,5 @@ DELETE FROM "oa_jbgl";
|
||||
DELETE FROM "oa_hygl";
|
||||
DELETE FROM "oa_hysgl";
|
||||
DELETE FROM "oa_rcgl";
|
||||
DELETE FROM "oa_kqdata";
|
||||
DELETE FROM "oa_kqgl";
|
||||
|
@ -206,3 +206,37 @@ CREATE TABLE IF NOT EXISTS "oa_rcgl" (
|
||||
"tenant_id" bigint NOT NULL,
|
||||
PRIMARY KEY ("id")
|
||||
) COMMENT '领导日程安排表';
|
||||
CREATE TABLE IF NOT EXISTS "oa_kqdata" (
|
||||
"id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
|
||||
"user_name" varchar,
|
||||
"user_id" bigint,
|
||||
"dept_name" varchar,
|
||||
"dept_id" bigint,
|
||||
"day_status" varchar,
|
||||
"key" int,
|
||||
"work_day" int,
|
||||
"over_day" int,
|
||||
"yover_day" int,
|
||||
"creator" varchar DEFAULT '',
|
||||
"create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
"updater" varchar DEFAULT '',
|
||||
"update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
||||
"deleted" bit NOT NULL DEFAULT FALSE,
|
||||
"tenant_id" bigint NOT NULL,
|
||||
PRIMARY KEY ("id")
|
||||
) COMMENT '考勤管理数据表';
|
||||
CREATE TABLE IF NOT EXISTS "oa_kqgl" (
|
||||
"id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
|
||||
"user_id" bigint NOT NULL,
|
||||
"user_name" varchar,
|
||||
"dept_id" bigint NOT NULL,
|
||||
"dept_name" varchar,
|
||||
"date" varchar NOT NULL,
|
||||
"creator" varchar DEFAULT '',
|
||||
"create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
"updater" varchar DEFAULT '',
|
||||
"update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
||||
"deleted" bit NOT NULL DEFAULT FALSE,
|
||||
"tenant_id" bigint NOT NULL,
|
||||
PRIMARY KEY ("id")
|
||||
) COMMENT '考勤管理表';
|
||||
|
@ -103,6 +103,21 @@ public class UserController {
|
||||
pageResult.getTotal()));
|
||||
}
|
||||
|
||||
@GetMapping("/pageKQ")
|
||||
@Operation(summary = "获得用户分页列表")
|
||||
public CommonResult<PageResult<UserRespVO>> getUserPageKQ(@Valid UserPageReqVO pageReqVO) {
|
||||
// 获得用户分页列表
|
||||
PageResult<AdminUserDO> pageResult = userService.getUserPage(pageReqVO);
|
||||
if (CollUtil.isEmpty(pageResult.getList())) {
|
||||
return success(new PageResult<>(pageResult.getTotal()));
|
||||
}
|
||||
// 拼接数据
|
||||
Map<Long, DeptDO> deptMap = deptService.getDeptMap(
|
||||
convertList(pageResult.getList(), AdminUserDO::getDeptId));
|
||||
return success(new PageResult<>(UserConvert.INSTANCE.convertList(pageResult.getList(), deptMap),
|
||||
pageResult.getTotal()));
|
||||
}
|
||||
|
||||
@GetMapping({"/list-all-simple", "/simple-list"})
|
||||
@Operation(summary = "获取用户精简信息列表", description = "只包含被开启的用户,主要用于前端的下拉选项")
|
||||
public CommonResult<List<UserSimpleRespVO>> getSimpleUserList() {
|
||||
|
Loading…
Reference in New Issue
Block a user