first commit
This commit is contained in:
@@ -0,0 +1,40 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<artifactId>ruoyi-api</artifactId>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<version>3.6.1</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>ruoyi-api-threeEducation</artifactId>
|
||||
|
||||
|
||||
<description>
|
||||
ruoyi-api-threeEducation三育人接口模块
|
||||
</description>
|
||||
|
||||
|
||||
<dependencies>
|
||||
|
||||
<!-- RuoYi Common Core-->
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-common-core</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-common-security</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-all</artifactId>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
+51
@@ -0,0 +1,51 @@
|
||||
package com.ruoyi.threeEducation.api.constant;
|
||||
|
||||
/**
|
||||
* 三育人立项审核类型
|
||||
*
|
||||
* @author jug
|
||||
* @date 2023/02/03
|
||||
*/
|
||||
public class ThreeEducationApprovalAuditState {
|
||||
|
||||
/**
|
||||
* 未提交
|
||||
*/
|
||||
public static final Integer NOT_SUBMIT = 5;
|
||||
|
||||
/**
|
||||
* 待分工会审核
|
||||
*/
|
||||
public static final Integer BRANCH_UNION_READY = 10;
|
||||
|
||||
/**
|
||||
* 分工会审核退回修改
|
||||
*/
|
||||
public static final Integer BRANCH_UNION_BACK_MODIFY = 15;
|
||||
|
||||
/**
|
||||
* 分工会审核拒绝
|
||||
*/
|
||||
public static final Integer BRANCH_UNION_REJECTED = 20;
|
||||
|
||||
/**
|
||||
* 待校工会审核
|
||||
*/
|
||||
public static final Integer SCHOOL_UNION_READY = 25;
|
||||
|
||||
/**
|
||||
* 校工会审核退回修改
|
||||
*/
|
||||
public static final Integer SCHOOL_UNION_BACK_MODIFY = 30;
|
||||
|
||||
/**
|
||||
* 校工会审核拒绝
|
||||
*/
|
||||
public static final Integer SCHOOL_UNION_REJECTED = 35;
|
||||
|
||||
/**
|
||||
* 校工会审核通过
|
||||
*/
|
||||
public static final Integer SCHOOL_UNION_PASS = 40;
|
||||
|
||||
}
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
package com.ruoyi.threeEducation.api.constant;
|
||||
|
||||
/**
|
||||
* 三育人立项审核类型
|
||||
*
|
||||
* @author jug
|
||||
* @date 2023/02/03
|
||||
*/
|
||||
public class ThreeEducationApprovalAuditType {
|
||||
|
||||
/**
|
||||
* 分工会
|
||||
*/
|
||||
public final static int BRANCH_UNION = 1;
|
||||
/**
|
||||
* 校工会
|
||||
*/
|
||||
public final static int SCHOOL_UNION = 2;
|
||||
|
||||
}
|
||||
+41
@@ -0,0 +1,41 @@
|
||||
package com.ruoyi.threeEducation.api.constant;
|
||||
|
||||
import com.ruoyi.common.core.domain.PageForm;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Data
|
||||
public class ThreeEducationPageForm extends PageForm {
|
||||
|
||||
/**
|
||||
* 年度
|
||||
*/
|
||||
private Integer year;
|
||||
|
||||
/**
|
||||
* 分工会
|
||||
*/
|
||||
private String unionId;
|
||||
|
||||
/**
|
||||
* 工会小组
|
||||
*/
|
||||
private String unionGroupId;
|
||||
|
||||
/**
|
||||
* 二级单位
|
||||
*/
|
||||
private String unitId;
|
||||
|
||||
/**
|
||||
* 三级单位
|
||||
*/
|
||||
private String threeUnitId;
|
||||
|
||||
/**
|
||||
* 是否审核
|
||||
*/
|
||||
private Boolean isAudit;
|
||||
|
||||
}
|
||||
+97
@@ -0,0 +1,97 @@
|
||||
package com.ruoyi.threeEducation.api.constant;
|
||||
|
||||
/**
|
||||
* 三育人经费报销申请
|
||||
*
|
||||
* @author jug
|
||||
* @date 2023/02/06
|
||||
*/
|
||||
public class ThreeEducationReimbursementAuditState {
|
||||
|
||||
/**
|
||||
* 未提交
|
||||
*/
|
||||
public static final Integer NOT_SUBMIT = 100;
|
||||
|
||||
/**
|
||||
* 待经手人审核
|
||||
*/
|
||||
public static final Integer BRANCH_UNION_HANDLER_READY = 105;
|
||||
|
||||
/**
|
||||
* 经手人审核退回修改
|
||||
*/
|
||||
public static final Integer BRANCH_UNION_HANDLER_BACK_MODIFY = 110;
|
||||
|
||||
/**
|
||||
* 经手人审核拒绝
|
||||
*/
|
||||
public static final Integer BRANCH_UNION_HANDLER_REJECTED = 115;
|
||||
|
||||
/**
|
||||
* 待验收证明人审核
|
||||
*/
|
||||
public static final Integer BRANCH_UNION_ACCEPTANCE_CERTIFIER_READY = 120;
|
||||
|
||||
/**
|
||||
* 验收证明人审核退回修改
|
||||
*/
|
||||
public static final Integer BRANCH_UNION_ACCEPTANCE_CERTIFIER_BACK_MODIFY = 125;
|
||||
|
||||
/**
|
||||
* 验收证明人审核拒绝
|
||||
*/
|
||||
public static final Integer BRANCH_UNION_ACCEPTANCE_CERTIFIER_REJECTED = 130;
|
||||
|
||||
/**
|
||||
* 待分工会审核
|
||||
*/
|
||||
public static final Integer BRANCH_UNION_READY = 135;
|
||||
|
||||
/**
|
||||
* 分工会审核退回修改
|
||||
*/
|
||||
public static final Integer BRANCH_UNION_BACK_MODIFY = 140;
|
||||
|
||||
/**
|
||||
* 分工会审核拒绝
|
||||
*/
|
||||
public static final Integer BRANCH_UNION_REJECTED = 145;
|
||||
|
||||
/**
|
||||
* 待立项联络人审核
|
||||
*/
|
||||
public static final Integer SCHOOL_UNION_APPROVAL_CONTACT_READY = 150;
|
||||
|
||||
/**
|
||||
* 立项联络人审核审核退回修改
|
||||
*/
|
||||
public static final Integer SCHOOL_UNION_APPROVAL_CONTACT_BACK_MODIFY = 155;
|
||||
|
||||
/**
|
||||
* 立项联络人审核拒绝
|
||||
*/
|
||||
public static final Integer SCHOOL_UNION_APPROVAL_CONTACT_REJECTED = 160;
|
||||
|
||||
/**
|
||||
* 待校工会审核
|
||||
*/
|
||||
public static final Integer SCHOOL_UNION_READY = 165;
|
||||
|
||||
/**
|
||||
* 校工会审核退回修改
|
||||
*/
|
||||
public static final Integer SCHOOL_UNION_BACK_MODIFY = 170;
|
||||
|
||||
/**
|
||||
* 校工会审核拒绝
|
||||
*/
|
||||
public static final Integer SCHOOL_UNION_REJECTED = 175;
|
||||
|
||||
/**
|
||||
* 校工会审核通过
|
||||
*/
|
||||
public static final Integer SCHOOL_UNION_PASS = 180;
|
||||
|
||||
|
||||
}
|
||||
+37
@@ -0,0 +1,37 @@
|
||||
package com.ruoyi.threeEducation.api.constant;
|
||||
|
||||
/**
|
||||
* 三育人报销审核类型
|
||||
*
|
||||
* @author jug
|
||||
* @date 2023/02/06
|
||||
*/
|
||||
public class ThreeEducationReimbursementAuditType {
|
||||
|
||||
/**
|
||||
* 经手人
|
||||
*/
|
||||
public final static int BRANCH_UNION_HANDLER = 1;
|
||||
|
||||
/**
|
||||
* 验收证明人
|
||||
*/
|
||||
public final static int BRANCH_UNION_ACCEPTANCE_CERTIFIER = 2;
|
||||
|
||||
/**
|
||||
* 分工会
|
||||
*/
|
||||
public final static int BRANCH_UNION = 3;
|
||||
|
||||
/**
|
||||
* 立项联络人
|
||||
*/
|
||||
public final static int SCHOOL_UNION_APPROVAL_CONTACT = 4;
|
||||
|
||||
/**
|
||||
* 校工会
|
||||
*/
|
||||
public final static int SCHOOL_UNION = 5;
|
||||
|
||||
|
||||
}
|
||||
+172
@@ -0,0 +1,172 @@
|
||||
package com.ruoyi.threeEducation.api.domain;
|
||||
|
||||
import com.ruoyi.common.core.domain.SysFile;
|
||||
import com.ruoyi.common.core.web.domain.BaseEntity;
|
||||
import com.ruoyi.threeEducation.api.domain.common.ThreeEducationFund;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.nutz.dao.entity.annotation.*;
|
||||
import org.nutz.dao.interceptor.annotation.PrevInsert;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table("three_education")
|
||||
@Data
|
||||
public class ThreeEducation extends BaseEntity {
|
||||
|
||||
@Name
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
@Comment("id")
|
||||
@PrevInsert(uu32 = true)
|
||||
private String id;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.VARCHAR, width = 100)
|
||||
@Comment("项目名称")
|
||||
private String projectName;
|
||||
|
||||
@Column
|
||||
@ColDefine(customType = "bigint")
|
||||
@Comment("申报人id")
|
||||
private Long applyUserId;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.DATETIME)
|
||||
@Comment("申报时间")
|
||||
private Date applyTime;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.VARCHAR, width = 50)
|
||||
@Comment("申报人姓名")
|
||||
private String applyUserName;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.VARCHAR, width = 50)
|
||||
@Comment("申报人工号")
|
||||
private String applyUserLoginName;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
@Comment("申报人工会id")
|
||||
private String applyUserUnionId;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.VARCHAR, width = 100)
|
||||
@Comment("申报人工会")
|
||||
private String applyUserUnionName;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.VARCHAR, width = 100)
|
||||
@Comment("小组")
|
||||
private String unionGroupName;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
@Comment("小组id")
|
||||
private String unionGroupId;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
@Comment("申报人单位id")
|
||||
private String applyUserUnitId;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.VARCHAR, width = 100)
|
||||
@Comment("申报人单位")
|
||||
private String applyUserUnitName;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
@Comment("申报人三级单位id")
|
||||
private String applyUserThreeUnitId;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.VARCHAR, width = 100)
|
||||
@Comment("申报人三级单位")
|
||||
private String applyUserThreeUnitName;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
@Comment("小组人数")
|
||||
private String unionGroupUserNum;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.VARCHAR, width = 100)
|
||||
@Comment("小组长姓名")
|
||||
private String unionGroupLeaderUserName;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.VARCHAR, width = 20)
|
||||
@Comment("小组长电话")
|
||||
private String unionGroupLeaderMobile;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.DATE)
|
||||
@Comment("立项时间")
|
||||
private Date approvalTime;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.VARCHAR, width = 50)
|
||||
@Comment("立项地点")
|
||||
private String approvalPlace;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.INT)
|
||||
@Comment("立项教师人数")
|
||||
private Integer approvalTeacherNum;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.INT)
|
||||
@Comment("立项学生人数")
|
||||
private Integer approvalStudentNum;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.TEXT)
|
||||
@Comment("立项内容")
|
||||
private String approvalContent;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.MYSQL_JSON)
|
||||
@Comment("经费预算明细")
|
||||
private List<ThreeEducationFund> budgetDetails;
|
||||
|
||||
// @Data
|
||||
// public static class Budget {
|
||||
// String content;
|
||||
// Double money;
|
||||
// }
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.DOUBLE)
|
||||
@Comment("经费预算合计")
|
||||
private Double budgetTotal;
|
||||
|
||||
@Column
|
||||
@Comment("状态id")
|
||||
@ColDefine(type = ColType.INT, width = 8)
|
||||
private Integer stateId;
|
||||
|
||||
@Column
|
||||
@Comment("分工会审核记录id")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
private String branchUnionAuditId;
|
||||
|
||||
@Column
|
||||
@Comment("校工会审核记录id")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
private String schoolUnionAuditId;
|
||||
|
||||
@Column
|
||||
@Comment("附件")
|
||||
@ColDefine(type = ColType.MYSQL_JSON)
|
||||
private List<SysFile> files;
|
||||
|
||||
@One(field = "branchUnionAuditId")
|
||||
private ThreeEducationApprovalAudit branchUnionAudit;
|
||||
|
||||
@One(field = "schoolUnionAuditId")
|
||||
private ThreeEducationApprovalAudit schoolUnionAudit;
|
||||
|
||||
}
|
||||
+33
@@ -0,0 +1,33 @@
|
||||
package com.ruoyi.threeEducation.api.domain;
|
||||
|
||||
import com.ruoyi.threeEducation.api.domain.common.Audit;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.nutz.dao.entity.annotation.*;
|
||||
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table("three_education_approval_audit")
|
||||
@Data
|
||||
public class ThreeEducationApprovalAudit extends Audit {
|
||||
|
||||
/**
|
||||
* @see com.ruoyi.threeEducation.api.constant.ThreeEducationApprovalAuditType
|
||||
*/
|
||||
@Column
|
||||
@Comment("类型")
|
||||
@ColDefine(type = ColType.INT)
|
||||
private Integer auditType;
|
||||
|
||||
/**
|
||||
* 见字典表
|
||||
*/
|
||||
@Column
|
||||
@Comment("审核结果")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 10)
|
||||
private String auditResult;
|
||||
|
||||
@Column
|
||||
@Comment("三育人课题id")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
private String projectId;
|
||||
}
|
||||
+142
@@ -0,0 +1,142 @@
|
||||
package com.ruoyi.threeEducation.api.domain;
|
||||
|
||||
import com.ruoyi.common.core.domain.SysFile;
|
||||
import com.ruoyi.common.core.web.domain.BaseEntity;
|
||||
import com.ruoyi.threeEducation.api.domain.common.ThreeEducationFund;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.nutz.dao.entity.annotation.*;
|
||||
import org.nutz.dao.interceptor.annotation.PrevInsert;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table("three_education_reimbursement")
|
||||
@Data
|
||||
public class ThreeEducationReimbursement extends BaseEntity {
|
||||
|
||||
@Name
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
@Comment("id")
|
||||
@PrevInsert(uu32 = true)
|
||||
private String id;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
@Comment("项目id")
|
||||
private String projectId;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.MYSQL_JSON)
|
||||
@Comment("经费报销明细")
|
||||
private List<ThreeEducationFund> reimbursementDetails;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.DOUBLE)
|
||||
@Comment("经费报销合计")
|
||||
private Double reimbursementTotal;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.INT)
|
||||
@Comment("票据张数")
|
||||
private Integer ticketNumber;
|
||||
|
||||
@Column
|
||||
@ColDefine(type = ColType.MYSQL_JSON)
|
||||
@Comment("附件")
|
||||
private List<SysFile> files;
|
||||
|
||||
@Column
|
||||
@Comment("状态id")
|
||||
@ColDefine(type = ColType.INT, width = 8)
|
||||
private Integer stateId;
|
||||
|
||||
@Column
|
||||
@Comment("经手人id")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
private String branchUnionHandlerId;
|
||||
|
||||
@Column
|
||||
@Comment("经手人姓名")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 100)
|
||||
private String branchUnionHandlerUserName;
|
||||
|
||||
@Column
|
||||
@Comment("经手人工号")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 100)
|
||||
private String branchUnionHandlerLoginName;
|
||||
|
||||
@Column
|
||||
@Comment("验收证明人id")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
private String branchUnionAcceptanceCertifierId;
|
||||
|
||||
@Column
|
||||
@Comment("验收证明人姓名")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 100)
|
||||
private String branchUnionAcceptanceCertifierUserName;
|
||||
|
||||
@Column
|
||||
@Comment("验收证明人工号")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 100)
|
||||
private String branchUnionAcceptanceCertifierLoginName;
|
||||
|
||||
@Column
|
||||
@Comment("立项联络人id")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
private String schoolUnionApprovalContactId;
|
||||
|
||||
@Column
|
||||
@Comment("立项联络人姓名")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 100)
|
||||
private String schoolUnionApprovalContactUserName;
|
||||
|
||||
@Column
|
||||
@Comment("立项联络人工号")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 100)
|
||||
private String schoolUnionApprovalContactLoginName;
|
||||
|
||||
@Column
|
||||
@Comment("经手人审核记录id")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
private String branchUnionHandlerAuditId;
|
||||
|
||||
@Column
|
||||
@Comment("验收证明人审核记录id")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
private String branchUnionAcceptanceCertifierAuditId;
|
||||
|
||||
@Column
|
||||
@Comment("分工会审核记录id")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
private String branchUnionAuditId;
|
||||
|
||||
@Column
|
||||
@Comment("立项联络人审核记录id")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
private String schoolUnionApprovalContactAuditId;
|
||||
|
||||
@Column
|
||||
@Comment("校工会审核记录id")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
private String schoolUnionAuditId;
|
||||
|
||||
@One(field = "projectId")
|
||||
private ThreeEducation threeEducation;
|
||||
|
||||
@One(field = "branchUnionHandlerAuditId")
|
||||
private ThreeEducationReimbursementAudit branchUnionHandlerAudit;
|
||||
|
||||
@One(field = "branchUnionAcceptanceCertifierAuditId")
|
||||
private ThreeEducationReimbursementAudit branchUnionAcceptanceCertifierAudit;
|
||||
|
||||
@One(field = "branchUnionAuditId")
|
||||
private ThreeEducationReimbursementAudit branchUnionAudit;
|
||||
|
||||
@One(field = "schoolUnionApprovalContactAuditId")
|
||||
private ThreeEducationReimbursementAudit schoolUnionApprovalContactAudit;
|
||||
|
||||
@One(field = "schoolUnionAuditId")
|
||||
private ThreeEducationReimbursementAudit schoolUnionAudit;
|
||||
|
||||
}
|
||||
+33
@@ -0,0 +1,33 @@
|
||||
package com.ruoyi.threeEducation.api.domain;
|
||||
|
||||
import com.ruoyi.threeEducation.api.domain.common.Audit;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.nutz.dao.entity.annotation.*;
|
||||
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table("three_education_reimbursement_audit")
|
||||
@Data
|
||||
public class ThreeEducationReimbursementAudit extends Audit {
|
||||
|
||||
/**
|
||||
* @see com.ruoyi.threeEducation.api.constant.ThreeEducationApprovalAuditType
|
||||
*/
|
||||
@Column
|
||||
@Comment("类型")
|
||||
@ColDefine(type = ColType.INT)
|
||||
private Integer auditType;
|
||||
|
||||
/**
|
||||
* 见字典表
|
||||
*/
|
||||
@Column
|
||||
@Comment("审核结果")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 10)
|
||||
private String auditResult;
|
||||
|
||||
@Column
|
||||
@Comment("三育人课题id")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
private String projectId;
|
||||
}
|
||||
+147
@@ -0,0 +1,147 @@
|
||||
package com.ruoyi.threeEducation.api.domain.common;
|
||||
|
||||
import com.ruoyi.common.security.utils.SecurityUtils;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.nutz.dao.entity.annotation.*;
|
||||
import org.nutz.dao.interceptor.annotation.PrevInsert;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @ClassName Audit
|
||||
* @Description TODO
|
||||
* @Author zhaoxinyu
|
||||
* @Date 2022/12/15 11:27
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Table("audit")
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
public class Audit {
|
||||
|
||||
@Column
|
||||
@Name
|
||||
@Comment("ID")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
@PrevInsert(uu32 = true)
|
||||
private String id;
|
||||
|
||||
@Column
|
||||
@Comment("审核人")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
@PrevInsert(els = {@EL("$me.uid()")})
|
||||
private Long auditor;
|
||||
|
||||
@Column
|
||||
@Comment("是否通过")
|
||||
@ColDefine(type = ColType.BOOLEAN)
|
||||
private Boolean auditPass;
|
||||
|
||||
@Column
|
||||
@Comment("审核时间")
|
||||
@Prev(els = {@EL("$me.nowDate()")})
|
||||
private Date auditTime;
|
||||
|
||||
@Column
|
||||
@Comment("审核意见")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 500)
|
||||
private String auditOpinion;
|
||||
|
||||
@Column
|
||||
@Comment("签字")
|
||||
@ColDefine(type = ColType.TEXT)
|
||||
private String auditSign;
|
||||
|
||||
@Column
|
||||
@Comment("审核人姓名")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 50)
|
||||
@PrevInsert(els = {@EL("$me.userName()")})
|
||||
private String userName;
|
||||
|
||||
@Column
|
||||
@Comment("审核人工号")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 50)
|
||||
@PrevInsert(els = {@EL("$me.loginName()")})
|
||||
private String loginName;
|
||||
|
||||
public Long uid() {
|
||||
return SecurityUtils.getUserId();
|
||||
}
|
||||
|
||||
public Date nowDate() {
|
||||
return new Date();
|
||||
}
|
||||
|
||||
public String userName() {
|
||||
return SecurityUtils.getNickName();
|
||||
}
|
||||
|
||||
public String loginName() {
|
||||
return SecurityUtils.getUsername();
|
||||
}
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Long getAuditor() {
|
||||
return auditor;
|
||||
}
|
||||
|
||||
public void setAuditor(Long auditor) {
|
||||
this.auditor = auditor;
|
||||
}
|
||||
|
||||
public Boolean getAuditPass() {
|
||||
return auditPass;
|
||||
}
|
||||
|
||||
public void setAuditPass(Boolean auditPass) {
|
||||
this.auditPass = auditPass;
|
||||
}
|
||||
|
||||
public Date getAuditTime() {
|
||||
return auditTime;
|
||||
}
|
||||
|
||||
public void setAuditTime(Date auditTime) {
|
||||
this.auditTime = auditTime;
|
||||
}
|
||||
|
||||
public String getAuditOpinion() {
|
||||
return auditOpinion;
|
||||
}
|
||||
|
||||
public void setAuditOpinion(String auditOpinion) {
|
||||
this.auditOpinion = auditOpinion;
|
||||
}
|
||||
|
||||
public String getAuditSign() {
|
||||
return auditSign;
|
||||
}
|
||||
|
||||
public void setAuditSign(String auditSign) {
|
||||
this.auditSign = auditSign;
|
||||
}
|
||||
|
||||
public String getUserName() {
|
||||
return userName;
|
||||
}
|
||||
|
||||
public void setUserName(String userName) {
|
||||
this.userName = userName;
|
||||
}
|
||||
|
||||
public String getLoginName() {
|
||||
return loginName;
|
||||
}
|
||||
|
||||
public void setLoginName(String loginName) {
|
||||
this.loginName = loginName;
|
||||
}
|
||||
}
|
||||
+47
@@ -0,0 +1,47 @@
|
||||
package com.ruoyi.threeEducation.api.domain.common;
|
||||
|
||||
import lombok.Data;
|
||||
import org.nutz.dao.entity.annotation.*;
|
||||
|
||||
/**
|
||||
* @ClassName AuditState
|
||||
* @Description TODO
|
||||
* @Author zhaoxinyu
|
||||
* @Date 2022/12/15 11:43
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Table("audit_state")
|
||||
@Data
|
||||
public class AuditState {
|
||||
@Column
|
||||
@Id(
|
||||
auto = false
|
||||
)
|
||||
@Comment("ID")
|
||||
@ColDefine(
|
||||
type = ColType.INT,
|
||||
width = 8
|
||||
)
|
||||
private Integer stateId;
|
||||
@Column
|
||||
@Comment("状态名")
|
||||
@ColDefine(
|
||||
type = ColType.VARCHAR,
|
||||
width = 50
|
||||
)
|
||||
private String stateName;
|
||||
@Column
|
||||
@Comment("强调色")
|
||||
@ColDefine(
|
||||
type = ColType.VARCHAR,
|
||||
width = 20
|
||||
)
|
||||
private String stateColor;
|
||||
@Column
|
||||
@Comment("隶属(***模块)")
|
||||
@ColDefine(
|
||||
type = ColType.VARCHAR,
|
||||
width = 50
|
||||
)
|
||||
private String module;
|
||||
}
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
package com.ruoyi.threeEducation.api.domain.common;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ThreeEducationFund {
|
||||
|
||||
private String content;
|
||||
private Double money;
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user