From bef4f6d51bff03c0512a75f43e79699b7296f1fa Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期四, 23 十一月 2023 18:00:53 +0800
Subject: [PATCH] 修改系统角色逻辑、和老师身份逻辑
---
src/main/java/com/qxueyou/scc/admin/classes/model/ClsClass.java | 145 +++++++++++++++++++++++++++--------------------
1 files changed, 83 insertions(+), 62 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/admin/classes/model/ClsClass.java b/src/main/java/com/qxueyou/scc/admin/classes/model/ClsClass.java
index 07283c3..26ff4a0 100644
--- a/src/main/java/com/qxueyou/scc/admin/classes/model/ClsClass.java
+++ b/src/main/java/com/qxueyou/scc/admin/classes/model/ClsClass.java
@@ -32,7 +32,7 @@
/**
* The persistent class for the org_class database table.
- *
+ *
*/
@Entity
@Table(name = "cls_class")
@@ -41,46 +41,46 @@
* UID
*/
private static final long serialVersionUID = 5971007065116777117L;
-
- /** 面授 */
+
+ /** 闈㈡巿 */
public static final String CLASS_FACE = "FACE_TO_FACE";
- /** 网络 */
+ /** 缃戠粶 */
public static final String CLASS_NETWORK = "NETWORK";
- /** 有直播 */
+ /** 鏈夌洿鎾� */
public static final int HAVE_LIVE = 1;
-
- /** 无直播 */
+
+ /** 鏃犵洿鎾� */
public static final int NOT_HAVE_LIVE = 0;
- /** 有视频 */
+ /** 鏈夎棰� */
public static final int HAVE_VIDEO = 1;
- /** 无视频 */
+ /** 鏃犺棰� */
public static final int NOT_HAVE_VIDEO = 0;
- /** 有讲义 */
+ /** 鏈夎涔� */
public static final int HAVE_HANDOUT = 1;
- /** 无讲义 */
+ /** 鏃犺涔� */
public static final int NOT_HAVE_HANDOUT = 0;
- /** 有推荐奖励 */
+ /** 鏈夋帹鑽愬鍔� */
public static final int HAVE_AWARD = 1;
- /** 无推荐奖励 */
+ /** 鏃犳帹鑽愬鍔� */
public static final int NOT_HAVE_AWARD = 0;
- /** 消息处理业务类型：发送消息 */
+ /** 娑堟伅澶勭悊涓氬姟绫诲瀷锛氬彂閫佹秷鎭� */
public static final String MSG_ACTION_TYPE_SEND = "send_sms";
- /** 消息处理业务类型：新建班级 */
+ /** 娑堟伅澶勭悊涓氬姟绫诲瀷锛氭柊寤虹彮绾� */
public static final String MSG_ACTION_TYPE_ADD = "add_Class";
- /** 消息处理业务类型：复制班级 */
+ /** 娑堟伅澶勭悊涓氬姟绫诲瀷锛氬鍒剁彮绾� */
public static final String MSG_ACTION_TYPE_COPY = "copy_Class";
- /** 班级进度：报名 */
- public static final String CLASS_PROGRESS_START = "报名";
- /** 班级进度：学习 */
- public static final String CLASS_PROGRESS_STUDY = "学习";
- /** 班级进度：结束 */
- public static final String CLASS_PROGRESS_END = "结束";
+ /** 鐝骇杩涘害锛氭姤鍚� */
+ public static final String CLASS_PROGRESS_START = "鎶ュ悕";
+ /** 鐝骇杩涘害锛氬涔� */
+ public static final String CLASS_PROGRESS_STUDY = "瀛︿範";
+ /** 鐝骇杩涘害锛氱粨鏉� */
+ public static final String CLASS_PROGRESS_END = "缁撴潫";
@Id
@GeneratedValue(generator = "hibernate-uuid")
@@ -138,7 +138,7 @@
@Column(name = "ARRANGEMENT", length = 255)
private String arrangement;
- /** 班级优势 */
+ /** 鐝骇浼樺娍 */
@Column(name = "ADVANTAGE", length = 255)
private String advantage;
@@ -153,7 +153,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
private Date endTime;
- /** 当前已报名学生人数 */
+ /** 褰撳墠宸叉姤鍚嶅鐢熶汉鏁� */
@Column(name = "STUDENT_COUNT")
private int studentCount;
@@ -176,7 +176,7 @@
@JsonIgnore
private String updator;
- /** 是否推广 false：不推广 true：推广 */
+ /** 鏄惁鎺ㄥ箍 false锛氫笉鎺ㄥ箍 true锛氭帹骞� */
@Column(name = "EXTENDED")
private boolean extended;
@@ -195,7 +195,7 @@
@Column(name = "SCORE", precision = 10, scale = 2)
private BigDecimal score;
- /** 学生总数 计划招生人数,用于机构 指定 */
+ /** 瀛︾敓鎬绘暟 璁″垝鎷涚敓浜烘暟,鐢ㄤ簬鏈烘瀯 鎸囧畾 */
@Column(name = "STU_ALL_COUNT")
private BigInteger stuAllCount;
@@ -205,67 +205,67 @@
@Column(name = "POINTER", length = 255)
private String pointer;
- /*** 点击次数 **/
+ /*** 鐐瑰嚮娆℃暟 **/
@Column(name = "CLICK_NUM", precision = 11, scale = 0)
private BigDecimal clickNum;
- /*** 省份 **/
+ /*** 鐪佷唤 **/
@Column(name = "PROVINCE", length = 255)
private String province;
- /*** 城市 **/
+ /*** 鍩庡競 **/
@Column(name = "CITY", length = 255)
private String city;
- /*** 区域 **/
+ /*** 鍖哄煙 **/
@Column(name = "REGION", length = 255)
private String region;
- /*** 是否置顶 **/
+ /*** 鏄惁缃《 **/
@Column(name = "TOP_FLAG", length = 255)
private Boolean topFlag;
- /*** 方式 **/
+ /*** 鏂瑰紡 **/
@Column(name = "MODE", length = 255)
private String mode;
- /*** 商品ID **/
+ /*** 鍟嗗搧ID **/
@Column(name = "GOOD_ID", length = 32)
private String goodId;
- /*** 产品ID **/
+ /*** 浜у搧ID **/
@Column(name = "PRODUCT_ID", length = 255)
private String productId;
- /*** 机构ID **/
+ /*** 鏈烘瀯ID **/
@Column(name = "ORG_ID", length = 32)
private String orgId;
- /*** 是否有直播 **/
+ /*** 鏄惁鏈夌洿鎾� **/
@Column(name = "HAVE_LIVE", length = 1)
private Integer haveLive;
- /*** 是否有视频 **/
+ /*** 鏄惁鏈夎棰� **/
@Column(name = "HAVE_VIDEO", length = 1)
private Integer haveVideo;
- /*** 是否有讲义 **/
+ /*** 鏄惁鏈夎涔� **/
@Column(name = "HAVE_HANDOUT", length = 1)
private Integer haveHandout;
- /*** 经度 **/
+ /*** 缁忓害 **/
@Column(name = "LONGITUDE_X", length = 32)
private String logitudeX;
- /*** 纬度 **/
+ /*** 绾害 **/
@Column(name = "LATITUDE_Y", length = 32)
private String latitudeY;
- /*** 付款人数 **/
+ /*** 浠樻浜烘暟 **/
@Column(name = "PAYMENT_NUM", length = 11)
private BigInteger paymentNum;
- /*** 是否有推荐奖励 **/
+ /*** 鏄惁鏈夋帹鑽愬鍔� **/
@Column(name = "HAVA_AWARD", length = 32)
private Integer haveAward;
@@ -284,63 +284,84 @@
@Transient
private String orgShortName;
- // 班级引荐费
+ // 鐝骇寮曡崘璐�
@Transient
private BigDecimal referFee;
- /** 激活人数 **/
+ /** 婵�娲讳汉鏁� **/
@Transient
private Integer registCount;
- // ============================新添加字段=================================
- /** 是否有学生加班审批 */
+ // ============================鏂版坊鍔犲瓧娈�=================================
+ /** 鏄惁鏈夊鐢熷姞鐝鎵� */
@Column(name = "NEED_JOIN_AUDIT", nullable = false)
private Boolean needJoinAudit;
- /** 班级编码 */
+ /** 鐝骇缂栫爜 */
@Column(name = "CLASS_NUMBER", nullable = false)
private String classNumber;
- /** 是否有需要学生退班审批 */
+ /** 鏄惁鏈夐渶瑕佸鐢熼��鐝鎵� */
@Column(name = "NEED_QUIT_AUDIT", nullable = false)
private Boolean needQuitAudit;
- /** 完成练习是否显示答案 */
+ /** 瀹屾垚缁冧範鏄惁鏄剧ず绛旀 */
@Column(name = "SHOU_ANALYSIS_AFTER_EXER", nullable = false)
private Boolean showAnalysisAfterExer;
- /** 是否允许重复练习 */
+ /** 鏄惁鍏佽閲嶅缁冧範 */
@Column(name = "CAN_MULTI_EXER", nullable = false)
private Boolean canMultiExer;
- /** 是否开通班级论坛 */
+ /** 鏄惁寮�閫氱彮绾ц鍧� */
@Column(name = "NEED_FORUM", nullable = false)
private Boolean needForum;
- /** 班级老师 */
+ /** 鐝骇鑰佸笀 */
@Column(name = "TEACHER_ID", length = 32)
private String teacherId;
-
+ /** 鐝富浠诲悕绉� */
+ @Column(name = "CHARGE_CLASS_NAME", length = 32)
+ private String chargeClassName;
+ /** 鐝富浠籭d */
+ @Column(name = "CHARGE_CLASS_ID ", length = 32)
+ private String chargeClassId;
+
@ManyToMany(fetch = FetchType.LAZY, cascade = CascadeType.REFRESH)
- @JoinTable(name = "CLS_CLASS_RE_SUBJECT", joinColumns = {
- @JoinColumn(name = "CLASS_ID") },
+ @JoinTable(name = "CLS_CLASS_RE_SUBJECT", joinColumns = {
+ @JoinColumn(name = "CLASS_ID") },
inverseJoinColumns = { @JoinColumn(name = "SUBJECT_ID") })
@GeneratedValue(generator = "hibernate-uuid")
@GenericGenerator(name = "hibernate-uuid", strategy = "uuid")
@CollectionId(
- columns = @Column(name="CLS_RE_SUBJECT_ID"),
- type=@Type(type="string"),
- generator = "hibernate-uuid"
- )
+ columns = @Column(name="CLS_RE_SUBJECT_ID"),
+ type=@Type(type="string"),
+ generator = "hibernate-uuid"
+ )
@Where(clause="DELETE_FLAG=0")
private List<Subject> subjects = new ArrayList<>();
-
-
+
+
@ManyToMany(fetch = FetchType.LAZY, mappedBy = "classes")
@JsonIgnore
private List<MediaVideoLive> videoLives;
-
+
+ public String getChargeClassName() {
+ return chargeClassName;
+ }
+
+ public void setChargeClassName(String chargeClassName) {
+ this.chargeClassName = chargeClassName;
+ }
+
+ public String getChargeClassId() {
+ return chargeClassId;
+ }
+
+ public void setChargeClassId(String chargeClassId) {
+ this.chargeClassId = chargeClassId;
+ }
public String getTeacherId() {
return teacherId;
--
Gitblit v1.8.0