first commit

ruoyi-api/ruoyi-api-activity/pom.xml

@@ -0,0 +1,44 @@
+<?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-activity</artifactId>
+
+    <properties>
+        <maven.compiler.source>15</maven.compiler.source>
+        <maven.compiler.target>15</maven.compiler.target>
+    </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-common-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/constant/ActivityBasicScopePageForm.java

@@ -0,0 +1,41 @@
+package com.ruoyi.activity.api.constant;
+
+import com.ruoyi.common.core.domain.PageForm;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * TODO
+ * 查询专用
+ *
+ * @Author zhf
+ * @Date 2023/1/11 9:18
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ActivityBasicScopePageForm extends PageForm {
+
+
+    List<String> personTypes;
+    List<String> memberTypes;
+    List<String> sexTypes;
+    List<String> userStates;
+    List<String> roleIds;
+    int minAge;
+    int maxAge;
+    String activityGroupId;
+    String teacherMeetingId;
+    String clubId;
+    String activityUnionId;
+    String activityUnitId;
+    String unionId;
+    String unitId;
+    String personType;
+    String userState;
+    String unionGroupId;
+    String threeUnitId;
+
+    String existsLoginNameRedisKey;
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/constant/AuditTypeEnum.java

@@ -0,0 +1,30 @@
+package com.ruoyi.activity.api.constant;
+
+/**
+ * @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-activity/src/main/java/com/ruoyi/activity/api/constant/ColumnFormTypeEnum.java

@@ -0,0 +1,22 @@
+package com.ruoyi.activity.api.constant;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Author JyuHsin
+ * @Date 2022/11/18
+ * @Description
+ */
+@Getter
+@AllArgsConstructor
+public enum ColumnFormTypeEnum {
+
+    INPUT("INPUT", "输入框"),
+    SELECT("SELECT", "选择框"),//选项数组，
+    //RADIO("RADIO", "单选框"),//选项数组
+    FILE("FILE", "文件");//上传个数，格式
+
+    private String code;
+    private String description;
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/constant/FourOneActivityForm.java

@@ -0,0 +1,24 @@
+package com.ruoyi.activity.api.constant;
+
+import com.ruoyi.activity.api.domain.fourOneActivity.FourOneActivity;
+import com.ruoyi.activity.api.domain.fourOneActivity.FourOneActivitySecondary;
+import lombok.Data;
+
+/**
+ * TODO
+ *
+ * @Author zhf
+ * @Date 2023/2/8 14:50
+ */
+@Data
+public class FourOneActivityForm {
+
+    FourOneActivity fourOneActivity;
+
+    FourOneActivitySecondary activityCulture;
+    FourOneActivitySecondary activityDiscuss;
+    FourOneActivitySecondary activityReport;
+    FourOneActivitySecondary activitySkill;
+
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/constant/SportsActivityApply.java

@@ -0,0 +1,26 @@
+package com.ruoyi.activity.api.constant;
+
+import com.ruoyi.activity.api.domain.sports.ActivitySchoolApply;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * @Author zhf
+ * @Date 2023/2/2 15:58
+ */
+@Data
+public class SportsActivityApply {
+
+    ActivitySchoolApply staffData;
+    ActivitySchoolApply LeaderData;
+    ActivitySchoolApply CoachData;
+    ActivitySchoolApply headData;
+
+    List<ActivitySchoolApply> applies;
+    List<ActivitySchoolApply> applies2;
+    String activityId;
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/constant/SportsActivityFormData.java

@@ -0,0 +1,23 @@
+package com.ruoyi.activity.api.constant;
+
+import com.ruoyi.activity.api.domain.sports.ActivitySchool;
+import com.ruoyi.activity.api.domain.sports.ActivitySchoolEvent;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * TODO
+ * 体育活动提交修改
+ *
+ * @Author zhf
+ * @Date 2023/2/1 9:53
+ */
+@Data
+public class SportsActivityFormData {
+
+
+    List<ActivitySchoolEvent> events;
+
+    ActivitySchool activitySchool;
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/constant/SportsActivityPageForm.java

@@ -0,0 +1,22 @@
+package com.ruoyi.activity.api.constant;
+
+import com.ruoyi.common.core.domain.PageForm;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * @ClassName SportsActivityPageForm
+ * @Description TODO
+ * @Author zhf
+ * @Date 2024/10/24 10:31
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class SportsActivityPageForm extends PageForm {
+    List<String> userId;
+    String userName;
+    String loginName;
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/constant/opusLevy/OpusLevyAuditState.java

@@ -0,0 +1,49 @@
+package com.ruoyi.activity.api.constant.opusLevy;
+
+/**
+ * @Author JyuHsin
+ * @Date 2023/2/14
+ * @Description
+ */
+public class OpusLevyAuditState {
+
+    /**
+     * 未提交
+     */
+    public static final Integer NOT_SUBMIT = 200;
+
+    /**
+     * 待分工会审核
+     */
+    public static final Integer UNION_READY = 210;
+
+    /**
+     * 分工会主席审核退回修改
+     */
+    public static final Integer UNION_BACK_MODIFY = 220;
+
+    /**
+     * 分工会主席审核拒绝
+     */
+    public static final Integer UNION_REJECTED = 230;
+
+    /**
+     * 待校工会审核
+     */
+    public static final Integer SCHOOL_READY = 240;
+
+    /**
+     * 校工会审核退回修改
+     */
+    public static final Integer SCHOOL_BACK_MODIFY = 250;
+
+    /**
+     * 校工会审核审核拒绝
+     */
+    public static final Integer SCHOOL_REJECTED = 260;
+
+    /**
+     * 校工会审核通过
+     */
+    public static final Integer SCHOOL_PASS = 270;
+}

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

@@ -0,0 +1,147 @@
+package com.ruoyi.activity.api.domain;
+
+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(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;
+
+    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-activity/src/main/java/com/ruoyi/activity/api/domain/AuditState.java

@@ -0,0 +1,93 @@
+package com.ruoyi.activity.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.INT
+    )
+    private Integer stateAuditType;
+    @Column
+    @Comment("审核人员匹配条件")
+    @ColDefine(
+            type = ColType.TEXT
+    )
+    private String matchCnd;
+    @Many(
+            field = "stateId"
+    )
+    private List<AuditStateUser> auditStateUserList;
+}

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

@@ -0,0 +1,40 @@
+package com.ruoyi.activity.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-activity/src/main/java/com/ruoyi/activity/api/domain/Goods.java

@@ -0,0 +1,51 @@
+package com.ruoyi.activity.api.domain;
+
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+/**
+ * TODO
+ *
+ * @Author zhf
+ * @Date 2023/1/16 9:53
+ */
+@Data
+@Table
+public class Goods {
+
+    @Name
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("关联表id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String reid;
+
+
+    @Column
+    @Comment("物品名称")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String name;
+
+    @Column
+    @Comment("物品价格")
+    @ColDefine(type = ColType.FLOAT, width = 30)
+    private Double price;
+
+    @Column
+    @Comment("实际物品价格")
+    @ColDefine(type = ColType.FLOAT, width = 30)
+    private Double actualPrice;
+
+    @Column
+    @Comment("说明")
+    @ColDefine(type = ColType.TEXT)
+    private String notes;
+
+    @Column
+    @Comment("活动编号")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String activityCode;
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/basic/ActivityBasicSettings.java

@@ -0,0 +1,63 @@
+package com.ruoyi.activity.api.domain.basic;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.nutz.dao.DB;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * @Author zhf
+ * @Date 2023/1/9 9:28
+ */
+@Table
+@Data
+@Accessors(chain = true)
+public class ActivityBasicSettings implements Serializable {
+
+    @Name
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("父级ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String parentId;
+
+
+    @Column
+    @Comment("代码")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String code;
+
+    @Column
+    @Comment("名称")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String name;
+
+    @Column
+    @Comment("备注")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String note;
+
+    @Column
+    @Comment("有子节点")
+    private boolean hasChildren;
+
+    @Column
+    @Comment("排序字段")
+    @Prev({
+            @SQL(db = DB.MYSQL, value = "SELECT IFNULL(MAX(location),0)+1 FROM activity_basic_settings"),
+            @SQL(db = DB.ORACLE, value = "SELECT COALESCE(MAX(location),0)+1 FROM activity_basic_settings")
+    })
+    private Integer location;
+
+    private List<ActivityBasicSettings> children;
+
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/basic/ActivityBasicUnion.java

@@ -0,0 +1,34 @@
+package com.ruoyi.activity.api.domain.basic;
+
+import com.ruoyi.system.api.domain.SysUnion;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+
+/**
+ * TODO
+ * 活动工会
+ *
+ * @Author zhf
+ * @Date 2023/1/10 15:26
+ */
+@EqualsAndHashCode(callSuper = true)
+@Table
+@Data
+@Accessors(chain = true)
+public class ActivityBasicUnion extends SysUnion {
+
+
+
+    @Column
+    @Comment("添加来源")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String source;
+
+    @Column
+    @Comment("是否开启")
+    @ColDefine(type = ColType.BOOLEAN)
+    private boolean isEnable;
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/basic/ActivityBasicUnit.java

@@ -0,0 +1,19 @@
+package com.ruoyi.activity.api.domain.basic;
+
+import com.ruoyi.system.api.domain.SysDept;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.Table;
+
+/**
+ * TODO
+ * 活动单位
+ *
+ * @Author zhf
+ * @Date 2023/1/10 15:30
+ */
+@Table
+@Data
+@Accessors(chain = true)
+public class ActivityBasicUnit extends SysDept {
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/basic/ActivityEvent.java

@@ -0,0 +1,92 @@
+package com.ruoyi.activity.api.domain.basic;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.io.Serializable;
+
+/**
+ * TODO
+ * 比赛组别
+ *
+ * @Author zhf
+ * @Date 2023/1/9 14:52
+ */
+@Table
+@Data
+@Accessors(chain = true)
+public class ActivityEvent implements Serializable {
+
+
+    @Name
+    @PrevInsert(uu32 = true)
+    private String id;
+
+
+    @Column
+    @Comment("比赛组别")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String competitionCategory;
+
+    @Column
+    @Comment("距离")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String distance;
+
+    @Column
+    @Comment("运动项目")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String sports;
+
+    @Column
+    @Comment("项目类型")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String projectType;
+
+    @Column
+    @Comment("比赛项目编号")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String projectCode;
+
+    @Column
+    @Comment("男女分组")
+    @ColDefine(type = ColType.INT, width = 50)
+    private Integer isMenWomen;
+
+    @Column
+    @Comment("是否趣味")
+    @ColDefine(type = ColType.BOOLEAN)
+    private boolean isInterest;
+
+    @Column
+    @Comment("属于那个运动类型")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String exerciseType;
+
+    @Column
+    @Comment("项目全名称")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String allName;
+
+    @Column
+    @Comment("开始时间")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String startAgeDate;
+
+    @Column
+    @Comment("结束时间")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String endAgeDate;
+
+    @Column
+    @Comment("是否启用")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean whetherEnable;
+
+    @Column
+    @Comment("备注")
+    @ColDefine(type = ColType.TEXT)
+    private String note;
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/basic/ActivityUserScope.java

@@ -0,0 +1,46 @@
+package com.ruoyi.activity.api.domain.basic;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+
+import java.io.Serializable;
+
+/**
+ * @author zxy
+ * @Description 活动人员范围设置
+ * @createTime 2022年01月04日 11:36:00
+ */
+
+@Table
+@Data
+@Accessors(chain = true)
+public class ActivityUserScope implements Serializable {
+
+    private static final long serialVersionUID = -5794884307112120554L;
+
+    @Id
+    @Comment("id")
+    private Integer id;
+
+    @Column
+    @ColDefine
+    @Comment("groupId")
+    private Integer groupId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR)
+    @Comment("name")
+    private String groupName;
+
+    @Column
+    @ColDefine(customType = "bigint")
+    @Comment("userid")
+    private Long userId;
+
+    @Column
+    @ColDefine(customType = "bigint")
+    @Comment("创建人")
+    private Long creator;
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/culture/ActivityTissue.java

@@ -0,0 +1,224 @@
+package com.ruoyi.activity.api.domain.culture;
+
+import com.ruoyi.activity.api.domain.Goods;
+import com.ruoyi.common.core.domain.SysFile;
+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;
+
+/**
+ * TODO
+ *
+ * @Author zhf
+ * @Date 2023/1/16 9:48
+ */
+@Data
+@Table
+public class ActivityTissue {
+
+
+    @Name
+    @PrevInsert(uu32 = true)
+    private String id;
+
+
+    @Column
+    @Comment("创建人")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String userId;
+
+    @Column
+    @Comment("联系方式")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String mobile;
+
+    @Column
+    @Comment("举办单位")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String helpUnitIds;
+
+    @Column
+    @Comment("协办单位")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> unitId;
+
+    @Column
+    @Comment("活动名称")
+    @ColDefine(type = ColType.VARCHAR, width = 200)
+    private String name;
+
+    @Column
+    @Comment("活动编号")
+    @ColDefine(type = ColType.VARCHAR, width = 200)
+    private String activityCode;
+
+    @Column
+    @Comment("活动项目类型")
+    @ColDefine(type = ColType.VARCHAR, width = 200)
+    private String projectTypeCode;
+
+    @Column
+    @Comment("活动计划开始时间")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String startPlannedDate;
+
+    @Column
+    @Comment("活动计划结束时间")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String endPlannedDate;
+
+    @Column
+    @Comment("报名开始时间")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String applyStartTime;
+
+    @Column
+    @Comment("报名结束时间")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String applyEndTime;
+
+    @Column
+    @Comment("活动开始时间")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String startTime;
+
+    @Column
+    @Comment("活动结束时间")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String endTime;
+
+    @Column
+    @Comment("创建时间")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String applyTime;
+
+    @Column
+    @Comment("活动人数")
+    @ColDefine(type = ColType.INT, width = 6)
+    private Integer peopleNum;
+
+    @Column
+    @Comment("活动地点")
+    @ColDefine(type = ColType.VARCHAR, width = 200)
+    private String address;
+
+    @Column
+    @Comment("发票")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<SysFile> billFiles;
+
+    @Column
+    @Comment("照片")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<SysFile> photoFiles;
+
+    @Column
+    @Comment("其他")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<SysFile> otherFiles;
+
+    @Column
+    @Comment("活动类型")
+    @ColDefine(type = ColType.INT, width = 10)
+    private Integer type;
+
+    @Column
+    @Comment("创建人所属工会")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unionId;
+
+    @Column
+    @Comment("创建人所属协会")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String clubId;
+
+    @Column
+    @Comment("活动内容")
+    @ColDefine(type = ColType.TEXT)
+    private String activityContent;
+
+    @Column
+    @Comment("活动考核内容")
+    @ColDefine(type = ColType.TEXT)
+    private String activityExamineContent;
+
+    @Column
+    @Comment("报名方式(1.个人 2.分工会3.组队报名 null.不需要报名)")
+    @ColDefine(type = ColType.INT)
+    private Integer signUpMethod;
+
+    @Column
+    @Comment("限制方式(1.总人数限制 2.分工会人数限制 null.不限制)")
+    @ColDefine(type = ColType.INT)
+    private Integer userNumberLimit;
+
+    @Column
+    @Comment("是否需要签到")
+    @ColDefine(type = ColType.BOOLEAN)
+    private boolean needSign;
+
+    @Column
+    @Comment("签到经纬度")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> location;
+
+    @Column
+    @Comment("签到范围")
+    @ColDefine(type = ColType.INT)
+    private Integer rangeMeter;
+
+    @Column
+    @Comment("总人数限制")
+    @ColDefine(type = ColType.INT)
+    private Integer totalUserNumberLimit;
+
+    @Column
+    @Comment("组队人数")
+    @ColDefine(type = ColType.INT)
+    private Integer teamNum;
+
+    @Column
+    @Comment("分工会人数限制")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<NutMap> unionUserNumberLimit;
+
+    @Column
+    @Comment("活动总结")
+    @ColDefine(type = ColType.TEXT)
+    private String activitySummary;
+
+    @Column
+    @Comment("活动分组id")
+    @ColDefine(type = ColType.INT)
+    private Integer groupId;
+
+    @Column
+    @Comment("封面图")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<SysFile> cover;
+
+    @Column
+    @Comment("审核状态")
+    @ColDefine(type = ColType.INT)
+    private Integer state;
+
+    @Column
+    @Comment("审核id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String auditId;
+
+    @Column
+    @Comment("是否报名系统")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean isEnrollSystem;
+
+    @Many(field = "tissueId")
+    private List<ActivityTissuePerson> tissuePersonList;
+
+    @Many(field = "reid")
+    private List<Goods> goods;
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/culture/ActivityTissuePerson.java

@@ -0,0 +1,98 @@
+package com.ruoyi.activity.api.domain.culture;
+
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+/**
+ * TODO
+ *
+ * @Author zhf
+ * @Date 2023/1/16 9:50
+ */
+@Data
+@Table
+public class ActivityTissuePerson {
+    @Name
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("分工会或协会活动ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String tissueId;
+
+    @Column
+    @Comment("用户ID")
+    @ColDefine(customType = "bigint")
+    private Long userId;
+
+    @Column
+    @Comment("报名人ID")
+    @ColDefine(customType = "bigint")
+    private Long applyUserId;
+
+    @Column
+    @Comment("报名人姓名")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String applyUserName;
+    @Column
+    @Comment("报名人工号")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String applyLoginName;
+
+    @Column
+    @Comment("签字ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String signId;
+
+    @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 = 2)
+    private String sex;
+
+    @Column
+    @Comment("用户手机号")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String mobile;
+
+    @Column
+    @Comment("用户单位")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String unitName;
+
+    @Column
+    @Comment("用户工会id")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String unionId;
+    @Column
+    @Comment("用户工会")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String unionName;
+
+    @Column
+    @Comment("是否签到")
+    @ColDefine(type = ColType.BOOLEAN)
+    private boolean isSign;
+
+    @Column
+    @Comment("签到时间")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String signTime;
+
+    @Column
+    @Comment("报名时间")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String applyDateTime;
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/fitnessWalk/FitnessWalk.java

@@ -0,0 +1,111 @@
+package com.ruoyi.activity.api.domain.fitnessWalk;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+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
+public class FitnessWalk extends BaseEntity {
+
+    @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 mainName;
+
+    @Column
+    @Comment("分活动名称")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String branchName;
+
+    @Column
+    @Comment("活动模式")
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    private String activityModel;
+
+    @Column
+    @Comment("活动地址")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String address;
+
+    @Column
+    @Comment("活动介绍")
+    @ColDefine(type = ColType.VARCHAR, width = 5000)
+    private String note;
+
+    @Column
+    @Comment("报名开始时间")
+    @ColDefine(type = ColType.DATETIME)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date apply_start_time;
+
+    @Column
+    @Comment("报名结束时间")
+    @ColDefine(type = ColType.DATETIME)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date apply_end_time;
+
+    @Column
+    @Comment("活动开始时间")
+    @ColDefine(type = ColType.DATETIME)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date start_time;
+
+    @Column
+    @Comment("活动结束时间")
+    @ColDefine(type = ColType.DATETIME)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date end_time;
+
+    @Column
+    @Comment("线路信息")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<List<Float>> linePoints;
+
+    @Column
+    @Comment("签到完成提示信息")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String check_all_msg;
+
+    @Column
+    @Comment("速度控制")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private Integer checkControl;
+
+    @Column
+    @Comment("签到完成弹出礼品券")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean showGift;
+
+    @Column
+    @Comment("礼品名称")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String gift_name;
+
+    @Column
+    @Comment("活动人员分组")
+    @ColDefine(type = ColType.INT)
+    private Integer groupId;
+
+    @Column
+    @Comment("活动封面图")
+    @ColDefine(type = ColType.VARCHAR, width = 255)
+    private String surface;
+
+    @Many(field = "fitnessWalkId")
+    private List<FitnessWalkPoint> pts;
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/fitnessWalk/FitnessWalkEnroll.java

@@ -0,0 +1,47 @@
+package com.ruoyi.activity.api.domain.fitnessWalk;
+
+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 jug
+ * @date 2023/04/09
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Table
+public class FitnessWalkEnroll extends BaseEntity {
+
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("活动id")
+    @ColDefine(type = ColType.VARCHAR)
+    private String fitnessWalkId;
+
+    @Column
+    @Comment("人员id")
+    @ColDefine(type = ColType.VARCHAR)
+    private String userId;
+
+    @Column
+    @Comment("部门id")
+    @ColDefine(type = ColType.VARCHAR)
+    private String deptId;
+
+    @Column
+    @Comment("工会id")
+    @ColDefine(type = ColType.VARCHAR)
+    private String unionId;
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/fitnessWalk/FitnessWalkGift.java

@@ -0,0 +1,53 @@
+package com.ruoyi.activity.api.domain.fitnessWalk;
+
+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;
+
+/**
+ * 健身走礼物发放表
+ *
+ * @author jug
+ * @date 2023/04/09
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Table
+public class FitnessWalkGift extends BaseEntity {
+
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("活动id")
+    @ColDefine(type = ColType.VARCHAR)
+    private String fitnessWalkId;
+
+    @Column
+    @Comment("获得时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date grantTime;
+
+    @Column
+    @Comment("使用时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date useTime;
+
+    @Column
+    @Comment("是否使用")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean used;
+
+    @Column
+    @Comment("获奖人ID")
+    @ColDefine(type = ColType.VARCHAR)
+    private String userId;
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/fitnessWalk/FitnessWalkGps.java

@@ -0,0 +1,83 @@
+package com.ruoyi.activity.api.domain.fitnessWalk;
+
+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;
+
+/**
+ * 健身走gps运动记录
+ *
+ * @author jug
+ * @date 2023/04/13
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Table
+public class FitnessWalkGps extends BaseEntity {
+
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("活动id")
+    @ColDefine(type = ColType.VARCHAR)
+    private String fitnessWalkId;
+
+    @Column
+    @Comment("开始时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date startTime;
+
+    @Column
+    @Comment("结束时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date endTime;
+
+    @Column
+    @Comment("运动距离")
+    @ColDefine
+    private Long distance;
+
+    @Column
+    @Comment("运动距离")
+    @ColDefine(type = ColType.VARCHAR)
+    private String distance_s;
+
+    @Column
+    @Comment("运动轨迹")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<List<Float>> linePoints;
+
+    @Column
+    @Comment("运动时长")
+    @ColDefine(type = ColType.VARCHAR)
+    private String time_s;
+
+    @Column
+    @Comment("运动时长")
+    @ColDefine
+    private Long time;
+
+    @Column
+    @Comment("配速")
+    @ColDefine
+    private Long speed;
+
+    @Column
+    @Comment("配速")
+    @ColDefine(type = ColType.VARCHAR)
+    private String speed_s;
+
+    @Column
+    @Comment("用户")
+    @ColDefine(type = ColType.VARCHAR)
+    private String userId;
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/fitnessWalk/FitnessWalkPoint.java

@@ -0,0 +1,68 @@
+package com.ruoyi.activity.api.domain.fitnessWalk;
+
+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.math.BigDecimal;
+
+/**
+ * 健身走点位信息
+ *
+ * @author jug
+ * @date 2023/04/06
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Table
+public class FitnessWalkPoint extends BaseEntity {
+
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("活动id")
+    @ColDefine(type = ColType.VARCHAR)
+    private String fitnessWalkId;
+
+    @Column(wrap = true)
+    @Comment("编号")
+    @ColDefine(type = ColType.INT)
+    private Integer code;
+
+    @Column
+    @Comment("名称")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String name;
+
+    @Column
+    @Comment("签到半径")
+    @ColDefine(type = ColType.INT)
+    private Integer radius;
+
+    @Column(wrap = true)
+    @Comment("签到时间间隔（分钟）")
+    @ColDefine(type = ColType.INT)
+    private Integer interval;
+
+    @Column
+    @Comment("经度")
+    @ColDefine(customType = "decimal", precision = 6)
+    private BigDecimal longitude;
+
+    @Column
+    @Comment("纬度")
+    @ColDefine(customType = "decimal", precision = 6)
+    private BigDecimal latitude;
+
+    @Column
+    @Comment("签到完成提示信息")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String toastMessage;
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/fitnessWalk/FitnessWalkSign.java

@@ -0,0 +1,54 @@
+package com.ruoyi.activity.api.domain.fitnessWalk;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+/**
+ * 健身走打卡
+ *
+ * @author jug
+ * @date 2023/04/09
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Table
+public class FitnessWalkSign extends BaseEntity {
+
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("活动id")
+    @ColDefine(type = ColType.VARCHAR)
+    private String fitnessWalkId;
+
+    @Column
+    @Comment("点位id")
+    @ColDefine(type = ColType.VARCHAR)
+    private String pointId;
+
+    @Column
+    @Comment("分工会id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unionId;
+
+    @Column
+    @Comment("签到时间")
+    @ColDefine(type = ColType.DATETIME)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date signTime;
+
+    @Column
+    @Comment("签到用户")
+    @ColDefine(type = ColType.VARCHAR)
+    private String userId;
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/fitnessWalk/JszAwardList.java

@@ -0,0 +1,47 @@
+package com.ruoyi.activity.api.domain.fitnessWalk;
+
+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;
+
+/**
+ * TODO
+ * 健身走获奖名单
+ *
+ * @Author zhf
+ * @Date 2022/9/8 9:24
+ */
+@Table
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class JszAwardList extends BaseEntity {
+
+
+    @Column
+    @Name
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR)
+    @Comment("活动")
+    private String activityId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("姓名Id")
+    private String userId;
+
+
+    @Column
+    @ColDefine(type = ColType.DATETIME)
+    @Comment("时间")
+    private Date applyDate;
+
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/fitnessWalk/JszWxStep.java

@@ -0,0 +1,48 @@
+package com.ruoyi.activity.api.domain.fitnessWalk;
+
+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;
+
+/**
+ * TODO
+ *
+ * @Author zhf
+ * @Date 2022/9/6 15:06
+ */
+@Table
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class JszWxStep extends BaseEntity {
+
+    @Column
+    @Name
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR)
+    @Comment("时间")
+    private String activityId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("姓名Id")
+    private String userId;
+
+    @Column
+    @ColDefine(customType = "int")
+    @Comment("步数")
+    private Integer step;
+
+    @Column
+    @ColDefine(type = ColType.DATE)
+    @Comment("时间")
+    private Date applyDate;
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/fitnessWalk/Jsz_fillcheck.java

@@ -0,0 +1,43 @@
+package com.ruoyi.activity.api.domain.fitnessWalk;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+
+/**
+ * @Author: 1V
+ * @DateTime: 2020/9/24 10:04
+ * @Description: TODO
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Table("Jsz_fillcheck")
+public class Jsz_fillcheck extends BaseEntity {
+    @Column
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Prev(els = {@EL("uuid()")})
+    private String id;
+
+    @Column
+    @Comment("用户名")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String loginname;
+
+    @Column
+    @Comment("姓名")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String username;
+
+    @Column
+    @Comment("校区")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String campus;
+
+    @Column
+    @Comment("签到时间")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String check_time;
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/fitnessWalk/Jsz_type.java

@@ -0,0 +1,38 @@
+package com.ruoyi.activity.api.domain.fitnessWalk;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.DB;
+import org.nutz.dao.entity.annotation.*;
+
+/**
+ * @Author: 1V
+ * @DateTime: 2020/9/1 9:42
+ * @Description: 活动类型
+ */
+@Table("Jsz_type")
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class Jsz_type extends BaseEntity {
+
+    @Column
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Prev(els = {@EL("uuid()")})
+    private String id;
+
+    @Column
+    @Comment("类型名称")
+    @ColDefine(type = ColType.VARCHAR, width = 255)
+    private String name;
+
+    @Column
+    @Comment("排序")
+    @Prev({
+            @SQL(db = DB.MYSQL, value = "SELECT IFNULL(MAX(location),0)+1 FROM Jsz_type"),
+            @SQL(db = DB.ORACLE, value = "SELECT COALESCE(MAX(location),0)+1 FROM Jsz_type")
+    })
+    private Integer location;
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/fourOneActivity/FourOneActivity.java

@@ -0,0 +1,99 @@
+package com.ruoyi.activity.api.domain.fourOneActivity;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+/**
+ * TODO
+ *
+ * @Author zhf
+ * @Date 2023/2/8 14:07
+ */
+@Table("four_one_activity")
+@Data
+@Accessors(chain = true)
+public class FourOneActivity {
+
+    @Name
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("申请人")
+    private String activityApplyUserId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("申请人姓名")
+    private String activityApplyUserName;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("申请人工会id")
+    private String activityApplyUserUnionId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    @Comment("申请人工会名称")
+    private String activityApplyUserUnionName;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    @Comment("申请时间")
+    private String activityApplyDate;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    @Comment("申请人电话")
+    private String activityApplyUserMobile;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("技能竞赛或观摩活动")
+    private String activitySkillId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("青年教职工成长成才讲座或报告会")
+    private String activityReportId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("教职工沙龙或研讨会")
+    private String activityDiscussId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("成才主题文化活动")
+    private String activityCultureId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("申报状态")
+    private String stateId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    @Comment("评审等级")
+    private String assessGrade;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("分工会审核id")
+    private String unionAuditId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("分党委审核id")
+    private String unionPartyAuditId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("校工会审核id")
+    private String schoolAuditId;
+
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/fourOneActivity/FourOneActivitySecondary.java

@@ -0,0 +1,73 @@
+package com.ruoyi.activity.api.domain.fourOneActivity;
+
+import com.ruoyi.common.core.domain.SysFile;
+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.List;
+
+/**
+ * TODO
+ *
+ * @Author zhf
+ * @Date 2023/2/8 14:08
+ */
+@Table("four_one_activity_secondary")
+@Data
+@Accessors(chain = true)
+public class FourOneActivitySecondary {
+
+    @Name
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("活动名称")
+    private String activityName;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("时间")
+    private String activityDate;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("地点")
+    private String activityPlace;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 500)
+    @Comment("参加人员")
+    private String activityParticipants;
+
+    @Column
+    @ColDefine(type = ColType.TEXT)
+    @Comment("活动内容")
+    private String activityContent;
+
+    @Column
+    @ColDefine(type = ColType.MYSQL_JSON)
+    @Comment("领导小组成员")
+    private List<NutMap> activityTeamMembers;
+
+    @Column
+    @ColDefine(type = ColType.MYSQL_JSON)
+    @Comment("活动总结")
+    private List<SysFile> activitySummary;
+
+    @Column
+    @ColDefine(type = ColType.MYSQL_JSON)
+    @Comment("新闻稿")
+    private List<SysFile> activityPressRelease;
+
+    @Column
+    @ColDefine(type = ColType.MYSQL_JSON)
+    @Comment("活动照片")
+    private List<SysFile> activityPhotos;
+
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/opusLevy/OpusLevy.java

@@ -0,0 +1,118 @@
+package com.ruoyi.activity.api.domain.opusLevy;
+
+import com.ruoyi.common.core.domain.SysFile;
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+
+import java.util.List;
+
+/**
+ * @Author JyuHsin
+ * @Date 2023/2/13
+ * @Description
+ */
+@Data
+@Table("hd_wm_xx")
+public class OpusLevy {
+
+    @Column
+    @Name
+    @Comment("ID")
+    @Prev(els = {@EL("uuid()")})
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String id;
+
+    @Column
+    @Comment("活动名称")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String activityName;
+
+    @Column
+    @Comment("活动介绍")
+    @ColDefine(type = ColType.TEXT)
+    private String introduce;
+
+    @Column
+    @Comment("参加人员")
+    @ColDefine(type = ColType.TEXT)
+    private String joinUser;
+
+    @Column
+    @Comment("奖励方式")
+    @ColDefine(type = ColType.TEXT)
+    private String awardMethod;
+
+    @Column
+    @Comment("活动内容")
+    @ColDefine(type = ColType.TEXT)
+    private String content;
+
+    @Column
+    @Comment("活动联系人")
+    @ColDefine(type = ColType.TEXT)
+    private String concatPerson;
+
+    @Column
+    @Comment("其他")
+    @ColDefine(type = ColType.TEXT)
+    private String other;
+
+    @Column
+    @Comment("活动开始时间")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String startTime;
+
+    @Column
+    @Comment("活动结束时间")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String endTime;
+
+    @Column
+    @Comment("活动状态 （开启 关闭）")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean state;
+
+    @Column
+    @Comment("活动创建人")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private Long createUserId;
+
+    @Column
+    @Comment("活动创建时间")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String createTime;
+
+    @Column
+    @Comment("配色")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String color;
+
+    @Column
+    @Comment("活动范围Id")
+    @ColDefine(type = ColType.INT, width = 32)
+    private Integer activityGroupId;
+
+    @Column
+    @Comment("活动范围名称")
+    @ColDefine(type = ColType.VARCHAR, width = 40)
+    private String activityGroupName;
+
+    @Column
+    @Comment("活动类型（1 教工 2 亲子）")
+    @ColDefine(type = ColType.INT, width = 1)
+    private Integer type;
+
+    @Column
+    @Comment("允许上传的附件类型")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> fileType;
+
+    @Column
+    @Comment("附件信息")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<SysFile> files;
+
+    @Many(field = "activityId")
+    private List<OpusLevyParentType> parentTypeList;
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/opusLevy/OpusLevyChildType.java

@@ -0,0 +1,41 @@
+package com.ruoyi.activity.api.domain.opusLevy;
+
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+
+/**
+ * @Author JyuHsin
+ * @Date 2023/2/13
+ * @Description
+ */
+@Data
+@Table("hd_wm_zplb")
+public class OpusLevyChildType {
+
+    @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 activityId;
+
+    @Column
+    @Comment("类别id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String parentTypeId;
+
+    @Column
+    @Comment("名称")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String childTypeName;
+
+    @Column
+    @Comment("排序")
+    @ColDefine(type = ColType.INT, width = 4)
+    private int location;
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/opusLevy/OpusLevyParentType.java

@@ -0,0 +1,41 @@
+package com.ruoyi.activity.api.domain.opusLevy;
+
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+
+import java.util.List;
+
+/**
+ * @Author JyuHsin
+ * @Date 2023/2/13
+ * @Description
+ */
+@Data
+@Table("hd_wm_lb")
+public class OpusLevyParentType {
+
+    @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 activityId;
+
+    @Column
+    @Comment("名称")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String parentTypeName;
+
+    @Column
+    @Comment("排序")
+    @ColDefine(type = ColType.INT, width = 4)
+    private int location;
+
+    @Many(field = "parentTypeId")
+    private List<OpusLevyChildType> childTypeList;
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/opusLevy/OpusLevySubmitInfo.java

@@ -0,0 +1,115 @@
+package com.ruoyi.activity.api.domain.opusLevy;
+
+import com.ruoyi.common.core.domain.SysFile;
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+
+import java.util.List;
+
+/**
+ * @Author JyuHsin
+ * @Date 2023/2/13
+ * @Description
+ */
+@Data
+@Table("hd_wm_sbxx")
+public class OpusLevySubmitInfo {
+
+    @Column
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Prev(els = {@EL("uuid()")})
+    private String id;
+
+
+    @Column
+    @Comment("活动id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String activityId;
+
+    @Column
+    @Comment("上报人id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private Long submitUserId;
+
+    @Column
+    @Comment("作品类型（1 巾帼担当行 2 巾帼温馨行）")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String parentTypeId;
+
+    @Column
+    @Comment("巾帼温馨行（1 风采风貌 2 温馨生活 3 烹饪乐趣 4 创意手工）")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String childTypeId;
+
+    @Column
+    @Comment("作品描述")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String opusDescribe;
+
+    @Column
+    @Comment("上报时间")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String submitTime;
+
+    @Column
+    @Comment("手机号码")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String mobile;
+
+    @Column
+    @Comment("子女姓名")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String childName;
+
+    @Column
+    @Comment("子女年龄")
+    @ColDefine(type = ColType.INT)
+    private Integer childAge;
+
+    @Column
+    @Comment("子女性别")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String childSex;
+
+    @Column
+    @Comment("子女关系")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String childRelation;
+
+    @Column
+    @Comment("状态")
+    @ColDefine(type = ColType.INT, width = 20)
+    private Integer state;
+
+    @Column
+    @Comment("分工会审核id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unionAuditId;
+
+    @Column
+    @Comment("校工会审核id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String schoolAuditId;
+
+    @Column
+    @Comment("照片附件")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<SysFile> photoFiles;
+
+    @Column
+    @Comment("视频附件")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<SysFile> videoFiles;
+
+    @Column
+    @Comment("音频附件")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<SysFile> mediaFiles;
+
+    @Column
+    @Comment("文档附件")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<SysFile> wordFiles;
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/question/Question.java

@@ -0,0 +1,176 @@
+package com.ruoyi.activity.api.domain.question;
+
+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;
+
+/**
+ * TODO
+ * 问卷调查
+ *
+ * @Author zhf
+ * @Date 2023/2/9 10:32
+ */
+@Table("question")
+@Data
+@Accessors(chain = true)
+@Comment("问卷")
+public class Question {
+
+    @Name
+    @PrevInsert(uu32 = true)
+    private String qid;
+
+    @Column
+    @Comment("问卷调查创建人")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String qcreator;
+
+    @Column
+    @Comment("问卷调查创建时间")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String qctime;
+
+    @Column
+    @Comment("问卷调查状态(1：未开启 2：已开启 3：已关闭)")
+    @ColDefine(type = ColType.INT, width = 1)
+    private Integer qflag;
+
+    @Column
+    @Comment("类型(1：调查 2：答题 3：购物)")
+    @ColDefine(type = ColType.INT, width = 1)
+    private Integer qlx;
+
+    @Column
+    @Comment("标题")
+    @ColDefine(type = ColType.VARCHAR, width = 200)
+    private String qtitle;
+
+    @Column
+    @Comment("说明")
+    @ColDefine(type = ColType.VARCHAR, width = 2000)
+    private String qsm;
+
+    @Column
+    @Comment("每日可答次数")
+    @ColDefine(type = ColType.INT, width = 2)
+    private Integer qrkdcs;
+
+    @Column
+    @Comment("每日开始答题时间")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String qdtkssj;
+
+    @Column
+    @Comment("每日结束答题时间")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String qdtjssj;
+
+    @Many(field = "iqid")
+    private List<Question_issue> issues;
+
+    @Column
+    @Comment("开始时间")
+    private Long startTime;
+
+    @Column
+    @Comment("结束时间")
+    private Long endTime;
+
+    @Column
+    @Comment("自动选择默认项")
+    @ColDefine(type = ColType.BOOLEAN)
+    private boolean autoSelect;
+
+    @Column
+    @Comment("参加人员分组id，为空则不限制参加人员")
+    @ColDefine(type = ColType.INT)
+    private Integer activityUserScopeId;
+
+    @Column
+    @Comment("出题模式 1.定时定题 2.随机题目")
+    @ColDefine(type = ColType.INT)
+    private Integer ctMode;
+
+    @Column
+    @Comment("是否抽奖")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean isRaffle;
+
+    @Column
+    @Comment("抽奖时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date raffleTime;
+
+    @Column
+    @Comment("多少分可以抽奖")
+    @ColDefine(type = ColType.INT)
+    private Integer raffleScore;
+
+    @Column
+    @Comment("最终获奖人数")
+    @ColDefine(type = ColType.INT)
+    private Integer raffleWinnerUserNum;
+
+    @Column
+    @Comment("题目顺序打乱")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean disruptingOrder;
+
+    @Column
+    @Comment("随机单次出题数量")
+    @ColDefine(type = ColType.INT)
+    private Integer ranDomSingleIssueNum;
+
+    @Column
+    @Comment("总共随机次数")
+    @ColDefine(type = ColType.INT)
+    private Integer ranDomSum;
+
+    @Column
+    @Comment("是否多次答")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean canRepeatedAnswer;
+
+    @Column
+    @Comment("多次答数")
+    @ColDefine(type = ColType.INT)
+    private Integer canRepeatedAnswerNum;
+
+    @Column
+    @Comment("得分统计（重复答题允许下 1.保存最高分 2.保存最新得分）")
+    @ColDefine(type = ColType.INT)
+    private Integer calcScoreMode;
+
+    @Column
+    @Comment("抽奖规则")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<RaffleRule> raffleRule;
+
+    /**
+     * 抽奖规则
+     */
+    @Data
+    public static class RaffleRule {
+        //开始答题时间
+        private Date startAnswerDate;
+
+        //结束答题时间
+        private Date endAnswerDate;
+
+        //抽奖时间
+        private Date raffleTime;
+
+        //抽奖分数
+        private Integer raffleScore;
+
+        //抽奖人数
+        private Integer raffleWinnerUserNum;
+    }
+
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/question/QuestionAnswerUserScore.java

@@ -0,0 +1,57 @@
+package com.ruoyi.activity.api.domain.question;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.Date;
+
+/**
+ * TODO
+ * 答题类型每个人得分
+ *
+ * @Author zhf
+ * @Date 2023/2/9 10:51
+ */
+@Table
+@Data
+@Accessors(chain = true)
+public class QuestionAnswerUserScore {
+
+
+    @Name
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("问卷的id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String questionId;
+
+    @Column
+    @Comment("题目id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String subjectId;
+
+    @Column
+    @Comment("该题得分")
+    @ColDefine(type = ColType.INT)
+    private Integer subjectScore;
+
+    @Column
+    @Comment("用户id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String userId;
+
+    @Column
+    @Comment("得分时间")
+    @ColDefine(type = ColType.DATE)
+    private Date answerDate;
+
+    @Column
+    @Comment("回答次数")
+    @ColDefine(type = ColType.INT)
+    private Integer answerNum;
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/question/QuestionRandomIssue.java

@@ -0,0 +1,52 @@
+package com.ruoyi.activity.api.domain.question;
+
+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;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Comment("问卷随机题目")
+@Table
+public class QuestionRandomIssue {
+
+    @Name
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("问卷的id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String questionId;
+
+    @Column
+    @Comment("用户id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String userId;
+
+    @Column
+    @Comment("题目")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> issueIds;
+
+    @Column
+    @Comment("回答次数")
+    @ColDefine(type = ColType.INT)
+    private Integer num;
+
+    @Column
+    @Comment("是否回答完成")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean isFinish;
+
+    @Column
+    @Comment("显示日期")
+    @ColDefine(type = ColType.DATE)
+    private Date displayDate;
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/question/QuestionSigner.java

@@ -0,0 +1,48 @@
+package com.ruoyi.activity.api.domain.question;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+/**
+ * TODO
+ *
+ * @Author zhf
+ * @Date 2023/2/9 10:53
+ */
+@Table
+@Data
+@Accessors(chain = true)
+public class QuestionSigner {
+
+    @Name
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("问卷Id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String questionId;
+
+    @Column
+    @Comment("问卷调查填写人")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String userId;
+
+    @Column
+    @Comment("签收人姓名")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String signerUserName;
+
+    @Column
+    @Comment("联系方式")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String signerPhone;
+
+    @Column
+    @Comment("收货地址")
+    @ColDefine(type = ColType.VARCHAR, width = 200)
+    private String signerAddress;
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/question/QuestionUserScore.java

@@ -0,0 +1,62 @@
+package com.ruoyi.activity.api.domain.question;
+
+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;
+
+/**
+ * 问卷分数
+ *
+ * @author jug
+ * @date 2023/06/20
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Table
+public class QuestionUserScore extends BaseEntity {
+
+    @Name
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("问卷的id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String questionId;
+
+    @Column
+    @Comment("得分")
+    @ColDefine(type = ColType.INT)
+    private Integer score;
+
+    @Column
+    @Comment("用户id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String userId;
+
+    @Column
+    @Comment("得分时间")
+    @ColDefine(type = ColType.DATE)
+    private Date answerDate;
+
+    @Column
+    @Comment("回答次数")
+    @ColDefine(type = ColType.INT)
+    private Integer answerNum;
+
+    @Column
+    @Comment("随机次数")
+    @ColDefine(type = ColType.INT)
+    private Integer randomNum;
+
+    @Column
+    @Comment("显示日期(只针对定时定题)")
+    @ColDefine(type = ColType.DATE)
+    private Date displayDate;
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/question/QuestionWinner.java

@@ -0,0 +1,36 @@
+package com.ruoyi.activity.api.domain.question;
+
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+import java.util.Date;
+
+@Data
+@Table
+public class QuestionWinner {
+
+    @Name
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("问卷的id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String questionId;
+
+    @Column
+    @Comment("用户id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String userId;
+
+    @Column
+    @Comment("获奖时间")
+    @ColDefine(type = ColType.DATE)
+    private Date winDate;
+
+    @Column
+    @Comment("分数")
+    @ColDefine(type = ColType.INT)
+    private Integer score;
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/question/Question_issue.java

@@ -0,0 +1,104 @@
+package com.ruoyi.activity.api.domain.question;
+
+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;
+
+/**
+ * TODO
+ * 问卷调查问题
+ *
+ * @Author zhf
+ * @Date 2023/2/9 10:38
+ */
+
+@Table
+@Data
+@Accessors(chain = true)
+public class Question_issue {
+
+    @Name
+    @PrevInsert(uu32 = true)
+    private String iid;
+
+    @Column
+    @Comment("所属问卷调查id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String iqid;
+
+    @Column
+    @Comment("题名")
+    @ColDefine(type = ColType.VARCHAR,width = 500)
+    private String iname;
+
+    @Column
+    @Comment("提示")
+    @ColDefine(type = ColType.VARCHAR,width = 500)
+    private String its;
+
+    @Column
+    @Comment("是否必答")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean iisbd;
+
+    @Column
+    @Comment("题型 （1 选择题 2 填空题）")
+    @ColDefine(type = ColType.INT, width = 2)
+    private Integer itx;
+
+    @Column
+    @Comment("是否单选（选择题）")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean iisdx;
+
+    @Column
+    @Comment("最小选择数（多选）")
+    @ColDefine(type = ColType.INT, width = 4)
+    private Integer iminselect;
+
+    @Column
+    @Comment("最大选择数（多选）")
+    @ColDefine(type = ColType.INT, width = 4)
+    private Integer imaxselect;
+
+    @Column
+    @Comment("是否随机选项")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean iisrandom;
+
+    @Column
+    @Comment("排列方式（1：竖向排列 2：横向排列）")
+    @ColDefine(type = ColType.INT, width = 2)
+    private Integer iplfs;
+
+    @Column
+    @Comment("每行多少列（横向排列）")
+    @ColDefine(type = ColType.INT, width = 2)
+    private Integer icolnum;
+
+    @Column
+    @Comment("排序编号")
+    @ColDefine(type = ColType.INT, width = 4)
+    private Integer ipxbh;
+
+    @Column
+    @Comment("该题分数")
+    @ColDefine(type = ColType.INT, width = 4)
+    private Integer fraction;
+
+    @Column
+    @Comment("显示日期")
+    @ColDefine(type = ColType.DATE)
+    private Date displayDate;
+
+    @One(field = "iqid", key = "qid")
+    private Question question;
+
+    @Many(field = "wiid")
+    private List<Question_wor> wors;
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/question/Question_reply.java

@@ -0,0 +1,82 @@
+package com.ruoyi.activity.api.domain.question;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.List;
+
+/**
+ * TODO
+ * 问卷调查作答表
+ *
+ * @Author zhf
+ * @Date 2023/2/9 10:41
+ */
+@Table
+@Data
+@Accessors(chain = true)
+public class Question_reply {
+
+
+    @Name
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("问卷的id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String qid;
+
+    @Column
+    @Comment("题目id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String issueId;
+
+    @Column
+    @Comment("选择的选项id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String rwid;
+
+    @Column
+    @Comment("设备唯一标识")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String ropenid;
+
+    @Column
+    @Comment("单次答题唯一标识")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String ridentity;
+
+    @Column
+    @Comment("填空题时填的值")
+    @ColDefine(type = ColType.VARCHAR, width = 2000)
+    private String rval;
+
+    @Column
+    @Comment("提交时间")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String rtime;
+
+    @Column
+    @Comment("用户ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String userId;
+
+    @Column
+    @Comment("是否保存")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean save;
+
+    @Column
+    @Comment("所选数量")
+    @ColDefine(type = ColType.INT)
+    private Integer number;
+
+    @One(field = "rwid", key = "wid")
+    private Question_wor wor;
+
+    private List<String> userSelect;
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/question/Question_wor.java

@@ -0,0 +1,83 @@
+package com.ruoyi.activity.api.domain.question;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+/**
+ * TODO
+ * 问卷调查问题答案
+ *
+ * @Author zhf
+ * @Date 2023/2/9 10:42
+ */
+@Table
+@Data
+@Accessors(chain = true)
+public class Question_wor {
+
+    @Name
+    @PrevInsert(uu32 = true)
+    private String wid;
+
+
+    @Column
+    @Comment("所属题目")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String wiid;
+
+    @Column
+    @Comment("选项文字")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String wtxt;
+
+    @Column
+    @Comment("选项图片")
+    @ColDefine(type = ColType.TEXT)
+    private String wimg;
+
+    @Column
+    @Comment("选项说明")
+    @ColDefine(type = ColType.VARCHAR, width = 2000)
+    private String wsm;
+
+    @Column
+    @Comment("选项链接")
+    @ColDefine(type = ColType.VARCHAR, width = 2000)
+    private String wlj;
+
+    @Column
+    @Comment("是否允许填空")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean wistk;
+
+    @Column
+    @Comment("是否必须填空(允许填空时)")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean wisbt;
+
+    @Column
+    @Comment("是否默认选中")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean wismr;
+
+    @Column
+    @Comment("排序编号")
+    @ColDefine(type = ColType.INT, width = 4)
+    private Integer wpxbh;
+
+    @Column
+    @Comment("是否正确答案")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean correct;
+
+    @Column
+    @Comment("单价")
+    @ColDefine(type = ColType.FLOAT)
+    private Integer price;
+
+    @One(field = "wiid", key = "iid")
+    private Question_issue issue;
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/site/ActivitySiteEquipment.java

@@ -0,0 +1,62 @@
+package com.ruoyi.activity.api.domain.site;
+
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+
+import java.util.Date;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：ActivitySiteEquipment
+ * @Date 2024/6/17 14:30
+ * @注释
+ */
+@Data
+@Table("activity_site_equipment")
+@Comment("场地器材表")
+public class ActivitySiteEquipment {
+
+    @Column
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Prev(els = {@EL("uuid()")})
+    private String id;
+
+
+    @Column
+    @Comment("所属场地id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String siteId;
+
+
+    @Column
+    @Comment("器材名称")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String equipmentName;
+
+
+    @Column
+    @Comment("器材编码")
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    private String equipmentCode;
+
+
+    @Column
+    @Comment("器材数量")
+    @ColDefine(type = ColType.INT)
+    private Integer equipmentNum;
+
+    @Column
+    @Comment("是否能被预约")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean isOpen;
+
+    @Column
+    @Comment("入库时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date storageTime;
+
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/site/ActivitySiteInfo.java

@@ -0,0 +1,84 @@
+package com.ruoyi.activity.api.domain.site;
+
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author: Aaron
+ * @create: 2020-12-13 09:31
+ * @description: 活动场地信息
+ **/
+
+@Data
+@Table("activity_site_info")
+public class ActivitySiteInfo {
+
+    @Column
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Prev(els = {@EL("uuid()")})
+    private String id;
+
+    @Column
+    @Comment("场地名称")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String name;
+
+    @Column
+    @Comment("场地地址")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String address;
+
+    @Column
+    @Comment("联系人")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String contact_person;
+
+    @Column
+    @Comment("联系电话")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String contact_phone;
+
+    @Column
+    @Comment("开启状态")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean state;
+
+    @Column
+    @Comment("开放时段")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List open_hours;
+
+    @Column
+    @Comment("创建人")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String create_username;
+
+    @Column
+    @Comment("创建时间")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String create_time;
+
+    @Column
+    @Comment("活动类型")
+    @ColDefine(type = ColType.INT)
+    private Integer typeId;
+
+    @Column
+    @Comment("是否多次预约")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean multiple;
+
+    @Column
+    @Comment("限定工作日预约")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean workday;
+
+    @Column
+    @Comment("限制男女，0表示不限制，1表示限制男，2表示限制女")
+    @ColDefine(type = ColType.INT)
+    private Integer sexLimit;
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/site/ActivitySiteReserve.java

@@ -0,0 +1,158 @@
+package com.ruoyi.activity.api.domain.site;
+
+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;
+
+/**
+ * @author: Aaron
+ * @create: 2020-12-13 14:19
+ * @description: 活动场地预约信息
+ **/
+@Data
+@Table("activity_site_reserve")
+public class ActivitySiteReserve {
+
+    @Column
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Prev(els = {@EL("uuid()")})
+    private String id;
+
+    @Column
+    @Comment("场地id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String site_id;
+
+    @Column
+    @Comment("使用设备")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> equipment_ids;
+
+    @Column
+    @Comment("预约人ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String reserve_person_id;
+
+    @Column
+    @Comment("预约人姓名")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String reserve_person_username;
+
+    @Column
+    @Comment("活动现场负责人")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String site_responsible_person;
+
+    @Column
+    @Comment("活动性质")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String activity_nature;
+
+    @Column
+    @Comment("预约人性别")
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    private String reserve_person_sex;
+
+    @Column
+    @Comment("预约人工号")
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    private String reserve_person_loginname;
+
+    @Column
+    @Comment("预约人联系方式")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String reserve_person_phone;
+
+    @Column
+    @Comment("预约人部门")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String reserve_person_unitname;
+
+    @Column
+    @Comment("预约人工会")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String reserve_person_unionname;
+
+    @Column
+    @Comment("预约人工会id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String reserve_person_unionid;
+
+    @Column
+    @Comment("预约开始时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date reserve_start_time;
+
+    @Column
+    @Comment("预约结束时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date reserve_end_time;
+
+    @Column
+    @Comment("预约活动项目")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String reserve_activity;
+
+    @Column
+    @Comment("参加人数")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String reserve_join_user_num;
+
+    @Column
+    @Comment("预约事由")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String reserve_cause;
+
+    @Column
+    @Comment("是否有横幅标语（内容）")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String banner_slogans;
+
+    @Column
+    @Comment("是否有校外人员参加（注明）")
+    @ColDefine(type = ColType.VARCHAR, width = 255)
+    private String off_campus_personnel;
+
+    @Column
+    @Comment("场地需求")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String reserve_demand;
+
+    @Column
+    @Comment("预约状态id")
+    @ColDefine(type = ColType.INT, width = 4)
+    private Integer reserve_state;
+
+    @Column
+    @Comment("场地管理员id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String site_manager_id;
+
+    @Column
+    @Comment("分工会审核id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String reserve_person_union_process;
+
+    @Column
+    @Comment("校工会审核id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String reserve_person_school_process;
+
+    @Column
+    @Comment("审核记录")
+    @ColDefine(type = ColType.VARCHAR, width = 500)
+    private List<NutMap> auditList;
+
+    @Column
+    @Comment("反馈意见")
+    @ColDefine(type = ColType.VARCHAR, width = 200)
+    private String back_option;
+
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/site/ActivityType.java

@@ -0,0 +1,47 @@
+package com.ruoyi.activity.api.domain.site;
+
+import com.ruoyi.activity.api.domain.AuditState;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+
+import java.util.List;
+
+/**
+ * @Author JyuHsin
+ * @Date 2023/1/31
+ * @Description
+ */
+@Table
+@Data
+@Accessors(chain = true)
+public class ActivityType {
+
+    @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;
+
+    @Column
+    @Comment("审核形式（0无限制，1审核本工会，2审核本单位）")
+    @ColDefine(type = ColType.INT)
+    private int auditType;
+
+    @Many(field = "typeId")
+    private List<AuditState> auditStateList;
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/sports/ActivityPlan.java

@@ -0,0 +1,70 @@
+package com.ruoyi.activity.api.domain.sports;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+/**
+ * TODO
+ *
+ * @Author zhf
+ * @Date 2023/2/1 17:48
+ */
+@Table
+@Data
+@Accessors(chain = true)
+public class ActivityPlan {
+
+
+    @Name
+    @PrevInsert(uu32 = true)
+    private String id;
+
+
+    @Column
+    @Comment("计划名称")
+    @ColDefine(type = ColType.VARCHAR, width = 200)
+    private String name;
+
+    @Column
+    @Comment("计划时间")
+    @ColDefine(type = ColType.VARCHAR, width = 200)
+    private String time;
+
+    @Column
+    @Comment("项目数组")
+    @ColDefine(type = ColType.VARCHAR, width = 500)
+    private String event;
+
+    @Column
+    @Comment("项目id")
+    @ColDefine(type = ColType.VARCHAR, width = 500)
+    private String eventId;
+
+    @Column
+    @Comment("计划内容")
+    @ColDefine(type = ColType.TEXT)
+    private String content;
+
+    @Column
+    @Comment("预算费用")
+    @ColDefine(type = ColType.DOUBLE)
+    private Double money;
+
+    @Column
+    @Comment("计划类型(1-校活动、2-分工会活动、3协会社团活动)")
+    @ColDefine(type = ColType.VARCHAR, width = 7)
+    private String type;
+
+    @Column
+    @Comment("分工会ID或社团ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String tissueId;
+
+    @Column
+    @Comment("活动类型")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String activityType;
+}
+

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/sports/ActivityResults.java

@@ -0,0 +1,75 @@
+package com.ruoyi.activity.api.domain.sports;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+/**
+ * TODO
+ *
+ * @Author zhf
+ * @Date 2023/2/6 19:11
+ */
+@Table
+@Data
+@Accessors(chain = true)
+public class ActivityResults {
+
+    @Name
+    @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 = 30)
+    private String sex;
+
+    @Column
+    @Comment("对应的活动")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String activityId;
+
+
+    @Column
+    @Comment("对应的项目")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String eventId;
+
+    @Column
+    @Comment("名次")
+    @ColDefine(type = ColType.INT, width = 2)
+    private Integer ranking;
+
+
+    @Column
+    @Comment("工会id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unionId;
+
+    @Column
+    @Comment("人数")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String numberOfPeople;
+
+    @Column
+    @Comment("积分")
+    @ColDefine(type = ColType.FLOAT, width = 5)
+    private double integral;
+
+    @Column
+    @Comment("个人1团队2")
+    @ColDefine(type = ColType.INT, width = 2)
+    private Integer isTeamPersonal;
+
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/sports/ActivitySchool.java

@@ -0,0 +1,192 @@
+package com.ruoyi.activity.api.domain.sports;
+
+import com.ruoyi.common.core.domain.SysFile;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.List;
+
+/**
+ * TODO
+ * 校级活动
+ *
+ * @Author zhf
+ * @Date 2023/1/9 17:33
+ */
+@Table
+@Data
+@Accessors(chain = true)
+public class ActivitySchool {
+
+    @Name
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("关联计划")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String planId;
+
+    @Column
+    @Comment("活动名称")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String name;
+
+    @Column
+    @Comment("活动地址")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String address;
+
+    @Column
+    @Comment("关联活动类型")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String typeId;
+
+    @Column
+    @Comment("活动编号")
+    @ColDefine(type = ColType.VARCHAR, width = 200)
+    private String activityCode;
+
+    @Column
+    @Comment("报名开始时间")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String applyStartTime;
+
+    @Column
+    @Comment("报名结束时间")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String applyEndTime;
+
+    @Column
+    @Comment("活动开始时间")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String startTime;
+
+    @Column
+    @Comment("活动结束时间")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String endTime;
+
+    @Column
+    @Comment("关联主办单位")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> unitSponsor;
+
+    @Column
+    @Comment("关联承办单位")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> undertakeUnit;
+
+    @Column
+    @Comment("关联协办单位")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> unitJointly;
+
+    @Column
+    @Comment("活动项目")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> eventsIds;
+
+    @Column
+    @Comment("活动方式(1：竞赛 2：非竞赛)")
+    @ColDefine(type = ColType.INT, width = 2)
+    private Integer gameStyle;
+
+    @Column
+    @Comment("活动类型(2：综合类活动 1：单一活动)")
+    @ColDefine(type = ColType.INT, width = 2)
+    private Integer applyType;
+
+    @Column
+    @Comment("可报名范围组别")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private Integer activityGroupId;
+
+    @Column
+    @Comment("经费预算")
+    @ColDefine(type = ColType.FLOAT, width = 10, precision = 2)
+    private Double funding;
+
+    @Column
+    @Comment("报名方式(1：个人 2：分工会 3：小程序)")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<Integer> applyWay;
+
+    @Column
+    @Comment("报名人员类型(1：会员 2：普通教职工)")
+    @ColDefine(type = ColType.INT, width = 2)
+    private Integer personType;
+
+    @Column
+    @Comment("运动员资格（竞赛）")
+    @ColDefine(type = ColType.TEXT)
+    private String athleteQualification;
+
+    @Column
+    @Comment("报名方法（竞赛）")
+    @ColDefine(type = ColType.TEXT)
+    private String registrationMethod;
+
+    @Column
+    @Comment("竞赛方法（竞赛）")
+    @ColDefine(type = ColType.TEXT)
+    private String competitionMethod;
+
+    @Column
+    @Comment("奖励方法（竞赛）")
+    @ColDefine(type = ColType.TEXT)
+    private String rewardMethod;
+
+    @Column
+    @Comment("注意事项（竞赛）")
+    @ColDefine(type = ColType.TEXT)
+    private String precautions;
+
+    @Column
+    @Comment("活动通知（非竞赛）")
+    @ColDefine(type = ColType.TEXT)
+    private String eventNotification;
+
+    @Column
+    @Comment("是否关闭")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean close;
+
+    @Column
+    @Comment("活动级别（40001-校级、40002-分工会、40003-社团或协会）")
+    @ColDefine(type = ColType.INT, width = 10)
+    private Integer activityLevel;
+
+    @Column
+    @Comment("是否保存")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Integer isSave;
+
+    @Column
+    @Comment("小程序活动封面")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<SysFile> image;
+
+    @Many(field = "activityId")
+    private List<ActivitySchoolEvent> schoolEvents;
+
+
+    @Column
+    @Comment("活动所属工会")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String belongUnionId;
+
+    @Column
+    @Comment("活动所属社团")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String belongClubId;
+
+    @Column
+    @Comment("创建时间")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String foundDate;
+
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/sports/ActivitySchoolApply.java

@@ -0,0 +1,196 @@
+package com.ruoyi.activity.api.domain.sports;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * @Author zhf
+ * @Date 2023/2/1 11:48
+ */
+@Table
+@Data
+@Accessors(chain = true)
+public class ActivitySchoolApply {
+
+
+    @Name
+    @PrevInsert(uu32 = true)
+    private String id;
+
+
+    @Column
+    @Comment("对应的活动")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String activityId;
+
+    @Column
+    @Comment("对应的项目")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String eventId;
+
+    @Column
+    @Comment("对应的是单项还是团体（1是个人2是团体）")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String awardsMode;
+
+    @Column
+    @Comment("所属队")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String teamId;
+
+    @Column
+    @Comment("所属单位")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unitId;
+
+    @Column
+    @Comment("报名所属单位")
+    @ColDefine(customType = "bigint")
+    private Long applyUnitId;
+
+    @Column
+    @Comment("所属工会")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unionId;
+
+    @Column
+    @Comment("所属工会名称")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unionName;
+
+    @Column
+    @Comment("所属活动工会")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String activityUnionId;
+
+    @Column
+    @Comment("所属活动工会名称")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String activityUnionName;
+
+    @Column
+    @Comment("报名人")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String applyUser;
+
+    @Column
+    @Comment("参加人")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private Long userId;
+
+    @Column
+    @Comment("出生年月")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String birthday;
+
+
+    @Column
+    @Comment("报名时间")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String applyDate;
+
+    @Column
+    @Comment("身份(1 运动员 2 教练 3 领队4 处级领导5 替补6 团长7工作人员)")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> identity;
+
+    @Column
+    @Comment("是否处级领导")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean divisionLevelLeadership;
+
+    @Column
+    @Comment("是否兼运动员")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean isAthlete;
+
+    @Column
+    @Comment("是否为工会总领队")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean unionLeader;
+
+    @Column
+    @Comment("是否为工会总教练")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean unionCoach;
+
+    @Column
+    @Comment("是否为工会团长")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean unionHead;
+
+    @Column
+    @Comment("是否为工会工作人员")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean unionStaff;
+
+    @Column
+    @Comment("状态（0 保存 1 待审核 2 报名成功 3 审核不通过）")
+    private Integer status;
+
+
+    @Column
+    @Comment("单位名称")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String unitname;
+
+    @Excel(name = "项目名称", width = 40)
+    private String allName;
+
+    @Column
+    @Comment("小队名称")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String team;
+
+    @Column
+    @Comment("工号")
+    @Excel(name = "工号", width = 20)
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String loginname;
+
+    @Column
+    @Comment("姓名")
+    @Excel(name = "姓名", width = 20)
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String username;
+
+    @Column
+    @Comment("电话")
+    @Excel(name = "手机号码", width = 20)
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String mobile;
+
+
+    @Excel(name = "身份证号", width = 20)
+    private String idCard;
+
+    @Column
+    @Comment("性别")
+    @Excel(name = "性别", width = 20)
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String sex;
+
+    @Excel(name = "所属分工会", width = 20)
+    private String unionname;
+
+    @Excel(name = "报名人", width = 20)
+    private String applyUserName;
+
+    @Excel(name = "报名所属分工会", width = 30)
+    private String applyUnionName;
+/*
+    @Excel(name = "在职状态", width = 20)
+    private String userState;*/
+
+//    @Excel(name = "身份", width = 40)
+    private String sf;
+    private int age;
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/sports/ActivitySchoolEvent.java

@@ -0,0 +1,149 @@
+package com.ruoyi.activity.api.domain.sports;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * TODO
+ * 校级活动活动项目关联表
+ *
+ * @Author zhf
+ * @Date 2023/1/9 17:32
+ */
+@Table
+@Data
+@Accessors(chain = true)
+public class ActivitySchoolEvent implements Serializable {
+
+
+    @Name
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("活动ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String activityId;
+
+    @Column
+    @Comment("项目ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String eventId;
+
+    @Column
+    @Comment("比赛模式(1：单项 2：团队)")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private Integer awardsMode;
+
+    @Column
+    @Comment("组合方式(1：单项报名人数 2：团体报名人数)")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<Integer> combinationMethod;
+
+    @Column
+    @Comment("组合方式1：最多人数")
+    @ColDefine(type = ColType.INT, width = 8)
+    private Integer restrictTotalPeople;
+
+    @Column
+    @Comment("组合方式1：报名方式（1-单人、2-双人）")
+    @ColDefine(type = ColType.INT, width = 2)
+    private Integer registrationWays;
+
+    @Column
+    @Comment("组合方式2：最少人数")
+    @ColDefine(type = ColType.INT, width = 8)
+    private Integer restrictMinNum;
+
+    @Column
+    @Comment("组合方式2：最多人数")
+    @ColDefine(type = ColType.INT, width = 8)
+    private Integer restrictMaxNum;
+
+    @Column
+    @Comment("组合方式2：最大队数")
+    @ColDefine(type = ColType.INT, width = 8)
+    private Integer restrictTotalTeam;
+
+    @Column
+    @Comment("组合方式2：运动员最多人数")
+    @ColDefine(type = ColType.INT, width = 8)
+    private Integer athletesMaxNum;
+
+    @Column
+    @Comment("组合方式2：运动员最少人数")
+    @ColDefine(type = ColType.INT, width = 8)
+    private Integer athletesMinNum;
+
+    @Column
+    @Comment("组合方式2：领队人数")
+    @ColDefine(type = ColType.INT, width = 8)
+    private Integer leanderNum;
+
+    @Column
+    @Comment("组合方式2：教练人数")
+    @ColDefine(type = ColType.INT, width = 8)
+    private Integer coachNum;
+
+    @Column
+    @Comment("组合方式2：女队人数")
+    @ColDefine(type = ColType.INT, width = 8)
+    private Integer restrictGirlNum;
+
+    @Column
+    @Comment("组合方式2：男队人数")
+    @ColDefine(type = ColType.INT, width = 8)
+    private Integer restrictBoyNum;
+
+    @Column
+    @Comment("组合方式2：副处长（级）以上至少人数")
+    @ColDefine(type = ColType.INT, width = 8)
+    private Integer deputyDirectorNum;
+
+    @Column
+    @Comment("组合方式2：替补人数")
+    @ColDefine(type = ColType.INT, width = 8)
+    private Integer substituteNum;
+
+    @Column
+    @Comment("每人限报项目数")
+    @ColDefine(type = ColType.INT, width = 2)
+    private Integer restrictRegNumber;
+
+    @Column
+    @Comment("开始年龄")
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    private String startAgeDate;
+
+    @Column
+    @Comment("截至年龄")
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    private String endAgeDate;
+
+    @Column
+    @Comment("是否只报领队")
+    @ColDefine(type = ColType.BOOLEAN)
+    private boolean isLeader;
+
+    @Column
+    @Comment("每对运动员男女不做限制")
+    @ColDefine(type = ColType.BOOLEAN)
+    private boolean isManGirlNum;
+
+
+    @Column
+    @Comment("是否组队报名")
+    @ColDefine(type = ColType.BOOLEAN)
+    @Default("0")
+    private Boolean isTeamSignUp;
+
+    @One(field = "activityId", key = "id")
+    private ActivitySchool activitySchool;
+
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/sports/ActivitySchoolTeam.java

@@ -0,0 +1,57 @@
+package com.ruoyi.activity.api.domain.sports;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.nutz.dao.DB;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+/**
+ * TODO
+ * 小队表
+ *
+ * @Author zhf
+ * @Date 2023/2/1 10:45
+ */
+@Table
+@Data
+@Accessors(chain = true)
+public class ActivitySchoolTeam {
+
+    @Name
+    @PrevInsert(uu32 = true)
+    private String id;
+
+
+    @Column
+    @Comment("对应的活动")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String activityId;
+
+    @Column
+    @Comment("项目ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String eventId;
+
+    @Column
+    @Comment("队名")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String name;
+
+    @Column
+    @Comment("最少人数")
+    @ColDefine(type = ColType.INT, width = 8)
+    private Integer minNum;
+
+    @Column
+    @Comment("最多人数")
+    @ColDefine(type = ColType.INT, width = 8)
+    private Integer maxNum;
+
+    @Column
+    @Comment("排序")
+    @Prev({
+            @SQL(db = DB.MYSQL, value = "SELECT IFNULL(MAX(location),0)+1 FROM activity_school_team")
+    })
+    private Integer location;
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/sports/ActivityUnion.java

@@ -0,0 +1,36 @@
+package com.ruoyi.activity.api.domain.sports;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+/**
+ * TODO
+ *
+ * @Author zhf
+ * @Date 2023/2/1 10:25
+ */
+
+@Table
+@Data
+@Accessors(chain = true)
+public class ActivityUnion {
+
+
+    @Name
+    @PrevInsert(uu32 = true)
+    private String id;
+
+
+    @Column
+    @Comment("工会名称")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String unionname;
+
+
+    @Column
+    @Comment("活动id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String activityId;
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/template/UserTemp.java

@@ -0,0 +1,18 @@
+package com.ruoyi.activity.api.domain.template;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+@Data
+public class UserTemp {
+
+    @Excel(name = "工号")
+    private String loginName;
+
+    @Excel(name = "姓名")
+    private String userName;
+
+    @Excel(name = "备注")
+    private String remarks;
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/trainSignUp/TrainMobileSignColumn.java

@@ -0,0 +1,79 @@
+package com.ruoyi.activity.api.domain.trainSignUp;
+
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.List;
+
+@Table("train_mobile_sign_column")
+@Data
+public class TrainMobileSignColumn {
+
+    private static final long serialVersionUID = 1L;
+
+    @Name
+    @Comment("id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    /**
+     * train_sign_up_type id
+     */
+    @Column
+    @Comment("类型id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String typeId;
+
+    @Column
+    @Comment("字段名称")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String columnName;
+
+    @Column
+    @Comment("字段编码")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String columnCode;
+
+    @Column
+    @Comment("字段值")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String columnValue;
+
+    @Column
+    @Comment("字段类型")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String columnType;
+
+    @Column
+    @Comment("下拉框的值")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> selectValues;
+
+    @Column
+    @Comment("是否必填")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean isRequired;
+
+    @Column
+    @Comment("控件类型")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String columnFormType;
+
+    @Column
+    @Comment("文件个数")
+    @ColDefine(type = ColType.INT)
+    private Integer fileNumber;
+
+    @Column
+    @Comment("文件类型")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> fileType;
+
+    @Column
+    @Comment("序号")
+    @ColDefine(type = ColType.INT, width = 1)
+    private Integer columnIndex;
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/trainSignUp/TrainSignUpActivity.java

@@ -0,0 +1,134 @@
+package com.ruoyi.activity.api.domain.trainSignUp;
+
+import com.ruoyi.common.core.domain.SysFile;
+import com.ruoyi.system.api.domain.MatchConditionStructure;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author zxy
+ * @Description 培训报名活动
+ * @createTime 2022年02月23日 08:57:00
+ */
+@Table
+@Data
+@Accessors(chain = true)
+public class TrainSignUpActivity implements Serializable {
+
+    @Name
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("活动名称")
+    private String activityName;
+
+    @Column
+    @ColDefine(type = ColType.INT)
+    @Comment("年度")
+    private Integer year;
+
+    @Column
+    @ColDefine(type = ColType.DATETIME)
+    @Comment("活动报名开始时间")
+    private Date activitySignUpStartTime;
+
+    @Column
+    @ColDefine(type = ColType.DATETIME)
+    @Comment("活动报名开始时间")
+    private Date activitySignUpEndTime;
+
+    @Column
+    @ColDefine(type = ColType.DATETIME)
+    @Comment("活动开始时间")
+    private Date activityStartTime;
+
+    @Column
+    @ColDefine(type = ColType.DATETIME)
+    @Comment("活动结束时间")
+    private Date activityEndTime;
+
+    @Column
+    @ColDefine(type = ColType.BOOLEAN)
+    @Comment("是否禁用")
+    private boolean isDisabled;
+
+    @Column
+    @ColDefine(customType = "longtext")
+    @Comment("活动介绍")
+    private String introduce;
+
+    @Column
+    @ColDefine(type = ColType.INT, width = 10)
+    @Comment("活动限制标识")
+    private Integer restrictLimit;
+
+    @Column
+    @ColDefine(type = ColType.INT, width = 10)
+    @Comment("活动限制报名个数")
+    private Integer limitNum;
+
+    @Column
+    @ColDefine(type = ColType.MYSQL_JSON)
+    @Comment("活动封面")
+    private List<SysFile> cover;
+
+    @Column
+    @ColDefine(type = ColType.MYSQL_JSON)
+    @Comment("微信群二维码")
+    private List<SysFile> wechat;
+
+    @Column
+    @ColDefine(type = ColType.BOOLEAN)
+    @Comment("上课前是否通知")
+    private boolean notice;
+
+    @Column
+    @Comment("活动范围Id")
+    @ColDefine(type = ColType.INT, width = 32)
+    private Integer activityGroupId;
+
+    @Column
+    @Comment("活动范围名称")
+    @ColDefine(type = ColType.VARCHAR, width = 40)
+    private String activityGroupName;
+
+    /**
+     * 所有的培训班
+     */
+    @Many(field = "activityId")
+    private List<TrainSignUpCourse> courseList;
+
+    @Many(field = "activityId")
+    private List<TrainSignUpTypeLimit> typeLimits;
+
+    @Column
+    @Comment("条件")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String conditionStructureId;
+
+    @One(field = "conditionStructureId")
+    private MatchConditionStructure conditionStructure;
+
+    @Column
+    @Comment("活动类型")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String trainType;
+
+    @Column
+    @Comment("创建人")
+    @ColDefine(customType = "bigint")
+    private Long userId;
+
+    @Column
+    @Comment("创建时间")
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    private String ctime;
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/trainSignUp/TrainSignUpActivityCourse.java

@@ -0,0 +1,50 @@
+package com.ruoyi.activity.api.domain.trainSignUp;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.Date;
+
+/**
+ * @author zxy
+ * @Description 活动下的课程
+ * @createTime 2022年02月23日 09:26:00
+ */
+@Table
+@Data
+@Accessors(chain = true)
+public class TrainSignUpActivityCourse {
+
+    @Name
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("活动ID")
+    private String activityId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("课程ID")
+    private String courseId;
+
+    @Column
+    @ColDefine(type = ColType.DATETIME)
+    @Comment("课程开始时间")
+    private Date courseStartTime;
+
+    @Column
+    @ColDefine(type = ColType.DATETIME)
+    @Comment("课程结束时间")
+    private Date courseEndTime;
+
+    @Column
+    @ColDefine(type = ColType.DATE)
+    @Comment("课程时间")
+    private Date courseDate;
+
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/trainSignUp/TrainSignUpBlackList.java

@@ -0,0 +1,31 @@
+package com.ruoyi.activity.api.domain.trainSignUp;
+
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+/**
+ * @author zxy
+ * @Description 黑名单
+ * @createTime 2022年03月07日 14:32:00
+ */
+@Table
+@Data
+public class TrainSignUpBlackList {
+
+    @Name
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @ColDefine(customType = "bigint")
+    @Comment("用户id")
+    private Long userId;
+
+    @Column
+    @ColDefine(type = ColType.BOOLEAN)
+    @Comment("是否禁用")
+    private Boolean isDisabled;
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/trainSignUp/TrainSignUpCourse.java

@@ -0,0 +1,137 @@
+package com.ruoyi.activity.api.domain.trainSignUp;
+
+import com.ruoyi.common.core.domain.SysFile;
+import com.ruoyi.system.api.domain.MatchConditionStructure;
+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.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zxy
+ * @Description 培训班信息
+ * @createTime 2022年02月23日 09:04:00
+ */
+@Table
+@Data
+@Accessors(chain = true)
+public class TrainSignUpCourse implements Serializable {
+
+    @Name
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("活动ID")
+    private String activityId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("课程名称")
+    private String courseName;
+
+    @Column
+    @ColDefine(type = ColType.INT)
+    @Comment("课程人数")
+    private int coursePeopleNumber;
+
+    @Column
+    @ColDefine(type = ColType.INT)
+    @Default(value = "0")
+    @Comment("预留名额")
+    private int courseReservedNumber;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("课程地点")
+    private String courseLocation;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("课程类型")
+    private String courseType;
+
+    @Column
+    @ColDefine(type = ColType.MYSQL_JSON)
+    @Comment("课程地点坐标")
+    private List<Double> courseLocationCoordinates;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    @Comment("课程讲师")
+    private String courseInstructor;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    @Comment("校区")
+    private String campus;
+
+    @Column
+    @ColDefine(type = ColType.INT)
+    @Comment("序号")
+    private int orderNum;
+
+    @Many(field = "courseId")
+    private List<TrainSignUpActivityCourse> courseTimeList;
+
+    //已报人数
+    private Integer hasRegisterNum;
+
+    //是否报过该课程
+    private Boolean isSign;
+
+    private String summaryText;
+
+    //还能报该类型的课程吗
+    private Boolean canSignThisCourseType;
+
+    private List<SysFile> classPhoto;
+
+    @Column
+    @Comment("条件")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String conditionStructureId;
+
+    @One(field = "conditionStructureId")
+    private MatchConditionStructure conditionStructure;
+
+    @Column
+    @Comment("分工会人数限制")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<NutMap> unionLimit;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 1000)
+    @Comment("备注")
+    private String bz;
+
+    @Column
+    @ColDefine(type = ColType.BOOLEAN)
+    @Comment("移动端是否签到")
+    private boolean isMobileSign;
+
+    @Column
+    @ColDefine(type = ColType.INT)
+    @Comment("签到方式 1.扫描二维码签到 2.被扫 3.gps签到")
+    private Integer signType;
+
+    @Column
+    @ColDefine(type = ColType.BOOLEAN)
+    @Comment("移动端是否签收礼品")
+    private boolean isReceiveGift;
+
+    @Column
+    @ColDefine(type = ColType.INT)
+    @Comment("领取礼品方式 1.扫描二维码 2.线下")
+    private Integer giftType;
+
+    @Column
+    @Comment("分类标识")
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    private String assort;
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/trainSignUp/TrainSignUpType.java

@@ -0,0 +1,44 @@
+package com.ruoyi.activity.api.domain.trainSignUp;
+
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * @author 赵欣雨
+ * @date 2020/8/18 9:16
+ */
+@Table("train_sign_up_type")
+@Data
+public class TrainSignUpType implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Name
+    @Comment("id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("类型编码")
+    @ColDefine(type = ColType.VARCHAR, width = 80)
+    private String code;
+
+    @Column
+    @Comment("类型名称")
+    @ColDefine(type = ColType.VARCHAR, width = 80)
+    private String lxname;
+
+    @Column
+    @Comment("序号")
+    @ColDefine(type = ColType.INT, width = 1)
+    private Integer xh;
+
+    @Many(field = "typeId")
+    private List<TrainMobileSignColumn> trainMobileSignColumnList;
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/trainSignUp/TrainSignUpTypeLimit.java

@@ -0,0 +1,40 @@
+package com.ruoyi.activity.api.domain.trainSignUp;
+
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.io.Serializable;
+
+/**
+ * @Author JyuHsin
+ * @Date 2022/9/22
+ * @Description
+ */
+@Table("train_sign_up_type_limit")
+@Data
+public class TrainSignUpTypeLimit implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @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 activityId;
+
+    @Column
+    @Comment("活动类型id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String typeId;
+
+    @Column
+    @Comment("限制个数")
+    @ColDefine(type = ColType.INT, width = 10)
+    private int limitNum;
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/trainSignUp/TrainSignUpUser.java

@@ -0,0 +1,64 @@
+package com.ruoyi.activity.api.domain.trainSignUp;
+
+import com.ruoyi.common.core.domain.SysFile;
+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.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author zxy
+ * @Description 报名人员 报名记录
+ * @createTime 2022年02月23日 09:34:00
+ */
+@Table
+@Data
+@Accessors(chain = true)
+@TableIndexes({@Index(name = "INDEX_TRAIN_SIGN_UP_USER_COURSEID", fields = {"courseId"}, unique = false)})
+public class TrainSignUpUser implements Serializable {
+
+    @Name
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("活动ID")
+    private String activityId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("课程ID")
+    private String courseId;
+
+    @Column
+    @ColDefine(customType = "bigint")
+    @Comment("用户ID")
+    private Long userId;
+
+    @Column
+    @ColDefine(type = ColType.DATETIME)
+    @Comment("报名时间")
+    private Date signUpTime;
+
+    @Column
+    @ColDefine(type = ColType.MYSQL_JSON)
+    @Comment("手机端报名字段和值")
+    private List<NutMap> mobileColumnsValue;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 500)
+    @Comment("结题报告")
+    private String summaryText;
+
+    @Column
+    @ColDefine(type = ColType.MYSQL_JSON)
+    @Comment("上课照片")
+    private List<SysFile> classPhoto;
+
+}

ruoyi-api/ruoyi-api-activity/src/main/java/com/ruoyi/activity/api/domain/trainSignUp/TrainSignUpUserCourse.java

@@ -0,0 +1,89 @@
+package com.ruoyi.activity.api.domain.trainSignUp;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author zxy
+ * @Description 用户课程表
+ * @createTime 2022年02月23日 09:38:00
+ */
+@Table
+@Data
+@Accessors(chain = true)
+@TableIndexes({
+        @Index(name = "INDEX_TRAIN_SIGN_UP_USER_COURSE_USERID", fields = {"userId"}, unique = false),
+        @Index(name = "INDEX_TRAIN_SIGN_UP_USER_COURSE_COURSEID", fields = {"courseId"}, unique = false)
+})
+public class TrainSignUpUserCourse implements Serializable {
+
+    @Name
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("活动ID")
+    private String activityId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("课程ID")
+    private String courseId;
+
+    @Column
+    @ColDefine(customType = "bigint")
+    @Comment("用户ID")
+    private Long userId;
+
+    @Column
+    @ColDefine(type = ColType.DATETIME)
+    @Comment("课程开始时间")
+    private Date courseStartTime;
+
+    @Column
+    @ColDefine(type = ColType.DATETIME)
+    @Comment("课程结束时间")
+    private Date courseEndTime;
+
+    @Column
+    @ColDefine(type = ColType.BOOLEAN)
+    @Comment("是否上课")
+    private boolean isAttend;
+
+    @Column
+    @ColDefine(type = ColType.DATETIME)
+    @Comment("上课打卡时间")
+    private Date attendTime;
+
+    @Column
+    @ColDefine(type = ColType.BOOLEAN)
+    @Comment("是否领取礼品")
+    private Boolean isReceive;
+
+    @Column
+    @ColDefine(type = ColType.DATETIME)
+    @Comment("领取礼品时间")
+    private Date receiveTime;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("签到扫码人员id(二维码模式)")
+    private String signScannerCodeUserId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("礼品扫码人员id(二维码模式)")
+    private String giftScannerCodeUserId;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("关联train_sign_up_activity_course表的id")
+    private String activityCourseId;
+
+}