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

见习之星考核

Browse Source
This commit is contained in:
paidaxing444 2020-09-01 11:21:45 +08:00
parent 7228cbbeac
commit c5adeedd72
3 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/domain/TsbzJxzxkhsh.java
View File

@ -4,6 +4,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.jxjs.domain.TsbzJxjsjbxx;
/**
* 考核审核过程对象 tsbz_jzxzkhsh
@ -79,6 +80,8 @@ public class TsbzJxzxkhsh extends BaseEntity {
@Excel(name = "创建人")
private Long createuseird;
private TsbzJxjsjbxx tsbzJxjsjbxx;
public void setId(Long id) {
this.id = id;
}
@ -167,6 +170,14 @@ public class TsbzJxzxkhsh extends BaseEntity {
return createuseird;
}
public TsbzJxjsjbxx getTsbzJxjsjbxx() {
return tsbzJxjsjbxx;
}
public void setTsbzJxjsjbxx(TsbzJxjsjbxx tsbzJxjsjbxx) {
this.tsbzJxjsjbxx = tsbzJxjsjbxx;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@ -182,6 +193,7 @@ public class TsbzJxzxkhsh extends BaseEntity {
.append("qjshjy", getQjshjy())
.append("createuseird", getCreateuseird())
.append("createTime", getCreateTime())
.append("tsbzJxjsjbxx", getTsbzJxjsjbxx())
.toString();
}
}

29
ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJxzxkhshMapper.xml
View File

@ -17,10 +17,37 @@
<result property="qjshjy" column="qjshjy"/>
<result property="createuseird" column="createuseird"/>
<result property="createTime" column="create_time"/>
<association property="tsbzJxjsjbxx" column="jsid" javaType="TsbzJxjsjbxx" resultMap="TsbzJxjsjbxxResult"/>
</resultMap>
<resultMap type="TsbzJxjsjbxx" id="TsbzJxjsjbxxResult">
<result property="id" column="id"/>
<result property="otherid" column="otherid"/>
<result property="name" column="name"/>
<result property="jxbh" column="jxbh"/>
<result property="xb" column="xb"/>
<result property="csrq" column="csrq"/>
<result property="email" column="email"/>
<result property="phone" column="phone"/>
<result property="yzbm" column="yzbm"/>
<result property="zzmm" column="zzmm"/>
<result property="mz" column="mz"/>
<result property="prdwid" column="prdwid"/>
<result property="prdwmc" column="prdwmc"/>
<result property="jdxid" column="jdxid"/>
<result property="rjxd" column="rjxd"/>
<result property="rjxk" column="rjxk"/>
<result property="rjnj" column="rjnj"/>
<result property="byyx" column="byyx"/>
<result property="xl" column="xl"/>
<result property="xw" column="xw"/>
<result property="sfsfs" column="sfsfs"/>
<result property="lqnf" column="lqnf"/>
<result property="createTime" column="create_time"/>
</resultMap>
<sql id="selectTsbzJxzxkhshVo">
select d.* from tsbz_jxzxmd a
select d.id,d.faid,d.jsid,d.status,d.xjshr,d.xjshyj,d.xjshjy,d.qjshr,d.qjshjy,d.qjshyj,d.createuseird,d.create_time,b.name from tsbz_jxzxmd a
left join tsbz_jxjsjbxx b on b.id=a.jsid
left join sys_dept c on b.prdwid=c.schoolid
left join tsbz_jxzxkhsh d on a.jsid=d.jsid

5
ruoyi-ui/src/views/jxzxkhgl/jxzxxxsh/index.vue
View File

@ -126,9 +126,9 @@
<el-table v-loading="loading" :data="jzxzkhshList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="编号" align="center" prop="id" />
<!-- <el-table-column label="编号" align="center" prop="id" /> -->
<el-table-column label="考核方案" align="center" prop="faid" />
<el-table-column label="教师" align="center" prop="jsid" />
<el-table-column label="教师" align="center" prop="tsbzJxjsjbxx.name" />
<el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
<el-table-column label="校级审核人" align="center" prop="xjshr" />
<el-table-column label="校级审核意见" align="center" prop="xjshyj" :formatter="xjshyjFormat" />
@ -298,6 +298,7 @@ export default {
getList() {
this.loading = true;
listJzxzkhsh(this.queryParams).then(response => {
console.log(response.rows);
this.jzxzkhshList = response.rows;
this.total = response.total;
this.loading = false;