From 0077611aa7fe8190231994fcac22f294dac81c09 Mon Sep 17 00:00:00 2001
From: paidaxing444 <12qwaszx>
Date: Thu, 14 May 2020 08:59:06 +0800
Subject: [PATCH] =?UTF-8?q?20200514-zlp-1=20=E6=9C=89=E4=B8=AA=E5=86=B2?=
=?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../benyi/domain/BySchoolcalendarClass.java | 47 ++++++++++++-------
.../benyi/BySchoolcalendarClassMapper.xml | 20 ++++++++
2 files changed, 50 insertions(+), 17 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcalendarClass.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcalendarClass.java
index b25544e1a..2b7e0a1d3 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcalendarClass.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcalendarClass.java
@@ -1,6 +1,7 @@
package com.ruoyi.project.benyi.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.project.system.domain.ByClass;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -65,6 +66,8 @@ public class BySchoolcalendarClass extends BaseEntity
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createtime;
+ private ByClass byClass;
+
public void setId(Long id)
@@ -126,9 +129,14 @@ public class BySchoolcalendarClass extends BaseEntity
this.activitytime = activitytime;
}
+ public Date getActivitytime()
+ {
+ return activitytime;
+ }
public void setActivityendtime(Date activityendtime) {
this.activityendtime = activityendtime;
}
+
public Date getActivityendtime() {
return activityendtime;
}
@@ -136,14 +144,10 @@ public class BySchoolcalendarClass extends BaseEntity
public void setStylecolor(String stylecolor) {
this.stylecolor = stylecolor;
}
+
public String getStylecolor() {
return stylecolor;
}
-
- public Date getActivitytime()
- {
- return activitytime;
- }
public void setCreateuserid(Long createuserid)
{
this.createuserid = createuserid;
@@ -159,18 +163,19 @@ public class BySchoolcalendarClass extends BaseEntity
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("name", getName())
- .append("type", getType())
- .append("classid", getClassid())
- .append("xnxq", getXnxq())
- .append("deptid", getDeptid())
- .append("activitytime", getActivitytime())
- .append("activityendtime", getActivityendtime())
- .append("stylecolor", getStylecolor())
- .append("createuserid", getCreateuserid())
- .append("createtime", getCreatetime())
- .toString();
+ .append("id", getId())
+ .append("name", getName())
+ .append("type", getType())
+ .append("classid", getClassid())
+ .append("xnxq", getXnxq())
+ .append("deptid", getDeptid())
+ .append("activitytime", getActivitytime())
+ .append("activityendtime", getActivityendtime())
+ .append("stylecolor", getStylecolor())
+ .append("createuserid", getCreateuserid())
+ .append("createtime", getCreatetime())
+ .append("byClass", getByClass())
+ .toString();
}
public Date getCreatetime() {
@@ -180,4 +185,12 @@ public class BySchoolcalendarClass extends BaseEntity
public void setCreatetime(Date createtime) {
this.createtime = createtime;
}
+
+ public ByClass getByClass() {
+ return byClass;
+ }
+
+ public void setByClass(ByClass byClass) {
+ this.byClass = byClass;
+ }
}
diff --git a/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarClassMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarClassMapper.xml
index 5a9658d7a..154ad45c2 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarClassMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarClassMapper.xml
@@ -16,6 +16,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="stylecolor" column="stylecolor" />
<result property="createuserid" column="createuserid" />
<result property="createtime" column="createtime" />
+ <association property="byClass" column="bjbh" javaType="ByClass" resultMap="ByClassResult" />
+ </resultMap>
+
+ <resultMap type="ByClass" id="ByClassResult">
+ <result property="bjbh" column="bjbh"/>
+ <result property="deptId" column="dept_id"/>
+ <result property="bjtype" column="bjtype"/>
+ <result property="bhxh" column="bhxh"/>
+ <result property="xn" column="xn"/>
+ <result property="bjmc" column="bjmc"/>
+ <result property="bjrych" column="bjrych"/>
+ <result property="jbny" column="jbny"/>
+ <result property="zbjs" column="zbjs"/>
+ <result property="zbjsxm" column="zbjsxm"/>
+ <result property="pbjs" column="pbjs"/>
+ <result property="pbjsxm" column="pbjsxm"/>
+ <result property="zljs" column="zljs"/>
+ <result property="zljsxm" column="zljsxm"/>
+ <result property="isdel" column="isdel"/>
+ <result property="createtime" column="createtime"/>
</resultMap>
<sql id="selectBySchoolcalendarClassVo">