yudao-team/oa-master
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'
Some checks are pending
Java CI with Maven / build (11) (push) Waiting to run
Details
Java CI with Maven / build (17) (push) Waiting to run
Details
Java CI with Maven / build (8) (push) Waiting to run
Details
yudao-ui-admin CI / build (14.x) (push) Waiting to run
Details
yudao-ui-admin CI / build (16.x) (push) Waiting to run
Details

Browse Source
This commit is contained in:
Pancaihua 2024-11-07 23:25:22 +08:00
commit f8d45b00df
17 changed files with 904 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-home/yudao-module-home-api/src/main/java/cn/iocoder/yudao/module/home/enums/ErrorCodeConstants.java
View File

@ -22,4 +22,6 @@ public interface ErrorCodeConstants {
ErrorCode CLGL_NOT_EXISTS = new ErrorCode(1_011_004_000, "车辆管理不存在");
// ========== 办公用品管理 1_011_005_000 ==========
ErrorCode BGYP_NOT_EXISTS = new ErrorCode(1_011_005_000, "办公用品管理不存在");
// ========== 加班管理 1_011_006_000 ==========
ErrorCode JBGL_NOT_EXISTS = new ErrorCode(1_011_006_000, "加班管理不存在");
}

2
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/vo/ClglSaveReqVO.java
View File

@ -15,7 +15,7 @@ public class ClglSaveReqVO {
private Map<String, List<Long>> startUserSelectAssignees;
@AssertTrue(message = "结束时间，需要在开始时间之后")
public boolean isEndTimeValid2() {
public boolean isEndTimeValid() {
return !getCarEnd().isBefore(getCarStart());
}

97
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/jbgl/JbglController.java Normal file
View File

@ -0,0 +1,97 @@
package cn.iocoder.yudao.module.home.controller.admin.jbgl;
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.jbgl.vo.*;
import cn.iocoder.yudao.module.home.dal.dataobject.jbgl.JbglDO;
import cn.iocoder.yudao.module.home.service.jbgl.JbglService;
@Tag(name = "管理后台 - 加班管理")
@RestController
@RequestMapping("/home/jbgl")
@Validated
public class JbglController {
@Resource
private JbglService jbglService;
@PostMapping("/create")
@Operation(summary = "创建加班管理")
@PreAuthorize("@ss.hasPermission('home:jbgl:create')")
public CommonResult<Long> createJbgl(@Valid @RequestBody JbglSaveReqVO createReqVO) {
return success(jbglService.createJbgl(getLoginUserId(),createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新加班管理")
@PreAuthorize("@ss.hasPermission('home:jbgl:update')")
public CommonResult<Boolean> updateJbgl(@Valid @RequestBody JbglSaveReqVO updateReqVO) {
jbglService.updateJbgl(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除加班管理")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('home:jbgl:delete')")
public CommonResult<Boolean> deleteJbgl(@RequestParam("id") Long id) {
jbglService.deleteJbgl(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得加班管理")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('home:jbgl:query')")
public CommonResult<JbglRespVO> getJbgl(@RequestParam("id") Long id) {
JbglDO jbgl = jbglService.getJbgl(id);
return success(BeanUtils.toBean(jbgl, JbglRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得加班管理分页")
@PreAuthorize("@ss.hasPermission('home:jbgl:query')")
public CommonResult<PageResult<JbglRespVO>> getJbglPage(@Valid JbglPageReqVO pageReqVO) {
PageResult<JbglDO> pageResult = jbglService.getJbglPage(pageReqVO);
// PageResult<JbglDO> pageResult = jbglService.getJbglPage(getLoginUserId(), pageReqVO);
return success(BeanUtils.toBean(pageResult, JbglRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出加班管理 Excel")
@PreAuthorize("@ss.hasPermission('home:jbgl:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportJbglExcel(@Valid JbglPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<JbglDO> list = jbglService.getJbglPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "加班管理.xls", "数据", JbglRespVO.class,
BeanUtils.toBean(list, JbglRespVO.class));
}
}

67
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/jbgl/vo/JbglPageReqVO.java Normal file
View File

@ -0,0 +1,67 @@
package cn.iocoder.yudao.module.home.controller.admin.jbgl.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 JbglPageReqVO extends PageParam {
@Schema(description = "审批状态", example = "1")
private Integer status;
@Schema(description = "流程实例的编号", example = "3474")
private String processInstanceId;
@Schema(description = "id", example = "8528")
private Long id;
@Schema(description = "申请标题")
private String title;
@Schema(description = "申请人名字", example = "赵六")
private String userName;
@Schema(description = "申请人id", example = "3117")
private Long userId;
@Schema(description = "申请部门名字", example = "赵六")
private String deptName;
@Schema(description = "申请部门id", example = "1457")
private Long deptId;
@Schema(description = "申请时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] usageDate;
@Schema(description = "加班类型", example = "1")
private Integer type;
@Schema(description = "加班开始时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] startDate;
@Schema(description = "加班结束时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] endDate;
@Schema(description = "加班总时长")
private Integer duration;
@Schema(description = "加班原因", example = "不香")
private String reason;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
}

78
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/jbgl/vo/JbglRespVO.java Normal file
View File

@ -0,0 +1,78 @@
package cn.iocoder.yudao.module.home.controller.admin.jbgl.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.*;
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
@Schema(description = "管理后台 - 加班管理 Response VO")
@Data
@ExcelIgnoreUnannotated
public class JbglRespVO {
@Schema(description = "审批状态", example = "1")
@ExcelProperty("审批状态")
private Integer status;
@Schema(description = "流程实例的编号", example = "3474")
@ExcelProperty("流程实例的编号")
private String processInstanceId;
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "8528")
@ExcelProperty("id")
private Long id;
@Schema(description = "申请标题", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("申请标题")
private String title;
@Schema(description = "申请人名字", example = "赵六")
@ExcelProperty("申请人名字")
private String userName;
@Schema(description = "申请人id", requiredMode = Schema.RequiredMode.REQUIRED, example = "3117")
@ExcelProperty("申请人id")
private Long userId;
@Schema(description = "申请部门名字", example = "赵六")
@ExcelProperty("申请部门名字")
private String deptName;
@Schema(description = "申请部门id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1457")
@ExcelProperty("申请部门id")
private Long deptId;
@Schema(description = "申请时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("申请时间")
private LocalDateTime usageDate;
@Schema(description = "加班类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty(value = "加班类型", converter = DictConvert.class)
@DictFormat("jbgl_type") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
private Integer type;
@Schema(description = "加班开始时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("加班开始时间")
private LocalDateTime startDate;
@Schema(description = "加班结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("加班结束时间")
private LocalDateTime endDate;
@Schema(description = "加班总时长", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("加班总时长")
private Integer duration;
@Schema(description = "加班原因", example = "不香")
@ExcelProperty("加班原因")
private String reason;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
}

70
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/jbgl/vo/JbglSaveReqVO.java Normal file
View File

@ -0,0 +1,70 @@
package cn.iocoder.yudao.module.home.controller.admin.jbgl.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 JbglSaveReqVO {
@Schema(description = "发起人自选审批人 Map", example = "{taskKey1: [1, 2]}")
private Map<String, List<Long>> startUserSelectAssignees;
@Schema(description = "审批状态", example = "1")
private Integer status;
@Schema(description = "流程实例的编号", example = "3474")
private String processInstanceId;
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "8528")
private Long id;
@Schema(description = "申请标题", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "申请标题不能为空")
private String title;
@Schema(description = "申请人名字", example = "赵六")
private String userName;
@Schema(description = "申请人id", requiredMode = Schema.RequiredMode.REQUIRED, example = "3117")
private Long userId;
@Schema(description = "申请部门名字", example = "赵六")
private String deptName;
@Schema(description = "申请部门id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1457")
@NotNull(message = "申请部门id不能为空")
private Long deptId;
@Schema(description = "申请时间", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "申请时间不能为空")
private LocalDateTime usageDate;
@Schema(description = "加班类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "加班类型不能为空")
private Integer type;
@AssertTrue(message = "开始时间，需要在结束时间之后")
public boolean isEndTimeValid() {
return !getStartDate().isBefore(getEndDate());
}
@Schema(description = "加班开始时间", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "加班开始时间不能为空")
private LocalDateTime startDate;
@Schema(description = "加班结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "加班结束时间不能为空")
private LocalDateTime endDate;
@Schema(description = "加班总时长", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "加班总时长不能为空")
private Integer duration;
@Schema(description = "加班原因", example = "不香")
private String reason;
}

89
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/jbgl/JbglDO.java Normal file
View File

@ -0,0 +1,89 @@
package cn.iocoder.yudao.module.home.dal.dataobject.jbgl;
import com.sun.xml.bind.v2.TODO;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
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_jbgl")
@KeySequence("oa_jbgl_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class JbglDO extends BaseDO {
/**
* id
*/
@TableId
private Long id;
/**
* 审批状态
*/
private Integer status;
/**
* 流程实例的编号
*/
private String processInstanceId;
/**
* 申请标题
*/
private String title;
/**
* 申请人名字
*/
private String userName;
/**
* 申请人id
*/
private Long userId;
/**
* 申请部门名字
*/
private String deptName;
/**
* 申请部门id
*/
private Long deptId;
/**
* 申请时间
*/
private LocalDateTime usageDate;
/**
* 加班类型
*
* 枚举 {@link TODO jbgl_type 对应的类}
*/
private Integer type;
/**
* 加班开始时间
*/
private LocalDateTime startDate;
/**
* 加班结束时间
*/
private LocalDateTime endDate;
/**
* 加班总时长
*/
private Integer duration;
/**
* 加班原因
*/
private String reason;
}

58
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/jbgl/JbglMapper.java Normal file
View File

@ -0,0 +1,58 @@
package cn.iocoder.yudao.module.home.dal.mysql.jbgl;
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.jbgl.JbglDO;
import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.home.controller.admin.jbgl.vo.*;
/**
* 加班管理 Mapper
*
* @author 君风
*/
@Mapper
public interface JbglMapper extends BaseMapperX<JbglDO> {
default PageResult<JbglDO> selectPage(JbglPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<JbglDO>()
.eqIfPresent(JbglDO::getId, reqVO.getId())
.eqIfPresent(JbglDO::getTitle, reqVO.getTitle())
.likeIfPresent(JbglDO::getUserName, reqVO.getUserName())
.eqIfPresent(JbglDO::getUserId, reqVO.getUserId())
.likeIfPresent(JbglDO::getDeptName, reqVO.getDeptName())
.eqIfPresent(JbglDO::getDeptId, reqVO.getDeptId())
.betweenIfPresent(JbglDO::getUsageDate, reqVO.getUsageDate())
.eqIfPresent(JbglDO::getType, reqVO.getType())
.betweenIfPresent(JbglDO::getStartDate, reqVO.getStartDate())
.betweenIfPresent(JbglDO::getEndDate, reqVO.getEndDate())
.eqIfPresent(JbglDO::getDuration, reqVO.getDuration())
.eqIfPresent(JbglDO::getReason, reqVO.getReason())
.eqIfPresent(JbglDO::getStatus, reqVO.getStatus())
.eqIfPresent(JbglDO::getProcessInstanceId, reqVO.getProcessInstanceId())
.betweenIfPresent(JbglDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(JbglDO::getId));
}
default PageResult<JbglDO> selectPage(Long userId,JbglPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<JbglDO>()
.eqIfPresent(JbglDO::getId, reqVO.getId())
.eqIfPresent(JbglDO::getTitle, reqVO.getTitle())
.likeIfPresent(JbglDO::getUserName, reqVO.getUserName())
.eqIfPresent(JbglDO::getUserId, userId)
.likeIfPresent(JbglDO::getDeptName, reqVO.getDeptName())
.eqIfPresent(JbglDO::getDeptId, reqVO.getDeptId())
.betweenIfPresent(JbglDO::getUsageDate, reqVO.getUsageDate())
.eqIfPresent(JbglDO::getType, reqVO.getType())
.betweenIfPresent(JbglDO::getStartDate, reqVO.getStartDate())
.betweenIfPresent(JbglDO::getEndDate, reqVO.getEndDate())
.eqIfPresent(JbglDO::getDuration, reqVO.getDuration())
.eqIfPresent(JbglDO::getReason, reqVO.getReason())
.eqIfPresent(JbglDO::getStatus, reqVO.getStatus())
.eqIfPresent(JbglDO::getProcessInstanceId, reqVO.getProcessInstanceId())
.betweenIfPresent(JbglDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(JbglDO::getId));
}
}

6
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/framework/datapermission/config/homeDataPermissionConfiguration.java
View File

@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.home.framework.datapermission.config;
import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer;
import cn.iocoder.yudao.module.home.dal.dataobject.bgyp.BgypDO;
import cn.iocoder.yudao.module.home.dal.dataobject.clgl.ClglDO;
import cn.iocoder.yudao.module.home.dal.dataobject.qjgl.QjglDO;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
@ -20,8 +21,9 @@ public class homeDataPermissionConfiguration {
public DeptDataPermissionRuleCustomizer homeDeptDataPermissionRuleCustomizer() {
return rule -> {
// dept
rule.addDeptColumn(ClglDO.class, "dept");
rule.addDeptColumn(QjglDO.class, "dept_id");
rule.addDeptColumn(ClglDO.class, "dept"); //车辆管理
rule.addDeptColumn(QjglDO.class, "dept_id"); //请假管理
rule.addDeptColumn(BgypDO.class, "dept_id"); //办公用品
// rule.addDeptColumn(DeptDO.class, "id");
// user
// AdminUserDO 是想要使用权限的表 id 是对那个字段生效 比如 这个表 user_id 使用户id 那就使用 user_id

2
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/clgl/ClglServiceImpl.java
View File

@ -29,7 +29,7 @@ import static cn.iocoder.yudao.module.home.enums.ErrorCodeConstants.*;
@Service
@Validated
public class ClglServiceImpl implements ClglService {
public static final String PROCESS_KEY = "test-001";
public static final String PROCESS_KEY = "car-001";
@Resource
private ClglMapper clglMapper;

65
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/jbgl/JbglService.java Normal file
View File

@ -0,0 +1,65 @@
package cn.iocoder.yudao.module.home.service.jbgl;
import java.util.*;
import javax.validation.*;
import cn.iocoder.yudao.module.home.controller.admin.jbgl.vo.*;
import cn.iocoder.yudao.module.home.dal.dataobject.jbgl.JbglDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
/**
* 加班管理 Service 接口
*
* @author 君风
*/
public interface JbglService {
/**
* 创建加班管理
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createJbgl(@Valid JbglSaveReqVO createReqVO);
Long createJbgl(Long userId, @Valid JbglSaveReqVO createReqVO);
/**
* 更新加班管理
*
* @param updateReqVO 更新信息
*/
void updateJbgl(@Valid JbglSaveReqVO updateReqVO);
/**
* 删除加班管理
*
* @param id 编号
*/
void deleteJbgl(Long id);
/**
* 获得加班管理
*
* @param id 编号
* @return 加班管理
*/
JbglDO getJbgl(Long id);
/**
* 获得加班管理分页
*
* @param pageReqVO 分页查询
* @return 加班管理分页
*/
PageResult<JbglDO> getJbglPage(JbglPageReqVO pageReqVO);
PageResult<JbglDO> getJbglPage(Long userid, JbglPageReqVO pageReqVO);
/**
* 更新请假申请的状态
*
* @param id 编号
* @param status 结果
*/
void updateJbglStatus(Long id, Integer status);
}

116
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/jbgl/JbglServiceImpl.java Normal file
View File

@ -0,0 +1,116 @@
package cn.iocoder.yudao.module.home.service.jbgl;
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.jbgl.vo.*;
import cn.iocoder.yudao.module.home.dal.dataobject.jbgl.JbglDO;
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.jbgl.JbglMapper;
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 JbglServiceImpl implements JbglService {
public static final String PROCESS_KEY = "jbgl-001";
@Resource
private JbglMapper jbglMapper;
@Resource
private BpmProcessInstanceApi processInstanceApi;
@Override
public Long createJbgl(JbglSaveReqVO createReqVO) {
// 插入
JbglDO jbgl = BeanUtils.toBean(createReqVO, JbglDO.class);
jbglMapper.insert(jbgl);
// 返回
return jbgl.getId();
}
@Override
public Long createJbgl(Long userId, JbglSaveReqVO createReqVO) {
// 插入
JbglDO jbgl = BeanUtils.toBean(createReqVO, JbglDO.class)
.setUserId(userId).setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
jbglMapper.insert(jbgl);
// 发起 BPM 流程
Map<String, Object> processInstanceVariables = new HashMap<>();
String processInstanceId = processInstanceApi.createProcessInstance(userId,
new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY)
.setVariables(processInstanceVariables).setBusinessKey(String.valueOf(jbgl.getId()))
.setStartUserSelectAssignees(createReqVO.getStartUserSelectAssignees()));
jbglMapper.updateById(new JbglDO().setId(jbgl.getId()).setProcessInstanceId(processInstanceId));
// 返回
return jbgl.getId();
}
@Override
public void updateJbgl(JbglSaveReqVO updateReqVO) {
// 校验存在
validateJbglExists(updateReqVO.getId());
// 更新
JbglDO updateObj = BeanUtils.toBean(updateReqVO, JbglDO.class);
jbglMapper.updateById(updateObj);
}
@Override
public void deleteJbgl(Long id) {
// 校验存在
validateJbglExists(id);
// 删除
jbglMapper.deleteById(id);
}
private void validateJbglExists(Long id) {
if (jbglMapper.selectById(id) == null) {
throw exception(JBGL_NOT_EXISTS);
}
}
@Override
public JbglDO getJbgl(Long id) {
return jbglMapper.selectById(id);
}
@Override
public PageResult<JbglDO> getJbglPage(JbglPageReqVO pageReqVO) {
return jbglMapper.selectPage(pageReqVO);
}
public PageResult<JbglDO> getJbglPage(Long userid, JbglPageReqVO pageReqVO) {
return jbglMapper.selectPage(userid, pageReqVO);
}
@Override
public void updateJbglStatus(Long id, Integer status) {
validateLeaveExists(id);
jbglMapper.updateById(new JbglDO().setId(id).setStatus(status));
}
private void validateLeaveExists(Long id) {
if (jbglMapper.selectById(id) == null) {
throw exception(KNOWLEDGE_NOT_EXISTS);
}
}
}

34
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/jbgl/listener/BpmJbglStatusListener.java Normal file
View File

@ -0,0 +1,34 @@
package cn.iocoder.yudao.module.home.service.jbgl.listener;
import cn.iocoder.yudao.module.bpm.event.BpmProcessInstanceStatusEvent;
import cn.iocoder.yudao.module.bpm.event.BpmProcessInstanceStatusEventListener;
import cn.iocoder.yudao.module.home.dal.mysql.jbgl.JbglMapper;
import cn.iocoder.yudao.module.home.service.clgl.ClglService;
import cn.iocoder.yudao.module.home.service.clgl.ClglServiceImpl;
import cn.iocoder.yudao.module.home.service.jbgl.JbglService;
import cn.iocoder.yudao.module.home.service.jbgl.JbglServiceImpl;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
/**
* 车辆管理流程的结果的监听器实现类
*
* @author 芋道源码
*/
@Component
public class BpmJbglStatusListener extends BpmProcessInstanceStatusEventListener {
@Resource
private JbglService jbglService;
@Override
protected String getProcessDefinitionKey() {
return JbglServiceImpl.PROCESS_KEY;
}
@Override
protected void onEvent(BpmProcessInstanceStatusEvent event) {
jbglService.updateJbglStatus(Long.parseLong(event.getBusinessKey()), event.getStatus());
}
}

12
yudao-module-home/yudao-module-home-biz/src/main/resources/mapper/jbgl/JbglMapper.xml Normal file
View File

@ -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.jbgl.JbglMapper">
<!--
一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
-->
</mapper>

186
yudao-module-home/yudao-module-home-biz/src/test/java/cn/iocoder/yudao/module/home/service/jbgl/JbglServiceImplTest.java Normal file
View File

@ -0,0 +1,186 @@
package cn.iocoder.yudao.module.home.service.jbgl;
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.jbgl.vo.*;
import cn.iocoder.yudao.module.home.dal.dataobject.jbgl.JbglDO;
import cn.iocoder.yudao.module.home.dal.mysql.jbgl.JbglMapper;
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 JbglServiceImpl} 的单元测试类
*
* @author 君风
*/
@Import(JbglServiceImpl.class)
public class JbglServiceImplTest extends BaseDbUnitTest {
@Resource
private JbglServiceImpl jbglService;
@Resource
private JbglMapper jbglMapper;
@Test
public void testCreateJbgl_success() {
// 准备参数
JbglSaveReqVO createReqVO = randomPojo(JbglSaveReqVO.class).setId(null);
// 调用
Long jbglId = jbglService.createJbgl(createReqVO);
// 断言
assertNotNull(jbglId);
// 校验记录的属性是否正确
JbglDO jbgl = jbglMapper.selectById(jbglId);
assertPojoEquals(createReqVO, jbgl, "id");
}
@Test
public void testUpdateJbgl_success() {
// mock 数据
JbglDO dbJbgl = randomPojo(JbglDO.class);
jbglMapper.insert(dbJbgl);// @Sql: 先插入出一条存在的数据
// 准备参数
JbglSaveReqVO updateReqVO = randomPojo(JbglSaveReqVO.class, o -> {
o.setId(dbJbgl.getId()); // 设置更新的 ID
});
// 调用
jbglService.updateJbgl(updateReqVO);
// 校验是否更新正确
JbglDO jbgl = jbglMapper.selectById(updateReqVO.getId()); // 获取最新的
assertPojoEquals(updateReqVO, jbgl);
}
@Test
public void testUpdateJbgl_notExists() {
// 准备参数
JbglSaveReqVO updateReqVO = randomPojo(JbglSaveReqVO.class);
// 调用, 并断言异常
assertServiceException(() -> jbglService.updateJbgl(updateReqVO), JBGL_NOT_EXISTS);
}
@Test
public void testDeleteJbgl_success() {
// mock 数据
JbglDO dbJbgl = randomPojo(JbglDO.class);
jbglMapper.insert(dbJbgl);// @Sql: 先插入出一条存在的数据
// 准备参数
Long id = dbJbgl.getId();
// 调用
jbglService.deleteJbgl(id);
// 校验数据不存在了
assertNull(jbglMapper.selectById(id));
}
@Test
public void testDeleteJbgl_notExists() {
// 准备参数
Long id = randomLongId();
// 调用, 并断言异常
assertServiceException(() -> jbglService.deleteJbgl(id), JBGL_NOT_EXISTS);
}
@Test
@Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
public void testGetJbglPage() {
// mock 数据
JbglDO dbJbgl = randomPojo(JbglDO.class, o -> { // 等会查询到
o.setId(null);
o.setTitle(null);
o.setUserName(null);
o.setUserId(null);
o.setDeptName(null);
o.setDeptId(null);
o.setUsageDate(null);
o.setType(null);
o.setStartDate(null);
o.setEndDate(null);
o.setDuration(null);
o.setReason(null);
o.setStatus(null);
o.setProcessInstanceId(null);
o.setCreateTime(null);
});
jbglMapper.insert(dbJbgl);
// 测试 id 不匹配
jbglMapper.insert(cloneIgnoreId(dbJbgl, o -> o.setId(null)));
// 测试 title 不匹配
jbglMapper.insert(cloneIgnoreId(dbJbgl, o -> o.setTitle(null)));
// 测试 userName 不匹配
jbglMapper.insert(cloneIgnoreId(dbJbgl, o -> o.setUserName(null)));
// 测试 userId 不匹配
jbglMapper.insert(cloneIgnoreId(dbJbgl, o -> o.setUserId(null)));
// 测试 deptName 不匹配
jbglMapper.insert(cloneIgnoreId(dbJbgl, o -> o.setDeptName(null)));
// 测试 deptId 不匹配
jbglMapper.insert(cloneIgnoreId(dbJbgl, o -> o.setDeptId(null)));
// 测试 usageDate 不匹配
jbglMapper.insert(cloneIgnoreId(dbJbgl, o -> o.setUsageDate(null)));
// 测试 type 不匹配
jbglMapper.insert(cloneIgnoreId(dbJbgl, o -> o.setType(null)));
// 测试 startDate 不匹配
jbglMapper.insert(cloneIgnoreId(dbJbgl, o -> o.setStartDate(null)));
// 测试 endDate 不匹配
jbglMapper.insert(cloneIgnoreId(dbJbgl, o -> o.setEndDate(null)));
// 测试 duration 不匹配
jbglMapper.insert(cloneIgnoreId(dbJbgl, o -> o.setDuration(null)));
// 测试 reason 不匹配
jbglMapper.insert(cloneIgnoreId(dbJbgl, o -> o.setReason(null)));
// 测试 status 不匹配
jbglMapper.insert(cloneIgnoreId(dbJbgl, o -> o.setStatus(null)));
// 测试 processInstanceId 不匹配
jbglMapper.insert(cloneIgnoreId(dbJbgl, o -> o.setProcessInstanceId(null)));
// 测试 createTime 不匹配
jbglMapper.insert(cloneIgnoreId(dbJbgl, o -> o.setCreateTime(null)));
// 准备参数
JbglPageReqVO reqVO = new JbglPageReqVO();
reqVO.setId(null);
reqVO.setTitle(null);
reqVO.setUserName(null);
reqVO.setUserId(null);
reqVO.setDeptName(null);
reqVO.setDeptId(null);
reqVO.setUsageDate(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
reqVO.setType(null);
reqVO.setStartDate(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
reqVO.setEndDate(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
reqVO.setDuration(null);
reqVO.setReason(null);
reqVO.setStatus(null);
reqVO.setProcessInstanceId(null);
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
// 调用
PageResult<JbglDO> pageResult = jbglService.getJbglPage(reqVO);
// 断言
assertEquals(1, pageResult.getTotal());
assertEquals(1, pageResult.getList().size());
assertPojoEquals(dbJbgl, pageResult.getList().get(0));
}
}

1
yudao-module-home/yudao-module-home-biz/src/test/resources/sql/clean.sql
View File

@ -3,3 +3,4 @@ DELETE FROM "des_homePJ";
DELETE FROM "des_homeimg";
DELETE FROM "oa_clgl";
DELETE FROM "oa-bgyp";
DELETE FROM "oa_jbgl";

23
yudao-module-home/yudao-module-home-biz/src/test/resources/sql/create_tables.sql
View File

@ -108,3 +108,26 @@ CREATE TABLE IF NOT EXISTS "oa-bgyp" (
"tenant_id" bigint NOT NULL,
PRIMARY KEY ("id")
) COMMENT '办公用品管理表';
CREATE TABLE IF NOT EXISTS "oa_jbgl" (
"id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
"title" varchar NOT NULL,
"user_name" varchar,
"user_id" bigint NOT NULL,
"dept_name" varchar,
"dept_id" bigint NOT NULL,
"usage_date" varchar NOT NULL,
"type" int NOT NULL,
"start_date" varchar NOT NULL,
"end_date" varchar NOT NULL,
"duration" int NOT NULL,
"reason" varchar,
"status" int,
"process_instance_id" varchar,
"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 '加班管理表';