Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

20200514-zlp-1

Browse Source 
有个冲突
This commit is contained in:
paidaxing444
2020-05-14 08:59:06 +08:00
parent 8564eeae7b
commit 0077611aa7
2 changed files with 50 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcalendarClass.java
View File

@ -1,6 +1,7 @@
package com.ruoyi.project.benyi.domain; package com.ruoyi.project.benyi.domain;
import com.fasterxml.jackson.annotation.JsonFormat; 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.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel; 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") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createtime; private Date createtime;
private ByClass byClass;
public void setId(Long id) public void setId(Long id)
@ -126,9 +129,14 @@ public class BySchoolcalendarClass extends BaseEntity
this.activitytime = activitytime; this.activitytime = activitytime;
} }
public Date getActivitytime()
{
return activitytime;
}
public void setActivityendtime(Date activityendtime) { public void setActivityendtime(Date activityendtime) {
this.activityendtime = activityendtime; this.activityendtime = activityendtime;
} }
public Date getActivityendtime() { public Date getActivityendtime() {
return activityendtime; return activityendtime;
} }
@ -136,14 +144,10 @@ public class BySchoolcalendarClass extends BaseEntity
public void setStylecolor(String stylecolor) { public void setStylecolor(String stylecolor) {
this.stylecolor = stylecolor; this.stylecolor = stylecolor;
} }
public String getStylecolor() { public String getStylecolor() {
return stylecolor; return stylecolor;
} }
public Date getActivitytime()
{
return activitytime;
}
public void setCreateuserid(Long createuserid) public void setCreateuserid(Long createuserid)
{ {
this.createuserid = createuserid; this.createuserid = createuserid;
@ -170,6 +174,7 @@ public class BySchoolcalendarClass extends BaseEntity
.append("stylecolor", getStylecolor()) .append("stylecolor", getStylecolor())
.append("createuserid", getCreateuserid()) .append("createuserid", getCreateuserid())
.append("createtime", getCreatetime()) .append("createtime", getCreatetime())
.append("byClass", getByClass())
.toString(); .toString();
} }
@ -180,4 +185,12 @@ public class BySchoolcalendarClass extends BaseEntity
public void setCreatetime(Date createtime) { public void setCreatetime(Date createtime) {
this.createtime = createtime; this.createtime = createtime;
} }
public ByClass getByClass() {
return byClass;
}
public void setByClass(ByClass byClass) {
this.byClass = byClass;
}
} }

20
ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarClassMapper.xml
View File

@ -16,6 +16,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="stylecolor" column="stylecolor" /> <result property="stylecolor" column="stylecolor" />
<result property="createuserid" column="createuserid" /> <result property="createuserid" column="createuserid" />
<result property="createtime" column="createtime" /> <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> </resultMap>
<sql id="selectBySchoolcalendarClassVo"> <sql id="selectBySchoolcalendarClassVo">