From fdfe22b21089f0cecdca47e6b3dda9a1ada6a386 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 3 Jan 2025 11:11:03 +0800 Subject: [PATCH] =?UTF-8?q?OaForm=E5=85=AC=E5=85=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/databases/oa/oa.sql | 30 +++++++++++++ .../com/yxt/anrui/oa/biz/oaform/OaForm.java | 44 +++++++++++++++++++ .../yxt/anrui/oa/biz/oaform/OaFormMapper.java | 13 ++++++ .../yxt/anrui/oa/biz/oaform/OaFormMapper.xml | 4 ++ .../anrui/oa/biz/oaform/OaFormService.java | 13 ++++++ .../anrui/oa/biz/oahireapply/OaHireApply.java | 3 +- 6 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 doc/databases/oa/oa.sql create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormMapper.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormMapper.xml create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java diff --git a/doc/databases/oa/oa.sql b/doc/databases/oa/oa.sql new file mode 100644 index 0000000000..79d761e073 --- /dev/null +++ b/doc/databases/oa/oa.sql @@ -0,0 +1,30 @@ +DROP TABLE IF EXISTS `oa_form`; +CREATE TABLE `oa_form` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `createByName` varchar(64) DEFAULT NULL COMMENT '创建人', + `useOrgSid` varchar(64) DEFAULT NULL COMMENT '公司sid', + `useOrgName` varchar(64) DEFAULT NULL COMMENT '公司名称', + `deptSid` varchar(255) DEFAULT NULL COMMENT '部门sid', + `deptName` varchar(255) DEFAULT NULL COMMENT '部门名称', + `finishTime` varchar(255) DEFAULT NULL COMMENT '办结日期', + `procInstId` varchar(255) DEFAULT NULL COMMENT '流程实例id', + `procDefId` varchar(255) DEFAULT NULL COMMENT '流程定义id', + `taskId` varchar(255) DEFAULT NULL COMMENT '任务id', + `nodeId` varchar(255) DEFAULT NULL COMMENT '环节id', + `nodeState` varchar(255) DEFAULT NULL COMMENT '环节名称', + `createOrgSid` varchar(255) DEFAULT NULL COMMENT '创建组织sid', + `createOrgName` varchar(255) DEFAULT NULL COMMENT '创建组织名称', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='表单公共表'; \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java new file mode 100644 index 0000000000..39893d9ace --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java @@ -0,0 +1,44 @@ +package com.yxt.anrui.oa.biz.oaform; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/1/3 + **/ +@Data +public class OaForm extends BaseEntity { + private static final long serialVersionUID = 2307297366703765992L; + + @ApiModelProperty("创建人") + private String createByName; + @ApiModelProperty("公司sid") + private String useOrgSid; + @ApiModelProperty("公司名称") + private String useOrgName; + @ApiModelProperty("部门sid") + private String deptSid; + @ApiModelProperty("部门名称") + private String deptName; + @ApiModelProperty("办结日期") + private String finishTime; + @ApiModelProperty("实例id") + private String procInstId; + @ApiModelProperty("流程定义id") + private String procDefId; + @ApiModelProperty("任务id") + private String taskId; + @ApiModelProperty("环节id") + private String nodeId; + @ApiModelProperty("流程状态") + private String nodeState; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("创建组织") + private String createOrgName; + + +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormMapper.java new file mode 100644 index 0000000000..54cd580be1 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormMapper.java @@ -0,0 +1,13 @@ +package com.yxt.anrui.oa.biz.oaform; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/1/3 + **/ +@Mapper +public interface OaFormMapper extends BaseMapper { +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormMapper.xml new file mode 100644 index 0000000000..ef62a7961f --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormMapper.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java new file mode 100644 index 0000000000..71b4e90a6f --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java @@ -0,0 +1,13 @@ +package com.yxt.anrui.oa.biz.oaform; + +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/1/3 + **/ +@Service +public class OaFormService extends MybatisBaseService { +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApply.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApply.java index 834bf78153..74e965888f 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApply.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApply.java @@ -26,6 +26,7 @@ package com.yxt.anrui.oa.biz.oahireapply; import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.anrui.oa.biz.oaform.OaForm; import com.yxt.common.core.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; @@ -49,7 +50,7 @@ import lombok.Data; @Data @ApiModel(value = "招聘需求申请", description = "招聘需求申请") @TableName("oa_hire_apply") -public class OaHireApply extends BaseEntity { +public class OaHireApply extends OaForm { private static final long serialVersionUID = 1L; @ApiModelProperty("单据编号")