first commit

ruoyi-api/ruoyi-api-additional/pom.xml

@@ -0,0 +1,54 @@
+<?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">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.ruoyi</groupId>
+        <artifactId>ruoyi-api</artifactId>
+        <version>3.6.1</version>
+    </parent>
+
+    <artifactId>ruoyi-api-additional</artifactId>
+
+    <properties>
+        <maven.compiler.source>15</maven.compiler.source>
+        <maven.compiler.target>15</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+
+        <!-- RuoYi Common Core-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-api-system</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-api-member</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-api-proposal</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/constant/aidFundMember/AidFundMemberAuditState.java

@@ -0,0 +1,90 @@
+package com.ruoyi.additional.api.constant.aidFundMember;
+
+
+import org.nutz.lang.Lang;
+
+import java.util.List;
+
+/**
+ * 基金成员审核状态
+ *
+ * @author jug
+ * @date 2023/02/15
+ */
+public class AidFundMemberAuditState {
+    /**
+     * 待分工会审核
+     */
+    public static final Integer BRANCH_UNION_READY = 300;
+
+    /**
+     * 分工会退回修改
+     */
+    public static final Integer BRANCH_UNION_BACK_MODIFY = 310;
+
+    /**
+     * 分工会审核拒绝
+     */
+    public static final Integer BRANCH_UNION_REJECTED = 320;
+
+    /**
+     * 待离退休干部处审核
+     */
+    public static final Integer RETIRED_READY = 330;
+
+    /**
+     * 离退休干部处退回修改
+     */
+    public static final Integer RETIRED_BACK_MODIFY = 340;
+
+    /**
+     * 离退休干部处审核拒绝
+     */
+    public static final Integer RETIRED_REJECTED = 350;
+
+    /**
+     * 待基金会审核
+     */
+    public static final Integer AID_FUND_READY = 360;
+
+    /**
+     * 基金会退回修改
+     */
+    public static final Integer AID_FUND_BACK_MODIFY = 370;
+
+    /**
+     * 基金会审核拒绝
+     */
+    public static final Integer AID_FUND_REJECTED = 380;
+
+    /**
+     * 正式会员
+     */
+    public static final Integer AID_FUND_PASS = 390;
+
+
+    /**
+     * 待审核状态
+     */
+    public static final List<Integer> READY_AUDIT_STATES = Lang.list(BRANCH_UNION_READY, RETIRED_READY, AID_FUND_READY);
+
+    /**
+     * 成功状态
+     */
+    public static final List<Integer> AUDIT_PASS_STATES = Lang.list(AID_FUND_PASS);
+
+    /**
+     * 拒绝状态
+     */
+    public static final List<Integer> AUDIT_REJECTED_STATES = Lang.list(BRANCH_UNION_REJECTED, RETIRED_REJECTED, AID_FUND_REJECTED);
+
+    /**
+     * 退回状态
+     */
+    public static final List<Integer> AUDIT_BACK_MODIFY_STATES = Lang.list(BRANCH_UNION_BACK_MODIFY, RETIRED_BACK_MODIFY, AID_FUND_BACK_MODIFY);
+
+    /**
+     * 申请中状态
+     */
+    public static final List<Integer> AUDIT_APPLYING_STATES = Lang.list(BRANCH_UNION_READY, BRANCH_UNION_READY, AID_FUND_READY);
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/constant/aidFundMember/AidFundMemberChangeType.java

@@ -0,0 +1,24 @@
+package com.ruoyi.additional.api.constant.aidFundMember;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 基金会员变化类型
+ *
+ * @author jug
+ * @date 2023/02/17
+ */
+@Getter
+@AllArgsConstructor
+public enum AidFundMemberChangeType {
+
+    VOLUNTARY_EXIT("1", "自愿退出"),
+    UNIT_CHANGE("2", "单位异动"),
+    RETIRED("3", "退休"),
+    DEATH("4", "去世");
+
+    private final String code;
+    private final String description;
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/constant/aidFundMember/AidFundMemberMode.java

@@ -0,0 +1,33 @@
+package com.ruoyi.additional.api.constant.aidFundMember;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+/**
+ * 基金成员
+ *
+ * @author jug
+ * @date 2023/02/15
+ */
+@Getter
+@AllArgsConstructor
+public enum AidFundMemberMode {
+    /**
+     * 非会员
+     */
+    NONE(0, "非会员"),
+    /**
+     * 正式会员
+     */
+    NORMAL(1, "正式会员");
+
+    /**
+     * 编码
+     */
+    private final int code;
+    /**
+     * 描述
+     */
+    private final String description;
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/constant/aidFundMember/AidFundMemberPayXlsMode.java

@@ -0,0 +1,24 @@
+package com.ruoyi.additional.api.constant.aidFundMember;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+/**
+ * 缴费记录模板
+ *
+ * @author jug
+ * @date 2023/02/17
+ */
+@Data
+public class AidFundMemberPayXlsMode {
+
+    @Excel(name = "工号", width = 20.0d)
+    private String loginName;
+
+    @Excel(name = "姓名", width = 20.0d)
+    private String userName;
+
+    @Excel(name = "年份", width = 20.0d)
+    private Integer year;
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/constant/aidFundMember/AidFundMemberSource.java

@@ -0,0 +1,30 @@
+package com.ruoyi.additional.api.constant.aidFundMember;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum AidFundMemberSource {
+
+    /**
+     * 个人申请
+     */
+    PERSONAL(0, "个人申请"),
+    /**
+     * 批量设置
+     */
+    BATCH(1, "批量设置");
+
+    /**
+     * 编码
+     */
+    private final int code;
+    /**
+     * 描述
+     */
+    private final String description;
+
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/constant/honor/HonorAuditState.java

@@ -0,0 +1,79 @@
+package com.ruoyi.additional.api.constant.honor;
+
+/**
+ * @Author JyuHsin
+ * @Date 2023/2/19
+ * @Description
+ */
+public class HonorAuditState {
+
+    /**
+     * 未提交
+     */
+    public static final Integer NOT_SUBMIT = 1400;
+
+    /**
+     * 单位待审核
+     */
+    public static final Integer UNIT_READY = 1410;
+
+    /**
+     * 单位审核退回修改
+     */
+    public static final Integer UNIT_BACK_MODIFY = 1420;
+
+    /**
+     * 单位审核拒绝
+     */
+    public static final Integer UNIT_REJECTED = 1430;
+
+    /**
+     * 分工会待审核
+     */
+    public static final Integer UNION_READY = 1440;
+
+    /**
+     * 分工会审核退回修改
+     */
+    public static final Integer UNION_BACK_MODIFY = 1450;
+
+    /**
+     * 分工会审核拒绝
+     */
+    public static final Integer UNION_REJECTED = 1460;
+
+    /**
+     * 基层党组织待审核
+     */
+    public static final Integer PARTY_READY = 1470;
+
+    /**
+     * 基层党组织审核退回修改
+     */
+    public static final Integer PARTY_BACK_MODIFY = 1480;
+
+    /**
+     * 基层党组织审核拒绝
+     */
+    public static final Integer PARTY_REJECTED = 1490;
+
+    /**
+     * 校工会待审核
+     */
+    public static final Integer SCHOOL_READY = 1500;
+
+    /**
+     * 校工会审核退回修改
+     */
+    public static final Integer SCHOOL_BACK_MODIFY = 1510;
+
+    /**
+     * 校工会审核拒绝
+     */
+    public static final Integer SCHOOL_REJECTED = 1520;
+
+    /**
+     * 校工会审核通过
+     */
+    public static final Integer SCHOOL_PASS = 1530;
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/constant/medical/MedicalAuditState.java

@@ -0,0 +1,117 @@
+package com.ruoyi.additional.api.constant.medical;
+
+public class MedicalAuditState {
+
+    /**
+     * 未提交
+     */
+    public static final Integer NOT_SUBMIT = 500;
+
+    /**
+     * 待分工会审核
+     */
+    public static final Integer BRANCH_UNION_READY = 505;
+
+    /**
+     * 分工会退回修改
+     */
+    public static final Integer BRANCH_UNION_BACK_MODIFY = 510;
+
+    /**
+     * 分工会审核拒绝
+     */
+    public static final Integer BRANCH_UNION_REJECTED = 520;
+
+    /**
+     * 待离退休干部处审核
+     */
+    public static final Integer RETIRED_READY = 530;
+
+    /**
+     * 离退休干部处退回修改
+     */
+    public static final Integer RETIRED_BACK_MODIFY = 540;
+
+    /**
+     * 离退休干部处审核拒绝
+     */
+    public static final Integer RETIRED_REJECTED = 550;
+
+    /**
+     * 校医院审核
+     */
+    public static final Integer SCHOOL_HOSPITAL_READY = 560;
+
+    /**
+     * 校医院退回修改
+     */
+    public static final Integer SCHOOL_HOSPITAL_BACK_MODIFY = 570;
+
+    /**
+     * 校医院审核拒绝
+     */
+    public static final Integer SCHOOL_HOSPITAL_REJECTED = 580;
+
+    /**
+     * 工会会计审核
+     */
+    public static final Integer SCHOOL_ACCOUNTING_READY = 590;
+
+    /**
+     * 工会会计退回修改
+     */
+    public static final Integer SCHOOL_ACCOUNTING_BACK_MODIFY = 600;
+
+    /**
+     * 工会会计审核拒绝
+     */
+    public static final Integer SCHOOL_ACCOUNTING_REJECTED = 610;
+
+    /**
+     * 工会副主席审核
+     */
+    public static final Integer SCHOOL_VICE_CHAIRMAN_READY = 620;
+
+    /**
+     * 工会副主席退回修改
+     */
+    public static final Integer SCHOOL_VICE_CHAIRMAN_BACK_MODIFY = 630;
+
+    /**
+     * 工会副主席审核拒绝
+     */
+    public static final Integer SCHOOL_VICE_CHAIRMAN_REJECTED = 640;
+
+    /**
+     * 工会主席审核
+     */
+    public static final Integer SCHOOL_CHAIRMAN_READY = 650;
+
+    /**
+     * 工会主席退回修改
+     */
+    public static final Integer SCHOOL_CHAIRMAN_BACK_MODIFY = 660;
+
+    /**
+     * 工会主席审核拒绝
+     */
+    public static final Integer SCHOOL_CHAIRMAN_REJECTED = 670;
+
+    /**
+     * 财务出纳审核
+     */
+    public static final Integer FINANCIAL_CASHIER_READY = 680;
+
+    /**
+     * 财务出纳退回修改
+     */
+    public static final Integer FINANCIAL_CASHIER_BACK_MODIFY = 690;
+
+    /**
+     * 财务出纳审核拒绝
+     */
+    public static final Integer FINANCIAL_CASHIER_REJECTED = 700;
+
+    public static final Integer PASS = 710;
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/constant/medical/MedicalPageForm.java

@@ -0,0 +1,28 @@
+package com.ruoyi.additional.api.constant.medical;
+
+import com.ruoyi.common.core.domain.PageForm;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class MedicalPageForm extends PageForm {
+
+    private Integer year;
+
+    private Boolean isAudit;
+
+    /**
+     * 补助类型 普通疾病 重疾
+     */
+    private String type;
+
+    private String unionId;
+
+    private String unitId;
+
+    /**
+     * 是否重大疾病
+     */
+    private Boolean isMajorDisease;
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/constant/medical/MedicalType.java

@@ -0,0 +1,28 @@
+package com.ruoyi.additional.api.constant.medical;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum MedicalType {
+
+    /**
+     * 医疗补助
+     */
+    ORDINARY("1", "医疗补助"),
+    /**
+     * 重疾医疗补助
+     */
+    SERIOUS("2", "重疾医疗补助");
+
+    /**
+     * 编码
+     */
+    private final String code;
+    /**
+     * 描述
+     */
+    private final String description;
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/constant/offerAdvice/OfferAdviceState.java

@@ -0,0 +1,30 @@
+package com.ruoyi.additional.api.constant.offerAdvice;
+
+public interface OfferAdviceState {
+
+    /**
+     * 未提交
+     */
+    Integer unSubmitted = 3000;
+
+    /**
+     * 待校工会审核
+     */
+    Integer awaitSchoolUnionAudit = 3005;
+
+    /**
+     * 校工会审核拒绝
+     */
+    Integer schoolUnionAuditReject = 3010;
+
+    /**
+     * 待分管校领导审批
+     */
+    Integer awaitLeaderAudit = 3015;
+
+    /**
+     * 审核通过
+     */
+    Integer auditPass = 3020;
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/constant/reimbursement/ReimbursementState.java

@@ -0,0 +1,65 @@
+package com.ruoyi.additional.api.constant.reimbursement;
+
+/**
+ * @Author JyuHsin
+ * @Date 2023/2/11
+ * @Description
+ */
+public class ReimbursementState {
+
+    /**
+     * 未提交
+     */
+    public static final Integer NOT_SUBMIT = 100;
+
+    /**
+     * 待分工会主席审核
+     */
+    public static final Integer UNION_READY = 110;
+
+    /**
+     * 分工会主席审核退回修改
+     */
+    public static final Integer UNION_BACK_MODIFY = 120;
+
+    /**
+     * 分工会主席审核拒绝
+     */
+    public static final Integer UNION_REJECTED = 130;
+
+    /**
+     * 待校工会会计审核
+     */
+    public static final Integer ACCOUNTANT_READY = 140;
+
+    /**
+     * 校工会会计审核退回修改
+     */
+    public static final Integer ACCOUNTANT_BACK_MODIFY = 150;
+
+    /**
+     * 校工会会计审核审核拒绝
+     */
+    public static final Integer ACCOUNTANT_REJECTED = 160;
+
+    /**
+     * 待校工会审核
+     */
+    public static final Integer SCHOOL_READY = 170;
+
+    /**
+     * 校工会审核退回修改
+     */
+    public static final Integer SCHOOL_BACK_MODIFY = 180;
+
+    /**
+     * 校工会审核拒绝
+     */
+    public static final Integer SCHOOL_REJECTED = 190;
+
+    /**
+     * 校工会审核通过
+     */
+    public static final Integer SCHOOL_PASS = 200;
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/customEnum/AuditTypeEnum.java

@@ -0,0 +1,30 @@
+package com.ruoyi.additional.api.customEnum;
+
+/**
+ * @Author JyuHsin
+ * @Date 2023/1/31
+ * @Description
+ */
+public enum AuditTypeEnum {
+
+    AUDIT(0, "审核"),
+    REJECT(1, "拒绝"),
+    NODE_PASS(2, "节点通过"),
+    PROCESS_PASS(3, "流程通过");
+
+    public Integer value;
+    public String desc;
+
+    public Integer getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    private AuditTypeEnum(Integer value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/customEnum/CustomAuditTypeEnum.java

@@ -0,0 +1,25 @@
+package com.ruoyi.additional.api.customEnum;
+
+public enum CustomAuditTypeEnum {
+
+    CLUB("CLUB", "审核本协会"),
+    DW("DW", "审核本单位"),
+    FGH("FGH", "审核本分工会"),
+    TZ("TZ", "审核本代表团");
+
+    public String value;
+    public String desc;
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    private CustomAuditTypeEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/Audit.java

@@ -0,0 +1,160 @@
+package com.ruoyi.additional.api.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+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
+ */
+@EqualsAndHashCode(callSuper = true)
+@Table("audit")
+@Data
+@Accessors(chain = true)
+public class Audit extends BaseEntity {
+
+    @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()")})
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date auditTime;
+
+    @Column
+    @Comment("审核意见")
+    @ColDefine(type = ColType.VARCHAR, width = 500)
+    private String auditOpinion;
+
+    @Column
+    @Comment("签字")
+    @ColDefine(customType = "longtext")
+    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;
+
+    /**
+     * 见字典表
+     */
+    @Column
+    @Comment("审核结果")
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    private String auditResult;
+
+    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;
+    }
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/AuditState.java

@@ -0,0 +1,99 @@
+package com.ruoyi.additional.api.domain;
+
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+
+import java.util.List;
+
+/**
+ * @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;
+
+    @Column
+    @Comment("下个审核节点代码")
+    @ColDefine(
+            type = ColType.INT,
+            width = 8
+    )
+    private Integer afterStateId;
+    @Column
+    @Comment("通过下个审核节点代码")
+    @ColDefine(
+            type = ColType.INT,
+            width = 8
+    )
+    private Integer afterPassStateId;
+    @Column
+    @Comment("拒绝后下个节点代码")
+    @ColDefine(
+            type = ColType.INT,
+            width = 8
+    )
+    private Integer afterRejectStateId;
+    @Column
+    @Comment("类型id 属于哪个类型的流程")
+    @ColDefine(
+            type = ColType.INT
+    )
+    private Integer typeId;
+    @Column
+    @Comment("会议审核类型")
+    @ColDefine(
+            type = ColType.VARCHAR
+    )
+    private String auditAfterType;
+    @Column
+    @Comment("审核类型")
+    @ColDefine(
+            type = ColType.INT
+    )
+    private Integer stateAuditType;
+    @Column
+    @Comment("审核人员匹配条件")
+    @ColDefine(
+            type = ColType.TEXT
+    )
+    private String matchCnd;
+    @Many(
+            field = "stateId"
+    )
+    private List<AuditStateUser> auditStateUserList;
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/AuditStateUser.java

@@ -0,0 +1,40 @@
+package com.ruoyi.additional.api.domain;
+
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+/**
+ * @Author JyuHsin
+ * @Date 2023/1/31
+ * @Description
+ */
+@Table
+@Data
+public class AuditStateUser {
+
+    @Name
+    @Comment("ID")
+    @ColDefine(
+            type = ColType.VARCHAR,
+            width = 32
+    )
+    @PrevInsert(
+            uu32 = true
+    )
+    private String id;
+    @Column
+    @ColDefine(
+            type = ColType.INT,
+            width = 8
+    )
+    @Comment("审核状态id")
+    private Integer stateId;
+    @Column
+    @ColDefine(
+            type = ColType.VARCHAR,
+            width = 32
+    )
+    @Comment("由谁来审核该状态（指定到某个用户）")
+    private String userId;
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/aidFundMember/AidFundMemberAuditRecord.java

@@ -0,0 +1,143 @@
+package com.ruoyi.additional.api.domain.aidFundMember;
+
+import com.ruoyi.additional.api.domain.Audit;
+import com.ruoyi.additional.api.domain.AuditState;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@TableIndexes({
+        @Index(name = "INDEX_AID_FUND_MEMBER_AUDIT_RECORD_USERID", fields = {"userId"}, unique = false),
+})
+@Table("aid_fund_member_audit_record")
+public class AidFundMemberAuditRecord extends BaseEntity {
+
+    @Column
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("用户id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String userId;
+
+    @Column
+    @Comment("分工会id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unionId;
+
+    @Column
+    @Comment("分工会名称")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String unionName;
+
+    @Column
+    @Comment("分工会编码")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String unionCode;
+
+    @Column
+    @Comment("单位id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String deptId;
+
+    @Column
+    @Comment("单位名称")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String deptName;
+
+    @Column
+    @Comment("单位编码")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String deptCode;
+
+    @Column
+    @Comment("人员类型")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String personType;
+
+    @Column
+    @Comment("在职状态")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String userState;
+
+    @Column
+    @Comment("申请时间")
+    private Date applyTime;
+
+    @Column
+    @Comment("加入/退出")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean isJoin;
+
+    @Column
+    @Comment("状态id")
+    @ColDefine(type = ColType.INT, width = 8)
+    private Integer stateId;
+
+    @Column
+    @Comment("自己签字id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    public String applySign;
+
+    @Column
+    @Comment("分工会审核记录id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    public String unionAuditId;
+
+    @Column
+    @Comment("分工会审核记录集合")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    public List<String> unionAuditIds;
+
+    @Column
+    @Comment("离退休干部审核记录id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    public String retirementAuditId;
+
+    @Column
+    @Comment("离退休干部审核记录集合")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    public List<String> retirementAuditIds;
+
+    @Column
+    @Comment("基金会审核记录id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    public String fundAuditId;
+
+    @Column
+    @Comment("基金会审核记录集合")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    public List<String> fundAuditIds;
+
+    @Column
+    @Comment("来源")
+    @ColDefine(type = ColType.INT, width = 1)
+    public Integer source;
+
+    @One(field = "fundAuditId")
+    public Audit fundAudit;
+
+    @One(field = "retirementAuditId")
+    public Audit retirementAudit;
+
+    @One(field = "unionAuditId")
+    public Audit unionAudit;
+
+    @One(field = "stateId")
+    private AuditState auditState;
+
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/aidFundMember/AidFundMemberHistory.java

@@ -0,0 +1,100 @@
+package com.ruoyi.additional.api.domain.aidFundMember;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.Date;
+
+/**
+ * 医疗互助历史基金会员
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@TableIndexes({
+        @Index(name = "INDEX_AID_FUND_MEMBER_HISTORY_USERID", fields = {"userId"}, unique = false),
+})
+@Table("aid_fund_member_history")
+public class AidFundMemberHistory extends BaseEntity {
+
+    @Column
+    @Comment("年份")
+    @ColDefine(type = ColType.INT, width = 4)
+    private Integer year;
+
+    @Column
+    @Comment("用户id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String userId;
+
+    @Column
+    @Comment("姓名")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String userName;
+
+    @Column
+    @Comment("工号")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String loginName;
+
+    @Column
+    @Comment("性别")
+    @ColDefine(type = ColType.VARCHAR, width = 1)
+    private String sex;
+
+    @Column
+    @Comment("人员类型")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String personType;
+
+    @Column
+    @Comment("在职状态")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String userState;
+
+    @Column
+    @Comment("所在单位")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String deptName;
+
+    @Column
+    @Comment("所在单位编码")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String deptCode;
+
+    @Column
+    @Comment("所在单位id")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String deptId;
+
+    @Column
+    @Comment("所在工会")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String unionName;
+
+    @Column
+    @Comment("所在工会编码")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String unionCode;
+
+    @Column
+    @Comment("所在工会id")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String unionId;
+
+    @Column
+    @Comment("加入时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date aidFundMemberJoinTime;
+
+    @Column
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/aidFundMember/AidFundMemberPay.java

@@ -0,0 +1,108 @@
+package com.ruoyi.additional.api.domain.aidFundMember;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+/**
+ * 基金会员缴费记录
+ *
+ * @author 1V
+ * @date 2021/04/19
+ * @since 1.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@Table("aid_fund_member_pay")
+@TableIndexes({
+        @Index(name = "INDEX_AID_FUND_MEMBER_PAY_USERID", fields = {"userId"}, unique = false),
+})
+public class AidFundMemberPay extends BaseEntity {
+
+    @Column
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("用户id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String userId;
+
+    @Column
+    @Comment("姓名")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String userName;
+
+    @Column
+    @Comment("工号")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String loginName;
+
+    @Column
+    @Comment("性别")
+    @ColDefine(type = ColType.VARCHAR, width = 1)
+    private String sex;
+
+    @Column
+    @Comment("人员类型")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String personType;
+
+    @Column
+    @Comment("在职状态")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String userState;
+
+    @Column
+    @Comment("所在单位")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String deptName;
+
+    @Column
+    @Comment("所在单位编码")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String deptCode;
+
+    @Column
+    @Comment("所在单位id")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String deptId;
+
+    @Column
+    @Comment("所在工会")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String unionName;
+
+    @Column
+    @Comment("所在工会编码")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String unionCode;
+
+    @Column
+    @Comment("所在工会id")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String unionId;
+
+    @Column
+    @Comment("年份")
+    @ColDefine(type = ColType.INT, width = 4)
+    private Integer year;
+
+    @Column
+    @Comment("缴费金额")
+    @ColDefine(customType = "DECIMAL(10,2)")
+    private Double money;
+
+    @Column
+    @Comment("是否已缴费")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean payed;
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/evaluate/Evaluate.java

@@ -0,0 +1,84 @@
+package com.ruoyi.additional.api.domain.evaluate;
+
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+import org.nutz.lang.util.NutMap;
+
+import java.util.List;
+
+/**
+ * @Author JyuHsin
+ * @Date 2022/7/21
+ * @Description 评优评先
+ */
+@Table("evaluate")
+@Data
+public class Evaluate {
+
+    @Column
+    @Name
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("荣誉id")
+    private String honorId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("创建人id")
+    private Long userid;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("荣誉类型id")
+    private String honorTypeId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("评优评先名称")
+    private String name;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("评优评先申请开始时间")
+    private String startTime;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("评优评先申请结束时间")
+    private String endTime;
+
+    @Column
+    @ColDefine(type = ColType.TEXT)
+    @Comment("评选条件")
+    private String conditions;
+
+    @Column
+    @ColDefine(type = ColType.TEXT)
+    @Comment("评选表彰程序")
+    private String program;
+
+    @Column
+    @ColDefine(type = ColType.INT)
+    @Comment("参加人员范围")
+    private Integer groupId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 200)
+    @Comment("评选名额说明")
+    private String directions;
+
+    @Column
+    @Comment("分工会名额分配")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<NutMap> unionLimit;
+
+    @Column
+    @Comment("是否发送系统消息")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean xlFlag;
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/evaluate/EvaluateApply.java

@@ -0,0 +1,217 @@
+package com.ruoyi.additional.api.domain.evaluate;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.ruoyi.common.core.domain.SysFile;
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.List;
+
+/**
+ * @Author JyuHsin
+ * @Date 2022/7/22
+ * @Description
+ */
+@Table("evaluate_apply")
+@Data
+public class EvaluateApply {
+
+    @Column
+    @Name
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("评优评先活动id")
+    private String evaluateId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("荣誉id")
+    private String honorId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("荣誉类型id")
+    private String honorTypeId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("申请人")
+    private Long userId;
+
+    @Column
+    @Comment("申请时间")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String applyTime;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("工号")
+    private String loginname;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 2)
+    @Comment("性别")
+    private String userSex;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    @Comment("民族")
+    private String nation;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("职务")
+    private String position;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("职称")
+    private String jobTitle;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("政治面貌")
+    private String political;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("在职状态")
+    private String userState;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("所属单位")
+    private String unitId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("所属工会")
+    private String unionId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("荣誉级别")
+    private String honorLevel;
+
+    @Column
+    @ColDefine(type = ColType.INT)
+    @Comment("审核状态")
+    private Integer stateId;
+
+    @Column
+    @Comment("单位审核记录id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    public String unitAuditId;
+
+    @Column
+    @Comment("分工会审核记录id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    public String unionAuditId;
+
+    @Column
+    @Comment("同级党组织审核记录id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    public String partyAuditId;
+
+    @Column
+    @Comment("校工会审核记录id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    public String schoolAuditId;
+
+    @Column
+    @ColDefine(type = ColType.TEXT)
+    @Comment("曾受何种奖励")
+    private String award;
+
+    @Column
+    @ColDefine(type = ColType.TEXT)
+    @Comment("主要事迹")
+    private String deeds;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("单位负责人")
+    private String unitLeader;
+
+    @Column
+    @Excel(name = "生日", exportFormat = "yyyy-MM-dd", importFormat = "yyyy-MM-dd", databaseFormat = "yyyy-MM-dd")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    @Comment("生日")
+    private String birthday;
+
+    @Column
+    @Comment("加入工会时间")
+    @Excel(name = "加入工会时间", exportFormat = "yyyy-MM-dd", importFormat = "yyyy-MM-dd", databaseFormat = "yyyy-MM-dd")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String joinTime;
+
+    @Column
+    @ColDefine(type = ColType.INT)
+    @Comment("单位人数")
+    private Long unitPeopleNum;
+
+    @Column
+    @ColDefine(type = ColType.INT)
+    @Comment("单位女职工人数")
+    private Long unitFemalePeopleNum;
+
+    @Column
+    @ColDefine(type = ColType.INT)
+    @Comment("单位会员人数")
+    private Long memberNum;
+
+    @Column
+    @ColDefine(type = ColType.INT)
+    @Comment("教职工总数")
+    private Long unionPeoNum;
+
+    @Column
+    @ColDefine(type = ColType.INT)
+    @Comment("分工会委员人数")
+    private Long leaderNumber;
+
+    @Column
+    @ColDefine(type = ColType.MYSQL_JSON)
+    @Comment("获奖材料")
+    private List<SysFile> files;
+
+    @Column
+    @ColDefine(type = ColType.INT)
+    @Comment("会员人数")
+    @Excel(name = "会员人数")
+    private Long memberNumber;
+
+    @Column
+    @ColDefine(type = ColType.INT)
+    @Comment("工会小组数")
+    @Excel(name = "工会小组数")
+    private Long unionGroupNumber;
+
+    @Column
+    @Comment("工会主席")
+    @Excel(name = "工会主席")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String unionLeader;
+
+    @Column
+    @Excel(name = "分工会")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("分工会")
+    private String unionName;
+
+    @Column
+    @Excel(name = "申报院级工会")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("申报院级工会")
+    private String applyUnionName;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("类别")
+    private String evaType;
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/evaluate/EvaluateQuotaAllocation.java

@@ -0,0 +1,36 @@
+package com.ruoyi.additional.api.domain.evaluate;
+
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+/**
+ * @Author JyuHsin
+ * @Date 2022/7/21
+ * @Description 评优评先名额分配
+ */
+@Table("evaluate_fpme")
+@Data
+public class EvaluateQuotaAllocation {
+
+    @Column
+    @Name
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("评优评先活动id")
+    private String evaluateId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("工会id")
+    private String unionId;
+
+    @Column
+    @ColDefine(type = ColType.INT)
+    @Comment("分配人数")
+    private String number;
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/fund/CostSet.java

@@ -0,0 +1,68 @@
+package com.ruoyi.additional.api.domain.fund;
+
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+
+import java.io.Serializable;
+
+/**
+ * @Author:xsb
+ * @Description: 每年的费用设置表实体类
+ * @Date:Created in 9:04 2021/1/28
+ */
+@Table("cost_set")
+@Data
+public class CostSet implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Column
+    @Name
+    @Comment("主键ID")
+    @Prev(els = {@EL("uuid()")})
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String id;
+
+    @Column
+    @Comment("年度")
+    @ColDefine(type = ColType.INT)
+    private Integer year;
+
+
+    @Column
+    @Comment("工会人均额度")
+    @ColDefine(type = ColType.FLOAT)
+    private Float union_avg;
+
+
+
+    @Column
+    @Comment("校工会额度")
+    @ColDefine(type = ColType.FLOAT)
+    private Float schoolMoney;
+
+
+    @Column
+    @Comment("社团人均额度")
+    @ColDefine(type = ColType.FLOAT)
+    private Float club_avg;
+
+
+    @Column
+    @Comment("基础人数")
+    @ColDefine(type = ColType.INT)
+    private int clubExceedNum;
+
+
+    @Column
+    @Comment("最少额度")
+    @ColDefine(type = ColType.FLOAT)
+    private Float clubLeastMoney;
+
+
+    @Column
+    @Comment("最多额度")
+    @ColDefine(type = ColType.FLOAT)
+    private Float clubAtMostMoney;
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/fund/FundClub.java

@@ -0,0 +1,85 @@
+package com.ruoyi.additional.api.domain.fund;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+
+import java.io.Serializable;
+
+/**
+ * @author: Aaron
+ * @create: 2020-08-18 15:01
+ * @description: 社团预算管理
+ **/
+@Table("jf_club")
+@Data
+public class FundClub implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Column
+    @Name
+    @Comment("主键ID")
+    @Prev(els = {@EL("uuid()")})
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String id;
+
+
+    @Column
+    @Comment("社团ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String club_id;
+
+    @Excel(name = "年度")
+    @Column
+    @Comment("年份")
+    @ColDefine(type = ColType.INT, width = 4)
+    private Integer year;
+
+    @Column
+    @Comment("社团活动费")
+    @ColDefine(type = ColType.INT)
+    private Integer club_activity_cost;
+
+    @Column
+    @Comment("六必访经费")
+    @ColDefine(type = ColType.INT)
+    private Integer lbf_cost;
+
+    @Excel(name = "总额度")
+    @Column
+    @Comment("总额度")
+    @ColDefine(type = ColType.FLOAT)
+    private Float total_quota;
+
+
+    @Excel(name = "协会人数")
+    @Column
+    @Comment("历史会员人数")
+    @ColDefine(type = ColType.INT)
+    private Integer history_member;
+
+    @Excel(name = "标准")
+    @Column
+    @Comment("历史人均额度")
+    @ColDefine(type = ColType.FLOAT)
+    private Float history_club_avg;
+
+
+    @Excel(name = "协会名称")
+    @Column
+    @Comment("历史协会名称")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String history_clubname;
+    @Column
+    @Comment("状态(>=1代表今年已经设置过,<1代表今年未设置,默认值是0)")
+    @Default("0")
+    @ColDefine(type = ColType.INT)
+    private Integer state;
+    @Column
+    @Comment("已使用额度")
+    @ColDefine(type = ColType.FLOAT, width = 10, precision = 2)
+    private double used_quota;
+
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/fund/FundSchool.java

@@ -0,0 +1,53 @@
+package com.ruoyi.additional.api.domain.fund;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+/**
+ * TODO
+ *
+ * @Author zhf
+ * @Date 2022/10/13 10:31
+ */
+@Table("jf_school")
+@Data
+public class FundSchool {
+
+    @Column
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+
+    @Excel(name = "年度")
+    @Column
+    @Comment("年份")
+    @ColDefine(type = ColType.INT, width = 4)
+    private Integer year;
+
+
+    @Excel(name = "总额度")
+    @Column
+    @Comment("总额度")
+    @ColDefine(type = ColType.FLOAT)
+    private Float totalQuota;
+
+
+    @Column
+    @Comment("已使用额度")
+    @ColDefine(type = ColType.FLOAT, width = 10, precision = 2)
+    private double usedQuota;
+
+
+    @Column
+    @Comment("状态(>=1代表今年已经设置过,<1代表今年未设置,默认值是0)")
+    @Default("0")
+    @ColDefine(type = ColType.INT)
+    private Integer state;
+
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/fund/FundUnion.java

@@ -0,0 +1,112 @@
+package com.ruoyi.additional.api.domain.fund;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+
+import java.io.Serializable;
+
+/**
+ * @author: Aaron
+ * @create: 2020-08-14 10:30
+ * @description: 院级工会经费管理
+ **/
+@Table("jf_yjgh")
+@Data
+public class FundUnion implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Column
+    @Name
+    @Comment("主键ID")
+    @Prev(els = {@EL("uuid()")})
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String id;
+
+
+    @Column
+    @Comment("院级工会ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unionId;
+
+
+    @Excel(name = "年度")
+    @Column
+    @Comment("年份")
+    @ColDefine(type = ColType.INT, width = 4)
+    private Integer year;
+
+
+    @Column
+    @Comment("院级工会活动费")
+    @ColDefine(type = ColType.INT)
+    private Integer unionActivityCost;
+
+
+    @Column
+    @Comment("六必访经费")
+    @ColDefine(type = ColType.INT)
+    private Integer lbfCost;
+
+
+    @Excel(name = "总额度")
+    @Column
+    @Comment("总额度")
+    @ColDefine(type = ColType.FLOAT)
+    private Float totalQuota;
+    @Column
+    @Comment("已使用额度")
+    @ColDefine(type = ColType.FLOAT, width = 10, precision = 2)
+    private double usedQuota;
+    @Column
+    @Comment("状态(>=1代表今年已经设置过,<1代表今年未设置,默认值是0)")
+    @Default("0")
+    @ColDefine(type = ColType.INT)
+    private Integer state;
+    @Excel(name = "会员人数")
+    @Column
+    @Comment("历史会员人数")
+    @ColDefine(type = ColType.INT)
+    private Integer history_member;
+    @Excel(name = "标准")
+    @Column
+    @Comment("历史人均额度")
+    @ColDefine(type = ColType.FLOAT)
+    private Float history_union_avg;
+    @Excel(name = "院级工会名称")
+    @Column
+    @Comment("历史院级工会名称")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String history_unionname;
+    @Column
+    @Comment("调整事由")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String reason;
+
+    public Float getTotalQuota() {
+        return totalQuota;
+    }
+
+    public void setTotalQuota(Float totalQuota) {
+        this.totalQuota = totalQuota;
+    }
+
+
+//
+//    @Excel(name = "年度")
+//    @Column
+//    @Comment("历史年度")
+//    @ColDefine(type = ColType.INT,width = 4)
+//    private Integer history_year;
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/fund/FundUse.java

@@ -0,0 +1,72 @@
+package com.ruoyi.additional.api.domain.fund;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+
+import java.io.Serializable;
+
+/**
+ * @author: Aaron
+ * @create: 2020-08-18 09:30
+ * @description: 预算使用详情
+ **/
+@Table("jf_use")
+@Data
+public class FundUse implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Column
+    @Name
+    @Comment("主键ID")
+    @Prev(els = {@EL("uuid()")})
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String id;
+
+    @Column
+    @Comment("被调整经费ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String adjust_id;
+
+    @Column
+    @Comment("项目")
+    @ColDefine(type = ColType.VARCHAR, width = 255)
+    private String project;
+
+
+    @Column
+    @Comment("调整金额")
+    @ColDefine(type = ColType.FLOAT, width = 10, precision = 2)
+    private double adjust_money;
+
+    @Column
+    @Comment("调整事由")
+    @ColDefine(type = ColType.VARCHAR, width = 500)
+    private String adjust_reason;
+
+    @Column
+    @Comment("调整时间")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String adjust_time;
+
+    @Column
+    @Comment("调整人")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private Long adjust_person;
+    @Column
+    @Comment("报销id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String apply_id;
+    @Column
+    @Comment("活动人数")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String activitie_number;
+    @Column
+    @Comment("活动时间")
+    @ColDefine(type = ColType.VARCHAR)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private String activitie_time;
+
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/fund/SchoolUse.java

@@ -0,0 +1,28 @@
+package com.ruoyi.additional.api.domain.fund;
+
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+/**
+ * TODO
+ *
+ * @Author zhf
+ * @Date 2022/10/13 17:14
+ */
+@Table
+@Data
+public class SchoolUse {
+
+    @Column
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("报销Id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String reimbursementId;
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/honor/Honor.java

@@ -0,0 +1,197 @@
+package com.ruoyi.additional.api.domain.honor;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.ruoyi.common.core.domain.SysFile;
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Table("honor")
+@Data
+public class Honor implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Column
+    @Name
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("姓名Id")
+    private Long userId;
+
+    @Column
+    @Excel(name = "工号")
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    @Comment("工号")
+    private String loginName;
+
+    @Column
+    @Excel(name = "姓名")
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    @Comment("姓名")
+    private String userName;
+
+    @Column
+    @Excel(name = "性别")
+    @ColDefine(type = ColType.VARCHAR, width = 1)
+    @Comment("性别")
+    private String userSex;
+
+    @Column
+    @Excel(name = "职务")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("职务")
+    private String post;
+
+    @Column
+    @Excel(name = "职称")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("职称")
+    private String title;
+
+    @Column
+    @Excel(name = "生日", exportFormat = "yyyy-MM-dd", importFormat = "yyyy-MM-dd", databaseFormat = "yyyy-MM-dd")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("生日")
+    private String birthday;
+
+    @Column
+    @Excel(name = "工作时间", exportFormat = "yyyy-MM-dd", importFormat = "yyyy-MM-dd", databaseFormat = "yyyy-MM-dd")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("工作时间")
+    private String workDate;
+
+    @Column
+    @Excel(name = "在职状态")
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    @Comment("在职状态")
+    private String jobStatus;
+
+    @Column
+    @Excel(name = "分工会")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    @Comment("分工会")
+    private String unionName;
+
+    @Column
+    @Excel(name = "单位")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    @Comment("单位")
+    private String unitName;
+
+    @Column
+    @Excel(name = "单位负责人")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("单位负责人")
+    private String unitLeader;
+
+    @Column
+    @Excel(name = "单位人数")
+    @ColDefine(type = ColType.INT)
+    @Comment("单位人数")
+    private Long unitPeopleNum;
+
+    @Column
+    @Excel(name = "单位女职工人数")
+    @ColDefine(type = ColType.INT)
+    @Comment("单位女职工人数")
+    private Long unitFemalePeopleNum;
+
+    @Column
+    @Excel(name = "奖项")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("奖项")
+    private String prize;
+
+    @Column
+    @Excel(name = "奖项说明")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    @Comment("奖项说明")
+    private String prizeDesc;
+
+    @Column
+    @Excel(name = "荣誉类型")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("荣誉类型")
+    private String honorType;
+
+    @Column
+    @Excel(name = "荣誉级别")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("荣誉级别")
+    private String honorLevel;
+
+    @Column
+    @Excel(name = "授予单位")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    @Comment("授予单位")
+    private String grantUnit;
+
+    @Column
+    @Excel(name = "参加比赛名称")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    @Comment("参加比赛名称")
+    private String gameName;
+
+    @Column
+    @Excel(name = "参与人员")
+    @ColDefine(type = ColType.VARCHAR, width = 200)
+    @Comment("参与人员")
+    private String gamePersons;
+
+    @Column
+    @Excel(name = "授予时间", exportFormat = "yyyy-MM-dd", importFormat = "yyyy-MM-dd", databaseFormat = "yyyy-MM-dd")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("授予时间")
+    private String grantDate;
+
+    @Column
+    @Excel(name = "存档情况")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("存档情况")
+    private String archiveStatus;
+
+    @Column
+    @Excel(name = "奖项介质")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("奖项介质")
+    private String awardType;
+
+    @Column
+    @ColDefine(type = ColType.MYSQL_JSON, width = 200)
+    @Comment("获奖材料")
+    private List<String> awardMaterials;
+
+    @Excel(name = "获奖材料")
+    private String awardMaterialsExcel;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("所属分工会")
+    private String unionId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("所属单位")
+    private Long unitId;
+
+    @Column
+    @ColDefine(type = ColType.MYSQL_JSON)
+    @Comment("附件")
+    private List<SysFile> files;
+
+    @Column
+    @ColDefine(type = ColType.TEXT)
+    @Comment("工作室简介")
+    @Excel(name = "工作室简介")
+    private String workRoomDesc;
+
+    private String errMsg;
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/honor/HonorApply.java

@@ -0,0 +1,167 @@
+package com.ruoyi.additional.api.domain.honor;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.ruoyi.common.core.domain.SysFile;
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.List;
+
+/**
+ * @author zhf
+ * @date 2021/11/18 8:44
+ * @description
+ */
+@Table("honor_apply")
+@Data
+public class HonorApply {
+
+
+    @Column
+    @Name
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("姓名Id")
+    private String userId;
+
+
+    @Column
+    @Excel(name = "姓名")
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    @Comment("姓名")
+    private String userName;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("职务")
+    private String post;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("职称")
+    private String title;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("民族")
+    private String nation;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 1)
+    @Comment("性别")
+    private String userSex;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("政治面貌")
+    private String political;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    @Comment("在职状态")
+    private String jobStatus;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("生日")
+    private String birthday;
+
+    @Column
+    @ColDefine(type = ColType.TEXT)
+    @Comment("曾受何种奖励")
+    private String award;
+
+    @Column
+    @ColDefine(type = ColType.TEXT)
+    @Comment("主要事迹")
+    private String Deeds;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("单位负责人")
+    private String unitLeader;
+
+    @Column
+    @ColDefine(type = ColType.INT)
+    @Comment("单位人数")
+    private Long unitPeopleNum;
+
+    @Column
+    @ColDefine(type = ColType.INT)
+    @Comment("单位女职工人数")
+    private Long unitFemalePeopleNum;
+
+    @Column
+    @Comment("申请时间")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String applyTime;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("奖项")
+    private String prize;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    @Comment("奖项说明")
+    private String prizeDesc;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("荣誉类型")
+    private String honorType;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("荣誉级别")
+    private String honorLevel;
+
+    @Column
+    @ColDefine(type = ColType.INT)
+    @Comment("审核状态")
+    private Integer stateId;
+
+    @Column
+    @Excel(name = "分工会")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("分工会")
+    private String unionName;
+
+    @Column
+    @Excel(name = "单位")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("单位")
+    private String unitName;
+
+    @Column
+    @ColDefine(type = ColType.MYSQL_JSON)
+    @Comment("附件")
+    private List<SysFile> files;
+
+    @Column
+    @Comment("单位审核记录id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    public String unitAuditId;
+
+    @Column
+    @Comment("分工会审核记录id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    public String unionAuditId;
+
+    @Column
+    @Comment("同级党组织审核记录id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    public String partyAuditId;
+
+    @Column
+    @Comment("校工会审核记录id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    public String schoolAuditId;
+
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/honor/HonorBasicSettings.java

@@ -0,0 +1,48 @@
+package com.ruoyi.additional.api.domain.honor;
+
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Table("honor_basic_settings")
+@Data
+public class HonorBasicSettings implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Column
+    @Name
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("父级id")
+    private String parentId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("code")
+    private String code;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("name")
+    private String name;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("level")
+    private String level;
+
+    @Column
+    @Comment("有子节点")
+    private boolean hasChildren;
+
+    private List<HonorBasicSettings> children;
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/medical/MedicalAid.java

@@ -0,0 +1,322 @@
+package com.ruoyi.additional.api.domain.medical;
+
+import com.ruoyi.additional.api.domain.Audit;
+import com.ruoyi.additional.api.domain.AuditState;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+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)
+@Data
+@Table("medical_aid")
+public class MedicalAid extends BaseEntity {
+
+    @Column
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("年份")
+    @ColDefine(type = ColType.INT, width = 4)
+    private Integer year;
+
+    @Column
+    @Comment("类型 （1：医疗补助 2：重疾医疗补助 3：特殊门诊补助）")
+    @ColDefine(type = ColType.VARCHAR, width = 4)
+    private String type;
+
+    @Column
+    @Comment("状态id")
+    @ColDefine(type = ColType.INT, width = 8)
+    private Integer stateId;
+
+    @Column
+    @Comment("疾病类型")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String diseaseTypeId;
+
+    @Column
+    @Comment("申请时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date applyTime;
+
+    @Column
+    @Comment("用户id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String userId;
+
+    @Column
+    @Comment("姓名")
+    @ColDefine(type = ColType.VARCHAR, width = 200)
+    private String userName;
+
+    @Column
+    @Comment("工号")
+    @ColDefine(type = ColType.VARCHAR, width = 200)
+    private String loginName;
+
+    @Column
+    @Comment("年龄")
+    @ColDefine(type = ColType.VARCHAR, width = 4)
+    private String userSex;
+
+    @Column
+    @Comment("年龄")
+    @ColDefine(type = ColType.INT, width = 4)
+    private Integer userAge;
+
+    @Column
+    @Comment("是否在职")
+    @ColDefine(type = ColType.VARCHAR)
+    private String userState;
+
+    @Column
+    @Comment("分工会id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unionId;
+
+    @Column
+    @Comment("人分工会")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String unionName;
+
+    @Column
+    @Comment("单位id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unitId;
+
+    @Column
+    @Comment("单位")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String unitName;
+
+    @Column
+    @Comment("三级单位id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String threeUnitId;
+
+    @Column
+    @Comment("三级单位")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String threeUnitName;
+
+    @Column
+    @Comment("工会小组id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unionGroupId;
+
+    @Column
+    @Comment("工会小组")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String unionGroupName;
+
+    @Column
+    @Comment("疾病诊断")
+    @ColDefine(type = ColType.VARCHAR, width = 255)
+    private String diseaseDiagnosis;
+
+    @Column
+    @Comment("开户银行名称")
+    @ColDefine(type = ColType.VARCHAR, width = 255)
+    private String bankName;
+
+    @Column
+    @Comment("银行账号")
+    @ColDefine(type = ColType.VARCHAR, width = 255)
+    private String bankAccount;
+
+    @Column
+    @Comment("申请人签字")
+    @ColDefine(customType = "longtext")
+    private String signText;
+
+
+    //普通医疗补助 start
+
+    @Column
+    @Comment("入住医院")
+    @ColDefine(type = ColType.VARCHAR, width = 255)
+    private String hospital;
+
+    @Column
+    @Comment("住院天数")
+    @ColDefine(type = ColType.INT, width = 4)
+    private Integer hospitalStay;
+
+    @Column
+    @Comment("住院时间（yyyy-MM-dd - yyyy-MM-dd）")
+    @ColDefine(type = ColType.VARCHAR, width = 255)
+    private String hospitalTime;
+
+    @Column
+    @Comment("联系电话")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String mobile;
+
+    @Column
+    @Comment("本次住院医疗费总额")
+    @ColDefine(type = ColType.FLOAT, width = 10, precision = 2)
+    private Double total_medical_expenses;
+
+    @Column
+    @Comment("统筹基金支付总额（医保支付）")
+    @ColDefine(type = ColType.FLOAT, width = 10, precision = 2)
+    private Double overall_fund_payment;
+
+    @Column
+    @Comment("个人实际支付金额")
+    @ColDefine(type = ColType.FLOAT, width = 10, precision = 2)
+    private Double selfPayMoney;
+
+    @Column
+    @Comment("其他保险金额")
+    @ColDefine(type = ColType.FLOAT, width = 10, precision = 2)
+    private Double insured_amount;
+
+    @Column
+    @Comment("发票号码")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String invoice_num;
+
+    @Column
+    @Comment("分工会审核记录ids")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String branchUnionAuditId;
+
+    @Column
+    @Comment("分工会审核记录集合")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> branchUnionAuditIds;
+
+    @One(field = "branchUnionAuditId")
+    private Audit branchUnionAudit;
+
+    private List<Audit> branchUnionAudits;
+
+    @Column
+    @Comment("离退休干部审核记录id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String retireAuditId;
+
+    @Column
+    @Comment("离退休干部审核记录集合")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> retireAuditIds;
+
+    @One(field = "retireAuditId")
+    private Audit retireAudit;
+
+    private List<Audit> retireAudits;
+
+    @Column
+    @Comment("校医院审核记录id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String schoolHospitalAuditId;
+
+    @Column
+    @Comment("校医院审核记录集合")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> schoolHospitalAuditIds;
+
+    private List<Audit> schoolHospitalAudits;
+
+    @Column
+    @Comment("工会会计审核记录id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String schoolAccountingAuditId;
+
+    @Column
+    @Comment("工会会计审核记录集合")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> schoolAccountingAuditIds;
+
+    @One(field = "schoolAccountingAuditId")
+    private Audit schoolAccountingAudit;
+
+    private List<Audit> schoolAccountingAudits;
+
+    @Column
+    @Comment("工会副主席审核记录id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String schoolViceChairmanAuditId;
+
+    @Column
+    @Comment("工会副主席审核记录集合")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> schoolViceChairmanAuditIds;
+
+    private List<Audit> schoolViceChairmanAudits;
+
+    @Column
+    @Comment("工会主席审核记录id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String schoolChairmanAuditId;
+
+    @Column
+    @Comment("工会主席审核记录集合")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> schoolChairmanAuditIds;
+
+    private List<Audit> schoolChairmanAudits;
+
+    @Column
+    @Comment("财务出纳审核记录id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String financialCashierAuditId;
+
+    @Column
+    @Comment("财务出纳审核记录集合")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> financialCashierAuditIds;
+
+    private List<Audit> financialCashierAudits;
+
+//    //重疾补助需要 start
+//    @Column
+//    @Comment("住院医疗总费用")
+//    @ColDefine(type = ColType.FLOAT, width = 10, precision = 2)
+//    private Double already_total_medical_expenses;
+//
+//    @Column
+//    @Comment("统筹基金支付总数")
+//    @ColDefine(type = ColType.FLOAT, width = 10, precision = 2)
+//    private Double already_overall_fund_payment;
+//
+//    @Column
+//    @Comment("学校医疗补助已补助金额")
+//    @ColDefine(type = ColType.FLOAT, width = 10, precision = 2)
+//    private Double already_subsidized;
+//    //end
+//
+//    @Column
+//    @Comment("补助金总额")
+//    @ColDefine(type = ColType.FLOAT, width = 10, precision = 2)
+//    private Double total_grant;
+
+    @Column
+    @Comment("医疗互助补助金额")
+    @ColDefine(type = ColType.FLOAT, width = 10, precision = 2)
+    private Double ordinarySubsidiesAmount;
+
+    @Column
+    @Comment("重疾补助金额")
+    @ColDefine(type = ColType.FLOAT, width = 10, precision = 2)
+    private Double seriousSubsidiesAmount;
+
+    @One(field = "stateId")
+    private AuditState state;
+
+    @Column
+    @Comment("普通疾病办理id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String ordinaryId;
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/medical/MedicalAidDiseaseType.java

@@ -0,0 +1,46 @@
+package com.ruoyi.additional.api.domain.medical;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+/**
+ * @author: Aaron
+ * @create: 2021-04-28 16:44
+ * @description: 医疗互助疾病类型表
+ **/
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Table("medical_aid_disease_type")
+public class MedicalAidDiseaseType extends BaseEntity {
+
+    @Column
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("编码")
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    private String typeCode;
+
+    @Column
+    @Comment("名称")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String typeName;
+
+    @Column
+    @Comment("备注")
+    @ColDefine(type = ColType.VARCHAR, width = 500)
+    private String typeNotes;
+
+    /**
+     * 普通疾病id
+     */
+    public static final String ORDINARY_DISEASE_ID = "1";
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/meeting/MeetingInfo.java

@@ -0,0 +1,92 @@
+package com.ruoyi.additional.api.domain.meeting;
+
+import cn.hutool.core.date.DateTime;
+import com.ruoyi.additional.api.domain.msgNotify.MsgNotify;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.Date;
+import java.util.List;
+
+@Table
+@Data
+@Accessors(chain = true)
+public class MeetingInfo {
+
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("名称")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String meetingName;
+
+    @Column
+    @Comment("地点")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String location;
+
+    @Column
+    @Comment("会议类型")
+    @ColDefine(type = ColType.INT)
+    private Integer typeId;
+
+    @Column
+    @Comment("开始时间")
+    @ColDefine(type = ColType.DATETIME)
+    private DateTime startTime;
+
+    @Column
+    @Comment("结束时间")
+    @ColDefine(type = ColType.DATETIME)
+    private DateTime endTime;
+
+    @Column
+    @Comment("是否可以请假")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean isCanLeave;
+
+    @Column
+    @Comment("是否多次签到")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean manySign;
+
+    @Column
+    @Comment("请假截至时间")
+    @ColDefine(type = ColType.DATETIME)
+    private DateTime leaveDeadline;
+
+    @Column
+    @Comment("会议描述")
+    @ColDefine(type = ColType.VARCHAR, width = 2000)
+    private String meetingDescription;
+
+    @Column
+    @Comment("关联会议id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String notifyId;
+
+    /**
+     * 会议时间段
+     */
+    @Many(field = "meetingId")
+    private List<MeetingTimePeriod> meetingTimePeriods;
+
+    /**
+     * 会议参加人员
+     */
+    @Many(field = "meetingId")
+    private List<MeetingUser> meetingUserList;
+
+    /**
+     * 消息对象
+     */
+//    @One(field = "")
+    private MsgNotify msgNotify;
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/meeting/MeetingTimePeriod.java

@@ -0,0 +1,49 @@
+package com.ruoyi.additional.api.domain.meeting;
+
+import cn.hutool.core.date.DateTime;
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 会议时间段
+ */
+@Table
+@Data
+@TableIndexes({
+        @Index(name = "INDEX_MEETINGTIMEPERIOD_MEETING_ID", fields = {"meetingId"}, unique = false),})
+public class MeetingTimePeriod {
+
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("会议id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String meetingId;
+
+    @Column
+    @Comment("时间段会议名称")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String timePeriodName;
+
+    @Column
+    @Comment("开始时间")
+    @ColDefine(type = ColType.DATETIME)
+    private DateTime startTime;
+
+    @Column
+    @Comment("结束时间")
+    @ColDefine(type = ColType.DATETIME)
+    private DateTime endTime;
+
+    @Many(field = "meetingTimePeriodId")
+    private List<MeetingTimePeriodUser> meetingTimePeriodUserList;
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/meeting/MeetingTimePeriodUser.java

@@ -0,0 +1,83 @@
+package com.ruoyi.additional.api.domain.meeting;
+
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+import org.nutz.lang.util.NutMap;
+
+import java.util.Date;
+import java.util.List;
+
+@Table
+@Data
+@TableIndexes({
+        @Index(name = "INDEX_MEETINGTIMEPERIODUSER_MEETING_TIME_PERIOD_ID", fields = {"meetingTimePeriodId"}, unique = false),
+        @Index(name = "INDEX_MEETINGTIMEPERIODUSER_MEETING_ID", fields = {"meetingId"}, unique = false)})
+public class MeetingTimePeriodUser {
+
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("会议id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String meetingId;
+
+    @Column
+    @Comment("会议时间段id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String meetingTimePeriodId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("用户id")
+    private String userId;
+
+    @Column
+    @ColDefine(type = ColType.BOOLEAN)
+    @Comment("是否参加")
+    private Boolean isJoin;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    @Comment("请假理由")
+    private String leaveReason;
+
+    @Column
+    @Comment("用户请假开始时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date userLeaveStartTime;
+
+    @Column
+    @Comment("用户请假结束时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date userLeaveEndTime;
+
+    @Column
+    @ColDefine(type = ColType.INT)
+    @Comment("请假当前状态")
+    private Integer stateCode;
+
+    @Column
+    @ColDefine(type = ColType.BOOLEAN)
+    @Comment("是否签到")
+    private Boolean isSignIn;
+
+    @Column
+    @ColDefine(type = ColType.DATETIME)
+    @Comment("签到时间")
+    private Date signInDateTime;
+
+    /**
+     * 审核记录
+     */
+    @Column
+    @ColDefine(type = ColType.MYSQL_JSON)
+    @Comment("审核记录ID")
+    private List<NutMap> auditIdList;
+
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/meeting/MeetingType.java

@@ -0,0 +1,38 @@
+package com.ruoyi.additional.api.domain.meeting;
+
+import com.ruoyi.additional.api.domain.AuditState;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+
+import java.util.List;
+
+@Table
+@Data
+@Accessors(chain = true)
+public class MeetingType {
+
+    @Id
+    @Comment("ID")
+    @ColDefine(type = ColType.INT)
+    private Integer id;
+
+    @Column
+    @Comment("名称")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String typeName;
+
+    @Column
+    @Comment("模块名称")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String moduleName;
+
+    @Column
+    @Comment("排序")
+    @ColDefine(type = ColType.INT)
+    private int sortNum;
+
+    @Many(field = "typeId")
+    private List<AuditState> auditStateList;
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/meeting/MeetingUser.java

@@ -0,0 +1,78 @@
+package com.ruoyi.additional.api.domain.meeting;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+import org.nutz.lang.util.NutMap;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 参会人员表
+ */
+@Table
+@Data
+@Accessors(chain = true)
+public class MeetingUser {
+
+    @Name
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("会议ID")
+    private String meetingId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("用户id")
+    private String userId;
+
+    @Column
+    @ColDefine(type = ColType.BOOLEAN)
+    @Comment("是否参加")
+    private Boolean isJoin;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    @Comment("请假理由")
+    private String leaveReason;
+
+    @Column
+    @Comment("用户请假开始时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date userLeaveStartTime;
+
+    @Column
+    @Comment("用户请假结束时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date userLeaveEndTime;
+
+    @Column
+    @ColDefine(type = ColType.INT)
+    @Comment("请假当前状态")
+    private Integer stateCode;
+
+    @Column
+    @ColDefine(type = ColType.BOOLEAN)
+    @Comment("是否签到")
+    private Boolean isSignIn;
+
+    @Column
+    @ColDefine(type = ColType.DATETIME)
+    @Comment("签到时间")
+    private Date signInDateTime;
+
+    /**
+     * 审核记录
+     */
+    @Column
+    @ColDefine(type = ColType.MYSQL_JSON)
+    @Comment("审核记录ID")
+    private List<NutMap> auditIdList;
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/msgNotify/MsgNotify.java

@@ -0,0 +1,86 @@
+package com.ruoyi.additional.api.domain.msgNotify;
+
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * @Author zhf
+ * @Date 2023/2/13 9:40
+ */
+@Table("msg_notify")
+@Data
+public class MsgNotify {
+
+
+    @Column
+    @Name
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+
+    @Column
+    @Comment("发送标题")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String title;
+
+    @Column
+    @Comment("发送对象")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String activityGroupId;
+
+    @Column
+    @Comment("发送所属模块")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String module;
+
+    @Column
+    @Comment("发送所属教代会")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String teacherMeetingId;
+
+    @Column
+    @Comment("发送对象")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String type;
+
+    @Column
+    @Comment("发送角色")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> roleIds;
+
+
+    @Column
+    @Comment("发送方式")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> sendTypes;
+
+
+    @Column
+    @Comment("发送内容")
+    @ColDefine(type = ColType.VARCHAR, width = 1000)
+    private String content;
+
+    @Column
+    @Comment("创建时间")
+    @ColDefine(type = ColType.VARCHAR, width = 1000)
+    private String CreateTime;
+
+    @Column
+    @Comment("发送时间")
+    @ColDefine(type = ColType.VARCHAR, width = 1000)
+    private String sendTime;
+
+    @Column
+    @Comment("是否保存")
+    @ColDefine(type = ColType.BOOLEAN)
+    private boolean hold;
+
+    private List<String> users;
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/msgNotify/MsgNotifyUser.java

@@ -0,0 +1,45 @@
+package com.ruoyi.additional.api.domain.msgNotify;
+
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+/**
+ * TODO
+ *
+ * @Author zhf
+ * @Date 2023/2/13 9:45
+ */
+@Table("msg_notify_user")
+@Data
+public class MsgNotifyUser {
+
+
+    @Column
+    @Name
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("发送用户ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String userId;
+    private String loginName;
+
+
+    @Column
+    @Comment("发送人")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String sendUser;
+
+
+    @Column
+    @Comment("标题id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String titleId;
+
+
+
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/offerAdvice/OfferAdvice.java

@@ -0,0 +1,143 @@
+package com.ruoyi.additional.api.domain.offerAdvice;
+
+import cn.hutool.core.date.DateTime;
+import com.ruoyi.additional.api.domain.Audit;
+import com.ruoyi.common.core.domain.SysFile;
+import com.ruoyi.proposal.api.domain.ProposalType;
+import com.ruoyi.proposal.api.domain.ProposalUnderTake;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @FileName io.v.nutz.offerAdviceSuggestion.model.OfferAdviceSuggestion
+ * @Description: TODO
+ * @Author zxc
+ * @Date 2022/6/23:09:54
+ * @Version V1.0
+ **/
+@Table
+@Data
+@Accessors(chain = true)
+public class OfferAdvice {
+
+    @Name
+    @Comment("id")
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("主题")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String subjectName;
+
+    @Column
+    @Comment("提案类型")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private Long typeId;
+
+    @Column
+    @Comment("创建人ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private Long createUserId;
+
+    @Column
+    @Comment("创建人工号")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String createLoginName;
+
+    @Column
+    @Comment("创建人姓名")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String createUserName;
+
+    @Column
+    @Comment("创建时间")
+    @ColDefine(type = ColType.DATETIME)
+    private DateTime createTime;
+
+    @Column
+    @Comment("创建人单位ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private Long createUnitId;
+
+    @Column
+    @Comment("创建人单位")
+    @ColDefine(type = ColType.VARCHAR, width = 200)
+    private String createUnitName;
+
+    @Column
+    @Comment("创建人工会ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String createUnionId;
+
+    @Column
+    @Comment("创建人工会")
+    @ColDefine(type = ColType.VARCHAR, width = 200)
+    private String createUnionName;
+
+    @Column
+    @Comment("案由")
+    @ColDefine(type = ColType.TEXT)
+    private String brief;
+
+    @Column
+    @Comment("建议措施")
+    @ColDefine(type = ColType.TEXT)
+    private String measures;
+
+    @Column
+    @Comment("状态")
+    @ColDefine(type = ColType.INT, width = 4)
+    private Integer stateCode;
+
+    @Column
+    @Comment("附件")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<SysFile> files;
+
+    @Column
+    @Comment("校工会建议是否公示")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean schoolUnionPublicity;
+
+    @Column
+    @Comment("是否公示")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean publicity;
+
+    @Column
+    @Comment("校工会审核ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String schoolUnionAuditId;
+
+    @Column
+    @Comment("承办单位ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String undertakeUnitId;
+
+    @Column
+    @Comment("领导审核ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String leaderAuditId;
+
+    @Column
+    @Comment("是否提交")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean isSubmit;
+
+    @One(field = "schoolUnionAuditId")
+    private Audit schoolUnionAuditInfo;
+
+    @One(field = "leaderAuditId")
+    private Audit leaderAuditInfo;
+
+    private ProposalUnderTake underTakeInfo;
+
+    private ProposalType type;
+
+}

ruoyi-api/ruoyi-api-additional/src/main/java/com/ruoyi/additional/api/domain/reimbursement/ReimbursementNew.java

@@ -0,0 +1,314 @@
+package com.ruoyi.additional.api.domain.reimbursement;
+
+import com.ruoyi.common.core.domain.SysFile;
+import lombok.Data;
+import org.nutz.dao.DB;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * @Author zhf 报销新表
+ * @Date 2022/7/21 11:29
+ */
+
+@Data
+@Table
+public class ReimbursementNew {
+
+    @Column
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("经办人id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private Long userId;
+
+
+    @Column
+    @Comment("经办人姓名")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String userName;
+
+    @Column
+    @Comment("经办人电话")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String mobile;
+
+    @Column
+    @Comment("工号")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String loginName;
+
+
+    @Column
+    @Comment("单位")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String unitName;
+
+    @Column
+    @Comment("单位id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private Long unitId;
+
+    @Column
+    @Comment("社团id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String clubId;
+
+    @Column
+    @Comment("工会")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String unionName;
+
+    @Column
+    @Comment("工会id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unionId;
+
+    @Column
+    @Comment("报销经费来源")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String jf_source;
+
+    @Column
+    @Comment("慰问人电话")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String conMobile;
+
+    @Column
+    @Comment("报销类别")
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    private String reimbursementItemSort;
+
+    @Column
+    @Comment("报销项目")
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    private String reimbursementItemId;
+
+    @Column
+    @Comment("报销项目名称")
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    private String reimbursementItemName;
+
+    @Column
+    @Comment("状态")
+    @ColDefine(type = ColType.INT, width = 10)
+    private Integer state;
+
+
+    @Column
+    @Comment("申请时间")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String applyTime;
+
+    @Column
+    @Comment("支付方式Id")
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    private String paymentMethodId;
+
+    @Column
+    @Comment("支付方式名称")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String paymentMethodName;
+
+    @Column
+    @Comment("户名")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String bankUserName;
+
+    @Column
+    @Comment("账号")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String bankCardNumber;
+
+    @Column
+    @Comment("开户行")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String bankOfDeposit;
+
+    @Column
+    @Comment("参加慰问人员")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String personnel;
+
+    @Column
+    @Comment("附件数量")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String files_num;
+
+    @Column
+    @Comment("备注")
+    @ColDefine(type = ColType.VARCHAR, width = 500)
+    private String remark;
+
+    @Column
+    @Comment("报销事由")
+    @ColDefine(type = ColType.TEXT)
+    private String cause;
+
+    @Column
+    @Comment("附件")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<SysFile> files;
+
+    @Column
+    @Comment("经办人签字")
+    @ColDefine(customType = "longtext")
+    private String agentSign;
+
+    @Column
+    @Comment("分工会审核id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unionAuditId;
+
+    @Column
+    @Comment("会计审核id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String accountantAuditId;
+
+    @Column
+    @Comment("校工会审核id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String schoolAuditId;
+
+    @Column
+    @Comment("单据号")
+    @Prev({
+            @SQL(db = DB.MYSQL, value = "SELECT CONCAT(YEAR(NOW()),LPAD(RIGHT((SELECT IFNULL(MAX(document_no),0) from reimbursement_new WHERE LEFT(document_no,4) = YEAR(NOW())),5)+1, 5, 0) )"),
+    })
+    private Integer document_no;
+
+
+    /**
+     * 慰问
+     */
+
+    @Column
+    @Comment("被慰问人")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String be_user;
+
+    @Column
+    @Comment("慰问类型")
+    @ColDefine(type = ColType.INT)
+    private Integer type;
+
+    @Column
+    @Comment("性别")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String sex;
+
+    @Column
+    @Comment("生日")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String birthday;
+
+    @Column
+    @Comment("身份证号")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String idCard;
+
+    @Column
+    @Comment("慰问方式")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String way;
+
+    @Column
+    @Comment("发生时间")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String occur_time;
+
+    @Column
+    @Comment("慰问金额")
+    @ColDefine(type = ColType.FLOAT, width = 10, precision = 2)
+    private Double money;
+
+    @Column
+    @Comment("住院开始时间")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String starting_time;
+
+    @Column
+    @Comment("住院结束时间")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String end_time;
+
+    @Column
+    @Comment("所在医院")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String the_hospital;
+
+    @Column
+    @Comment("住院病由")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String hospital_by;
+
+    @Column
+    @Comment("当年次数")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String hospital_yearnum;
+
+    @Column
+    @Comment("结婚时间")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String marry_time;
+
+    @Column
+    @Comment("去逝时间")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String dead_time;
+
+    @Column
+    @Comment("生育时间")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String birth_time;
+
+    @Column
+    @Comment("去逝与被慰问人关系")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String dead_gx;
+
+
+    /**
+     * 活动
+     */
+
+    @Column
+    @Comment("活动时间")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String activity_time;
+
+    @Column
+    @Comment("活动地点")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String venue;
+
+    @Column
+    @Comment("活动名称")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String activity_name;
+
+    @Column
+    @Comment("活动人数")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String activity_number;
+
+    @Column
+    @Comment("活动类型（1.基层工会，2.校工会，3.社团）")
+    @ColDefine(type = ColType.INT, width = 2)
+    private Integer activity_type;
+
+
+    @Column
+    @Comment("发票号码")
+    @ColDefine(type = ColType.VARCHAR, width = 300)
+    private String billNumber;
+}