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

请假

Browse Source
This commit is contained in:
Pancaihua 2024-10-26 21:30:40 +08:00
parent 3d0873851b
commit ac01302267
35 changed files with 476 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/elasticsearch/EsearchUtils.java
View File

@ -41,7 +41,7 @@ import java.util.Map;
* @author pch
*/
public class EsearchUtils {
private static String ipStr = "140.143.164.40";
private static String ipStr = "192.168.1.28";
private static int port = 9200;
private static String modeStr = "http";
private static RestHighLevelClient esClient = new RestHighLevelClient(RestClient.builder(new HttpHost(ipStr,port,modeStr)));

16
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/knows/KnowledgeServiceImpl.java
View File

@ -69,14 +69,14 @@ public class KnowledgeServiceImpl implements KnowledgeService {
// 插入子表
createCommentList(knowledge.getId(), createReqVO.getComments());
// 发起 BPM 流程
// Map<String, Object> processInstanceVariables = new HashMap<>();
// String processInstanceId = processInstanceApi.createProcessInstance(userId,
// new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY)
// .setVariables(processInstanceVariables).setBusinessKey(String.valueOf(knowledge.getId()))
// .setStartUserSelectAssignees(createReqVO.getStartUserSelectAssignees()));
//
// // 将工作流的编号，更新到 OA 请假单中
// knowledgeMapper.updateById(new KnowledgeDO().setId(knowledge.getId()).setProcessInstanceId(processInstanceId));
Map<String, Object> processInstanceVariables = new HashMap<>();
String processInstanceId = processInstanceApi.createProcessInstance(userId,
new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY)
.setVariables(processInstanceVariables).setBusinessKey(String.valueOf(knowledge.getId()))
.setStartUserSelectAssignees(createReqVO.getStartUserSelectAssignees()));
// 将工作流的编号，更新到 OA 请假单中
knowledgeMapper.updateById(new KnowledgeDO().setId(knowledge.getId()).setProcessInstanceId(processInstanceId));
try {
if (isEsFlag){
EsearchUtils.saveIndex(knowledge.getId(),createReqVO,indexName);

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

@ -14,4 +14,6 @@ public interface ErrorCodeConstants {
ErrorCode PJ_NOT_EXISTS = new ErrorCode(1_009_002_000, "主要用于首页的项目数据不存在");
// ========== 公告内容 1_009_003_000 ==========
ErrorCode IMG_NOT_EXISTS = new ErrorCode(1_009_003_000, "公告内容不存在");
// ========== 请假管理 1_009_004_000 ==========
ErrorCode QJGL_NOT_EXISTS = new ErrorCode(1_009_004_000, "请假管理不存在");
}

5
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/datainfo/DataInfoController.java
View File

@ -1,5 +1,8 @@
package cn.iocoder.yudao.module.home.controller.admin.datainfo;
import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.DataInfoPageReqVO;
import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.DataInfoRespVO;
import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.DataInfoSaveReqVO;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -8,7 +11,6 @@ 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.*;
@ -25,7 +27,6 @@ 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.datainfo.vo.*;
import cn.iocoder.yudao.module.home.dal.dataobject.datainfo.DataInfoDO;
import cn.iocoder.yudao.module.home.service.datainfo.DataInfoService;

1
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/datainfo/vo/DataInfoPageReqVO.java
View File

@ -1,7 +1,6 @@
package cn.iocoder.yudao.module.home.controller.admin.datainfo.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;

3
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/datainfo/vo/DataInfoRespVO.java
View File

@ -2,8 +2,7 @@ package cn.iocoder.yudao.module.home.controller.admin.datainfo.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.*;

3
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/datainfo/vo/DataInfoSaveReqVO.java
View File

@ -2,9 +2,8 @@ package cn.iocoder.yudao.module.home.controller.admin.datainfo.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")

5
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/HomeimgController.java
View File

@ -1,5 +1,8 @@
package cn.iocoder.yudao.module.home.controller.admin.homeimg;
import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.HomeimgPageReqVO;
import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.HomeimgRespVO;
import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.HomeimgSaveReqVO;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -8,7 +11,6 @@ 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.*;
@ -25,7 +27,6 @@ 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.homeimg.vo.*;
import cn.iocoder.yudao.module.home.dal.dataobject.homeimg.HomeimgDO;
import cn.iocoder.yudao.module.home.service.homeimg.HomeimgService;

1
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgPageReqVO.java
View File

@ -1,7 +1,6 @@
package cn.iocoder.yudao.module.home.controller.admin.homeimg.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;

3
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgRespVO.java
View File

@ -2,8 +2,7 @@ package cn.iocoder.yudao.module.home.controller.admin.homeimg.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;

3
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homeimg/vo/HomeimgSaveReqVO.java
View File

@ -2,9 +2,8 @@ package cn.iocoder.yudao.module.home.controller.admin.homeimg.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")

5
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homepj/HomepjController.java
View File

@ -1,5 +1,8 @@
package cn.iocoder.yudao.module.home.controller.admin.homepj;
import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.HomepjPageReqVO;
import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.HomepjRespVO;
import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.HomepjSaveReqVO;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -8,7 +11,6 @@ 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.*;
@ -25,7 +27,6 @@ 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.homepj.vo.*;
import cn.iocoder.yudao.module.home.dal.dataobject.homepj.HomepjDO;
import cn.iocoder.yudao.module.home.service.homepj.HomepjService;

1
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homepj/vo/HomepjPageReqVO.java
View File

@ -1,7 +1,6 @@
package cn.iocoder.yudao.module.home.controller.admin.homepj.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;

3
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homepj/vo/HomepjRespVO.java
View File

@ -2,8 +2,7 @@ package cn.iocoder.yudao.module.home.controller.admin.homepj.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;

3
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/homepj/vo/HomepjSaveReqVO.java
View File

@ -2,9 +2,8 @@ package cn.iocoder.yudao.module.home.controller.admin.homepj.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")

92
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/qjgl/QjglController.java Normal file
View File

@ -0,0 +1,92 @@
package cn.iocoder.yudao.module.home.controller.admin.qjgl;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.home.controller.admin.qjgl.vo.*;
import cn.iocoder.yudao.module.home.dal.dataobject.qjgl.QjglDO;
import cn.iocoder.yudao.module.home.service.qjgl.QjglService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.List;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@Tag(name = "管理后台 - 请假管理")
@RestController
@RequestMapping("/home/qjgl")
@Validated
public class QjglController {
@Resource
private QjglService qjglService;
@PostMapping("/create")
@Operation(summary = "创建请假管理")
@PreAuthorize("@ss.hasPermission('base:qjgl:create')")
public CommonResult<Long> createQjgl(@Valid @RequestBody QjglSaveReqVO createReqVO) {
return success(qjglService.createQjgl(getLoginUserId(),createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新请假管理")
@PreAuthorize("@ss.hasPermission('base:qjgl:update')")
public CommonResult<Boolean> updateQjgl(@Valid @RequestBody QjglSaveReqVO updateReqVO) {
qjglService.updateQjgl(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除请假管理")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('base:qjgl:delete')")
public CommonResult<Boolean> deleteQjgl(@RequestParam("id") Long id) {
qjglService.deleteQjgl(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得请假管理")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('base:qjgl:query')")
public CommonResult<QjglRespVO> getQjgl(@RequestParam("id") Long id) {
QjglDO qjgl = qjglService.getQjgl(id);
return success(BeanUtils.toBean(qjgl, QjglRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得请假管理分页")
@PreAuthorize("@ss.hasPermission('base:qjgl:query')")
public CommonResult<PageResult<QjglRespVO>> getQjglPage(@Valid QjglPageReqVO pageReqVO) {
PageResult<QjglDO> pageResult = qjglService.getQjglPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, QjglRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出请假管理 Excel")
@PreAuthorize("@ss.hasPermission('base:qjgl:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportQjglExcel(@Valid QjglPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<QjglDO> list = qjglService.getQjglPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "请假管理.xls", "数据", QjglRespVO.class,
BeanUtils.toBean(list, QjglRespVO.class));
}
}

62
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/qjgl/vo/QjglPageReqVO.java Normal file
View File

@ -0,0 +1,62 @@
package cn.iocoder.yudao.module.home.controller.admin.qjgl.vo;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
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 QjglPageReqVO extends PageParam {
@Schema(description = "请假标题")
private String title;
@Schema(description = "请假原因", example = "不对")
private String reason;
@Schema(description = "请假类型", example = "1")
private Integer type;
@Schema(description = "开始时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] startTime;
@Schema(description = "结束时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] endTime;
@Schema(description = "请假天数")
private Integer day;
@Schema(description = "文件路径")
private String filePath;
@Schema(description = "作者", example = "赵六")
private String userName;
@Schema(description = "部门id", example = "8402")
private Long deptId;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
// @Schema(description = "流程实例的编号", example = "24108")
// private String processInstanceId;
//
// @Schema(description = "申请人的用户编号", example = "14417")
// private Long userId;
@Schema(description = "审批状态", example = "2")
private Integer status;
}

71
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/qjgl/vo/QjglRespVO.java Normal file
View File

@ -0,0 +1,71 @@
package cn.iocoder.yudao.module.home.controller.admin.qjgl.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 请假管理 Response VO")
@Data
@ExcelIgnoreUnannotated
public class QjglRespVO {
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14023")
@ExcelProperty("id")
private Long id;
@Schema(description = "请假标题")
@ExcelProperty("请假标题")
private String title;
@Schema(description = "请假原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "不对")
@ExcelProperty("请假原因")
private String reason;
@Schema(description = "请假类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("请假类型")
private Integer type;
@Schema(description = "开始时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("开始时间")
private LocalDateTime startTime;
@Schema(description = "结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("结束时间")
private LocalDateTime endTime;
@Schema(description = "请假天数", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("请假天数")
private Integer day;
@Schema(description = "文件路径")
@ExcelProperty("文件路径")
private String filePath;
@Schema(description = "作者", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
@ExcelProperty("作者")
private String userName;
@Schema(description = "部门id", example = "8402")
@ExcelProperty("部门id")
private Long deptId;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "流程实例的编号", example = "24108")
@ExcelProperty("流程实例的编号")
private String processInstanceId;
// @Schema(description = "申请人的用户编号", example = "14417")
// @ExcelProperty("申请人的用户编号")
// private Long userId;
@Schema(description = "审批状态", example = "2")
@ExcelProperty("审批状态")
private Integer status;
}

68
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/qjgl/vo/QjglSaveReqVO.java Normal file
View File

@ -0,0 +1,68 @@
package cn.iocoder.yudao.module.home.controller.admin.qjgl.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.AssertTrue;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@Schema(description = "管理后台 - 请假管理新增/修改 Request VO")
@Data
public class QjglSaveReqVO {
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14023")
private Long id;
@Schema(description = "请假标题")
private String title;
@Schema(description = "请假原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "不对")
@NotEmpty(message = "请假原因不能为空")
private String reason;
@Schema(description = "请假类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "请假类型不能为空")
private Integer type;
@Schema(description = "开始时间", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "开始时间不能为空")
private LocalDateTime startTime;
@Schema(description = "结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "结束时间不能为空")
private LocalDateTime endTime;
@Schema(description = "请假天数", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "请假天数不能为空")
private Integer day;
@Schema(description = "文件路径")
private String filePath;
@Schema(description = "作者", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
@NotEmpty(message = "作者不能为空")
private String userName;
@Schema(description = "部门id", example = "8402")
private Long deptId;
// @Schema(description = "流程实例的编号", example = "24108")
// private String processInstanceId;
//
// @Schema(description = "申请人的用户编号", example = "14417")
// private Long userId;
//
// @Schema(description = "审批状态", example = "2")
// private Integer status;
@Schema(description = "发起人自选审批人 Map", example = "{taskKey1: [1, 2]}")
private Map<String, List<Long>> startUserSelectAssignees;
@AssertTrue(message = "结束时间，需要在开始时间之后")
public boolean isEndTimeValid() {
return !getEndTime().isBefore(getStartTime());
}
}

1
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/package-info.java Normal file
View File

@ -0,0 +1 @@
package cn.iocoder.yudao.module.home.controller;

80
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/qjgl/QjglDO.java Normal file
View File

@ -0,0 +1,80 @@
package cn.iocoder.yudao.module.home.dal.dataobject.qjgl;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
import java.time.LocalDateTime;
/**
* 请假管理 DO
*
* @author 君风
*/
@TableName("oa_qjgl")
@KeySequence("oa_qjgl_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class QjglDO extends BaseDO {
/**
* id
*/
@TableId
private Long id;
/**
* 请假标题
*/
private String title;
/**
* 请假原因
*/
private String reason;
/**
* 请假类型
*/
private Integer type;
/**
* 开始时间
*/
private LocalDateTime startTime;
/**
* 结束时间
*/
private LocalDateTime endTime;
/**
* 请假天数
*/
private Integer day;
/**
* 文件路径
*/
private String filePath;
/**
* 作者
*/
private String userName;
/**
* 部门id
*/
private Long deptId;
/**
* 流程实例的编号
*/
private String processInstanceId;
/**
* 申请人的用户编号
*/
private Long userId;
/**
* 审批状态
*/
private Integer status;
}

4
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/datainfo/DataInfoMapper.java
View File

@ -1,13 +1,11 @@
package cn.iocoder.yudao.module.home.dal.mysql.datainfo;
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.controller.admin.datainfo.vo.DataInfoPageReqVO;
import cn.iocoder.yudao.module.home.dal.dataobject.datainfo.DataInfoDO;
import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.*;
/**
* 首页数据统计 Mapper

4
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/homeimg/HomeimgMapper.java
View File

@ -1,13 +1,11 @@
package cn.iocoder.yudao.module.home.dal.mysql.homeimg;
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.controller.admin.homeimg.vo.HomeimgPageReqVO;
import cn.iocoder.yudao.module.home.dal.dataobject.homeimg.HomeimgDO;
import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.*;
/**
* 公告管理 Mapper

4
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/homepj/HomepjMapper.java
View File

@ -1,13 +1,11 @@
package cn.iocoder.yudao.module.home.dal.mysql.homepj;
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.controller.admin.homepj.vo.HomepjPageReqVO;
import cn.iocoder.yudao.module.home.dal.dataobject.homepj.HomepjDO;
import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.*;
/**
* 主要用于首页的项目数据 Mapper

50
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/qjgl/QjglMapper.java Normal file
View File

@ -0,0 +1,50 @@
package cn.iocoder.yudao.module.home.dal.mysql.qjgl;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.home.controller.admin.qjgl.vo.*;
import cn.iocoder.yudao.module.home.dal.dataobject.qjgl.QjglDO;
import org.apache.ibatis.annotations.Mapper;
/**
* 请假管理 Mapper
*
* @author 君风
*/
@Mapper
public interface QjglMapper extends BaseMapperX<QjglDO> {
default PageResult<QjglDO> selectPage(QjglPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<QjglDO>()
.eqIfPresent(QjglDO::getTitle, reqVO.getTitle())
.eqIfPresent(QjglDO::getReason, reqVO.getReason())
.eqIfPresent(QjglDO::getType, reqVO.getType())
.betweenIfPresent(QjglDO::getStartTime, reqVO.getStartTime())
.betweenIfPresent(QjglDO::getEndTime, reqVO.getEndTime())
.eqIfPresent(QjglDO::getDay, reqVO.getDay())
.eqIfPresent(QjglDO::getFilePath, reqVO.getFilePath())
.likeIfPresent(QjglDO::getUserName, reqVO.getUserName())
.eqIfPresent(QjglDO::getDeptId, reqVO.getDeptId())
.betweenIfPresent(QjglDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(QjglDO::getStatus, reqVO.getStatus())
.orderByDesc(QjglDO::getId));
}
default PageResult<QjglDO> selectPage(long userId,QjglPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<QjglDO>()
.eqIfPresent(QjglDO::getTitle, reqVO.getTitle())
.eqIfPresent(QjglDO::getReason, reqVO.getReason())
.eqIfPresent(QjglDO::getType, reqVO.getType())
.betweenIfPresent(QjglDO::getStartTime, reqVO.getStartTime())
.betweenIfPresent(QjglDO::getEndTime, reqVO.getEndTime())
.eqIfPresent(QjglDO::getDay, reqVO.getDay())
.eqIfPresent(QjglDO::getFilePath, reqVO.getFilePath())
.likeIfPresent(QjglDO::getUserName, reqVO.getUserName())
.eqIfPresent(QjglDO::getDeptId, reqVO.getDeptId())
.betweenIfPresent(QjglDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(QjglDO::getUserId, userId)
.eqIfPresent(QjglDO::getStatus, reqVO.getStatus())
.orderByDesc(QjglDO::getId));
}
}

6
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/datainfo/DataInfoService.java
View File

@ -1,11 +1,11 @@
package cn.iocoder.yudao.module.home.service.datainfo;
import java.util.*;
import javax.validation.*;
import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.*;
import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.DataInfoPageReqVO;
import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.DataInfoSaveReqVO;
import cn.iocoder.yudao.module.home.dal.dataobject.datainfo.DataInfoDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
/**
* 首页数据统计 Service 接口

6
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/datainfo/DataInfoServiceImpl.java
View File

@ -1,15 +1,13 @@
package cn.iocoder.yudao.module.home.service.datainfo;
import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.DataInfoPageReqVO;
import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.DataInfoSaveReqVO;
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.datainfo.vo.*;
import cn.iocoder.yudao.module.home.dal.dataobject.datainfo.DataInfoDO;
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.datainfo.DataInfoMapper;

6
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/homeimg/HomeimgService.java
View File

@ -1,11 +1,11 @@
package cn.iocoder.yudao.module.home.service.homeimg;
import java.util.*;
import javax.validation.*;
import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.*;
import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.HomeimgPageReqVO;
import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.HomeimgSaveReqVO;
import cn.iocoder.yudao.module.home.dal.dataobject.homeimg.HomeimgDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
/**
* 公告管理 Service 接口

6
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/homeimg/HomeimgServiceImpl.java
View File

@ -1,15 +1,13 @@
package cn.iocoder.yudao.module.home.service.homeimg;
import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.HomeimgPageReqVO;
import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.HomeimgSaveReqVO;
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.homeimg.vo.*;
import cn.iocoder.yudao.module.home.dal.dataobject.homeimg.HomeimgDO;
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.homeimg.HomeimgMapper;

6
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/homepj/HomepjService.java
View File

@ -1,11 +1,11 @@
package cn.iocoder.yudao.module.home.service.homepj;
import java.util.*;
import javax.validation.*;
import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.*;
import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.HomepjPageReqVO;
import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.HomepjSaveReqVO;
import cn.iocoder.yudao.module.home.dal.dataobject.homepj.HomepjDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
/**
* 主要用于首页的项目数据 Service 接口

6
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/homepj/HomepjServiceImpl.java
View File

@ -1,15 +1,13 @@
package cn.iocoder.yudao.module.home.service.homepj;
import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.HomepjPageReqVO;
import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.HomepjSaveReqVO;
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.homepj.vo.*;
import cn.iocoder.yudao.module.home.dal.dataobject.homepj.HomepjDO;
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.homepj.HomepjMapper;

10
yudao-module-home/yudao-module-home-biz/src/test/java/cn/iocoder/yudao/module/home/service/datainfo/DataInfoServiceImplTest.java
View File

@ -1,32 +1,26 @@
package cn.iocoder.yudao.module.home.service.datainfo;
import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.DataInfoPageReqVO;
import cn.iocoder.yudao.module.home.controller.admin.datainfo.vo.DataInfoSaveReqVO;
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.datainfo.vo.*;
import cn.iocoder.yudao.module.home.dal.dataobject.datainfo.DataInfoDO;
import cn.iocoder.yudao.module.home.dal.mysql.datainfo.DataInfoMapper;
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 DataInfoServiceImpl} 的单元测试类

10
yudao-module-home/yudao-module-home-biz/src/test/java/cn/iocoder/yudao/module/home/service/homeimg/HomeimgServiceImplTest.java
View File

@ -1,32 +1,26 @@
package cn.iocoder.yudao.module.home.service.homeimg;
import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.HomeimgPageReqVO;
import cn.iocoder.yudao.module.home.controller.admin.homeimg.vo.HomeimgSaveReqVO;
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.homeimg.vo.*;
import cn.iocoder.yudao.module.home.dal.dataobject.homeimg.HomeimgDO;
import cn.iocoder.yudao.module.home.dal.mysql.homeimg.HomeimgMapper;
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 HomeimgServiceImpl} 的单元测试类

10
yudao-module-home/yudao-module-home-biz/src/test/java/cn/iocoder/yudao/module/home/service/homepj/HomepjServiceImplTest.java
View File

@ -1,32 +1,26 @@
package cn.iocoder.yudao.module.home.service.homepj;
import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.HomepjPageReqVO;
import cn.iocoder.yudao.module.home.controller.admin.homepj.vo.HomepjSaveReqVO;
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.homepj.vo.*;
import cn.iocoder.yudao.module.home.dal.dataobject.homepj.HomepjDO;
import cn.iocoder.yudao.module.home.dal.mysql.homepj.HomepjMapper;
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 HomepjServiceImpl} 的单元测试类

4
yudao-server/src/main/resources/application-local.yaml
View File

@ -46,7 +46,7 @@ spring:
primary: master
datasource:
master:
url: jdbc:mysql://192.168.1.28:3306/yudao-vue?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
url: jdbc:mysql://140.143.164.40:3306/yudao-oa?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
# url: jdbc:mysql://192.168.1.28:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
# url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # MySQL Connector/J 5.X 连接的示例
# url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例
@ -71,7 +71,7 @@ spring:
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
redis:
host: 192.168.1.28 # 地址140.143.164.40
host: 140.143.164.40 # 地址140.143.164.40
port: 6379 # 端口
database: 0 # 数据库索引
password: 123456