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

笔试、面试

Browse Source
This commit is contained in:
paidaxing444
2020-08-24 09:50:39 +08:00
parent 184b0fe675
commit 14e206c9ad
5 changed files with 439 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJdcxController.java
View File

@@ -66,10 +66,17 @@ public class TsbzJdcxController extends BaseController {
@Log(title = "基地区级审核", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(TsbzJdcx tsbzJdcx) {
// List<TsbzJdcx> list = tsbzJdcxService.selectTsbzJdcxList(tsbzJdcx);
List<TsbzJdcx> list = tsbzJdcxService.selectTsbzJdcxExport(tsbzJdcx);
ExcelUtil<TsbzJdcx> util = new ExcelUtil<TsbzJdcx>(TsbzJdcx.class);
return util.exportExcel(list, "笔试名单");
if (!schoolCommonController.isStringEmpty(tsbzJdcx.getQjshzt()) && tsbzJdcx.getQjshzt().equals("1")) {
// List<TsbzJdcx> list = tsbzJdcxService.selectTsbzJdcxList(tsbzJdcx);
List<TsbzJdcx> list = tsbzJdcxService.selectTsbzJdcxExport(tsbzJdcx);
ExcelUtil<TsbzJdcx> util = new ExcelUtil<TsbzJdcx>(TsbzJdcx.class);
return util.exportExcel(list, "笔试名单");
} else if (!schoolCommonController.isStringEmpty(tsbzJdcx.getMsqr()) && tsbzJdcx.getMsqr().equals("1")) {
List<TsbzJdcx> list = tsbzJdcxService.selectTsbzJdcxExport(tsbzJdcx);
ExcelUtil<TsbzJdcx> util = new ExcelUtil<TsbzJdcx>(TsbzJdcx.class);
return util.exportExcel(list, "面试名单");
}
return AjaxResult.error("未知错误，请联系系统开发人员");
}
/**
@@ -170,12 +177,11 @@ public class TsbzJdcxController extends BaseController {
@Log(title = "分数导入", businessType = BusinessType.IMPORT)
// @PreAuthorize("@ss.hasPermi('system:user:import')")
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file,Long faide) throws Exception
{
public AjaxResult importData(MultipartFile file, Long faide) throws Exception {
ExcelUtil<TsbzJdcx> util = new ExcelUtil<TsbzJdcx>(TsbzJdcx.class);
List<TsbzJdcx> tsbzJdcxList = util.importExcel(file.getInputStream());
int iCount = 0;
for (TsbzJdcx tsbzJdcx:tsbzJdcxList) {
for (TsbzJdcx tsbzJdcx : tsbzJdcxList) {
tsbzJdcx.setFaid(faide);
iCount = iCount + tsbzJdcxService.updateTsbzJdcxforjsfa(tsbzJdcx);
}
@@ -183,15 +189,21 @@ public class TsbzJdcxController extends BaseController {
// String operName = loginUser.getUsername();
// String message = userService.importUser(userList, updateSupport, operName);
//String message = faide;
return AjaxResult.success(String.valueOf(iCount),null);
return AjaxResult.success(String.valueOf(iCount), null);
}
@GetMapping("/importTemplate")
public AjaxResult importTemplate()
{
public AjaxResult importTemplate() {
// ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
ExcelUtil<TsbzJdcx> util = new ExcelUtil<TsbzJdcx>(TsbzJdcx.class);
return util.importTemplateExcel("成绩导入");
return util.importTemplateExcel("笔试成绩导入");
}
@GetMapping("/msimportTemplate")
public AjaxResult msimportTemplate() {
// ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
ExcelUtil<TsbzJdcx> util = new ExcelUtil<TsbzJdcx>(TsbzJdcx.class);
return util.importTemplateExcel("面试成绩导入");
}
}

395
ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJdcx.java
View File

@@ -2,6 +2,7 @@ package com.ruoyi.jxjs.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.enums.BusinessType;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -12,85 +13,106 @@ import com.ruoyi.common.core.domain.BaseEntity;
/**
* 基地区级审核对象 tsbz_jdcx
*
*
* @author ruoyi
* @date 2020-08-20
*/
public class TsbzJdcx extends BaseEntity
{
public class TsbzJdcx extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 编号 */
/**
* 编号
*/
private Long id;
/** 创建人 */
/**
* 创建人
*/
// @Excel(name = "创建人")
private Long createuserid;
/** 基地校审核人 */
/**
* 基地校审核人
*/
// @Excel(name = "基地校审核人")
private Long jdxshr;
/** 基地校审核状态 */
/**
* 基地校审核状态
*/
// @Excel(name = "基地校审核状态")
private String jdxshzt;
/** 上报理由 */
/**
* 上报理由
*/
// @Excel(name = "上报理由")
private String sbly;
/** 区级审核人 */
/**
* 区级审核人
*/
// @Excel(name = "区级审核人")
private Long qjshr;
/** 区级审核意见 */
/**
* 区级审核意见
*/
// @Excel(name = "区级审核意见")
private String qjshyj;
/** 基地排序 */
/**
* 基地排序
*/
// @Excel(name = "基地排序")
private Long jdpx;
/** 成绩导入创建时间 */
/**
* 成绩导入创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
// @Excel(name = "成绩导入创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cjdrcreateTime;
/** 面试确认 */
/**
* 面试确认
*/
// @Excel(name = "面试确认")
private String msqr;
/** 面试确认时间 */
/**
* 面试确认时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
// @Excel(name = "面试确认时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date msqrcreateTime;
/** 面试结果模拟课堂教学 */
// @Excel(name = "面试结果模拟课堂教学")
private BigDecimal msjgmnktjxdf;
/** 录取状态 */
/**
* 录取状态
*/
private String lqzt;
/** 当前状态 */
/**
* 当前状态
*/
// @Excel(name = "当前状态")
private String dqzt;
/** 方案编号 */
/**
* 方案编号
*/
// @Excel(name = "方案编号", type = Type.IMPORT)
private Long faid;
@Excel(name = "方案名称", type = Type.EXPORT)
private String faname;
/** 教师编号 */
/**
* 教师编号
*/
@Excel(name = "教师编号", type = Type.IMPORT)
private Long jsid;
@@ -98,7 +120,7 @@ public class TsbzJdcx extends BaseEntity
private String jdxmc;
@Excel(name = "教师姓名")
private String jsname;
@Excel(name = "性别", readConverterExp = "0=男,1=女,2=未知", type = Type.EXPORT)
@Excel(name = "性别", readConverterExp = "1=男,2=女,9=未知", type = Type.EXPORT)
private String xb;
@Excel(name = "学段", readConverterExp = "1=学前教育,2=小学,3=普通初中,4=普通高中", type = Type.EXPORT)
private String rjxd;
@@ -108,253 +130,289 @@ public class TsbzJdcx extends BaseEntity
private String phone;
@Excel(name = "聘任校", type = Type.EXPORT)
private String prdwmc;
/** 区级审核状态 */
/**
* 区级审核状态
*/
@Excel(name = "评审状态", type = Type.EXPORT)
private String qjshzt;
/** 案例分析得分 */
/**
* 案例分析得分
*/
@Excel(name = "案例分析得分", type = Type.IMPORT)
private BigDecimal alfxdf;
/** 教案设计得分 */
/**
* 教案设计得分
*/
@Excel(name = "教案设计得分", type = Type.IMPORT)
private BigDecimal jasjdf;
/** 钢笔字得分 */
/**
* 钢笔字得分
*/
@Excel(name = "钢笔字得分", type = Type.IMPORT)
private BigDecimal gbzdf;
/** 综合得分 */
@Excel(name = "综合得分", type = Type.IMPORT)
/**
* 笔试综合得分
*/
@Excel(name = "笔试综合得分", type = Type.IMPORT)
private BigDecimal zhdf;
/** 演讲得分 */
@Excel(name = "演讲得分", type = Type.IMPORT)
/**
* 面试结果模拟课堂教学
*/
@Excel(name = "面试结果模拟课堂教学", type = Type.IMPORT)
private BigDecimal msjgmnktjxdf;
/**
* 面试演讲得分
*/
@Excel(name = "面试演讲得分", type = Type.IMPORT)
private BigDecimal yjdf;
/** 综合得分2 */
@Excel(name = "综合得分2", type = Type.IMPORT)
/**
* 面试综合得分
*/
@Excel(name = "面试综合得分", type = Type.IMPORT)
private BigDecimal zhdf2;
public String getFaname() {
return faname;
}
public String getFaname() { return faname; }
public void setFaname(String faname) { this.faname = faname;}
public void setFaname(String faname) {
this.faname = faname;
}
public String getJdxmc() { return jdxmc; }
public void setJdxmc(String jdxmc) { this.jdxmc = jdxmc; }
public String getJdxmc() {
return jdxmc;
}
public String getJsname() { return jsname; }
public void setJsname(String jsname) { this.jsname = jsname; }
public void setJdxmc(String jdxmc) {
this.jdxmc = jdxmc;
}
public String getXb() { return xb; }
public void setXb(String xb) { this.xb = xb; }
public String getJsname() {
return jsname;
}
public String getRjxd() { return rjxd; }
public void setRjxd(String rjxd) { this.rjxd = rjxd; }
public void setJsname(String jsname) {
this.jsname = jsname;
}
public String getRjxk() { return rjxk; }
public void setRjxk(String rjxk) { this.rjxk = rjxk; }
public String getXb() {
return xb;
}
public String getPhone() { return phone; }
public void setPhone(String phone) { this.phone = phone; }
public void setXb(String xb) {
this.xb = xb;
}
public String getPrdwmc() { return prdwmc; }
public void setPrdwmc(String prdwmc) { this.prdwmc = prdwmc; }
public String getRjxd() {
return rjxd;
}
public void setId(Long id)
{
public void setRjxd(String rjxd) {
this.rjxd = rjxd;
}
public String getRjxk() {
return rjxk;
}
public void setRjxk(String rjxk) {
this.rjxk = rjxk;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getPrdwmc() {
return prdwmc;
}
public void setPrdwmc(String prdwmc) {
this.prdwmc = prdwmc;
}
public void setId(Long id) {
this.id = id;
}
public Long getId()
{
public Long getId() {
return id;
}
public void setFaid(Long faid)
{
public void setFaid(Long faid) {
this.faid = faid;
}
public Long getFaid()
{
public Long getFaid() {
return faid;
}
public void setJsid(Long jsid)
{
public void setJsid(Long jsid) {
this.jsid = jsid;
}
public Long getJsid()
{
public Long getJsid() {
return jsid;
}
public void setDqzt(String dqzt)
{
public void setDqzt(String dqzt) {
this.dqzt = dqzt;
}
public String getDqzt()
{
public String getDqzt() {
return dqzt;
}
public void setCreateuserid(Long createuserid)
{
public void setCreateuserid(Long createuserid) {
this.createuserid = createuserid;
}
public Long getCreateuserid()
{
public Long getCreateuserid() {
return createuserid;
}
public void setJdxshr(Long jdxshr)
{
public void setJdxshr(Long jdxshr) {
this.jdxshr = jdxshr;
}
public Long getJdxshr()
{
public Long getJdxshr() {
return jdxshr;
}
public void setJdxshzt(String jdxshzt)
{
public void setJdxshzt(String jdxshzt) {
this.jdxshzt = jdxshzt;
}
public String getJdxshzt()
{
public String getJdxshzt() {
return jdxshzt;
}
public void setSbly(String sbly)
{
public void setSbly(String sbly) {
this.sbly = sbly;
}
public String getSbly()
{
public String getSbly() {
return sbly;
}
public void setQjshr(Long qjshr)
{
public void setQjshr(Long qjshr) {
this.qjshr = qjshr;
}
public Long getQjshr()
{
public Long getQjshr() {
return qjshr;
}
public void setQjshzt(String qjshzt)
{
public void setQjshzt(String qjshzt) {
this.qjshzt = qjshzt;
}
public String getQjshzt()
{
public String getQjshzt() {
return qjshzt;
}
public void setQjshyj(String qjshyj)
{
public void setQjshyj(String qjshyj) {
this.qjshyj = qjshyj;
}
public String getQjshyj()
{
public String getQjshyj() {
return qjshyj;
}
public void setJdpx(Long jdpx)
{
public void setJdpx(Long jdpx) {
this.jdpx = jdpx;
}
public Long getJdpx()
{
public Long getJdpx() {
return jdpx;
}
public void setAlfxdf(BigDecimal alfxdf)
{
public void setAlfxdf(BigDecimal alfxdf) {
this.alfxdf = alfxdf;
}
public BigDecimal getAlfxdf()
{
public BigDecimal getAlfxdf() {
return alfxdf;
}
public void setJasjdf(BigDecimal jasjdf)
{
public void setJasjdf(BigDecimal jasjdf) {
this.jasjdf = jasjdf;
}
public BigDecimal getJasjdf()
{
public BigDecimal getJasjdf() {
return jasjdf;
}
public void setGbzdf(BigDecimal gbzdf)
{
public void setGbzdf(BigDecimal gbzdf) {
this.gbzdf = gbzdf;
}
public BigDecimal getGbzdf()
{
public BigDecimal getGbzdf() {
return gbzdf;
}
public void setZhdf(BigDecimal zhdf)
{
public void setZhdf(BigDecimal zhdf) {
this.zhdf = zhdf;
}
public BigDecimal getZhdf()
{
public BigDecimal getZhdf() {
return zhdf;
}
public void setCjdrcreateTime(Date cjdrcreateTime)
{
public void setCjdrcreateTime(Date cjdrcreateTime) {
this.cjdrcreateTime = cjdrcreateTime;
}
public Date getCjdrcreateTime()
{
public Date getCjdrcreateTime() {
return cjdrcreateTime;
}
public void setMsqr(String msqr)
{
public void setMsqr(String msqr) {
this.msqr = msqr;
}
public String getMsqr()
{
public String getMsqr() {
return msqr;
}
public void setMsqrcreateTime(Date msqrcreateTime)
{
public void setMsqrcreateTime(Date msqrcreateTime) {
this.msqrcreateTime = msqrcreateTime;
}
public Date getMsqrcreateTime()
{
public Date getMsqrcreateTime() {
return msqrcreateTime;
}
public void setMsjgmnktjxdf(BigDecimal msjgmnktjxdf)
{
public void setMsjgmnktjxdf(BigDecimal msjgmnktjxdf) {
this.msjgmnktjxdf = msjgmnktjxdf;
}
public BigDecimal getMsjgmnktjxdf()
{
public BigDecimal getMsjgmnktjxdf() {
return msjgmnktjxdf;
}
public void setYjdf(BigDecimal yjdf)
{
public void setYjdf(BigDecimal yjdf) {
this.yjdf = yjdf;
}
public BigDecimal getYjdf()
{
public BigDecimal getYjdf() {
return yjdf;
}
public void setZhdf2(BigDecimal zhdf2)
{
public void setZhdf2(BigDecimal zhdf2) {
this.zhdf2 = zhdf2;
}
public BigDecimal getZhdf2()
{
public BigDecimal getZhdf2() {
return zhdf2;
}
public void setLqzt(String lqzt) {
this.lqzt = lqzt;
}
@@ -362,34 +420,35 @@ public class TsbzJdcx extends BaseEntity
public String getLqzt() {
return lqzt;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("faid", getFaid())
.append("jsid", getJsid())
.append("dqzt", getDqzt())
.append("createuserid", getCreateuserid())
.append("createTime", getCreateTime())
.append("jdxshr", getJdxshr())
.append("jdxshzt", getJdxshzt())
.append("sbly", getSbly())
.append("qjshr", getQjshr())
.append("qjshzt", getQjshzt())
.append("qjshyj", getQjshyj())
.append("jdpx", getJdpx())
.append("alfxdf", getAlfxdf())
.append("jasjdf", getJasjdf())
.append("gbzdf", getGbzdf())
.append("zhdf", getZhdf())
.append("cjdrcreateTime", getCjdrcreateTime())
.append("msqr", getMsqr())
.append("msqrcreateTime", getMsqrcreateTime())
.append("msjgmnktjxdf", getMsjgmnktjxdf())
.append("yjdf", getYjdf())
.append("zhdf2", getZhdf2())
.append("lqzt", getLqzt()
)
.toString();
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("faid", getFaid())
.append("jsid", getJsid())
.append("dqzt", getDqzt())
.append("createuserid", getCreateuserid())
.append("createTime", getCreateTime())
.append("jdxshr", getJdxshr())
.append("jdxshzt", getJdxshzt())
.append("sbly", getSbly())
.append("qjshr", getQjshr())
.append("qjshzt", getQjshzt())
.append("qjshyj", getQjshyj())
.append("jdpx", getJdpx())
.append("alfxdf", getAlfxdf())
.append("jasjdf", getJasjdf())
.append("gbzdf", getGbzdf())
.append("zhdf", getZhdf())
.append("cjdrcreateTime", getCjdrcreateTime())
.append("msqr", getMsqr())
.append("msqrcreateTime", getMsqrcreateTime())
.append("msjgmnktjxdf", getMsjgmnktjxdf())
.append("yjdf", getYjdf())
.append("zhdf2", getZhdf2())
.append("lqzt", getLqzt()
)
.toString();
}
}

15
ruoyi-system/src/main/resources/mapper/jxjs/TsbzJdcxMapper.xml
View File

@@ -164,29 +164,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<select id="selectTsbzJdcxExport" parameterType="TsbzJdcx" resultMap="TsbzJdcxResult">
select a.id, a.faid, a.jsid, a.dqzt, a.createuserid, a.create_time, a.jdxshr, a.jdxshzt, a.sbly, a.qjshr, a.qjshzt, a.qjshyj, a.jdpx, a.alfxdf, a.jasjdf, a.gbzdf, a.zhdf, a.cjdrcreate_time, a.msqr, a.msqrcreate_time, a.msjgmnktjxdf, a.yjdf, a.zhdf2, c.name as faname, d.jdxmc,b.name as jsname,b.xb,b.rjxd,b.rjxk,b.phone,b.prdwmc from tsbz_jdcx a LEFT JOIN tsbz_jxjsjbxx b ON a.jsid=b.id LEFT JOIN tsbz_jxzxpxfa c ON a.faid=c.id LEFT JOIN tsbz_jdx d ON b.jdxid=d.id
select a.id, a.faid, a.jsid, a.dqzt, a.createuserid, a.create_time, a.jdxshr, a.jdxshzt, a.sbly, a.qjshr, a.qjshzt, a.qjshyj, a.jdpx, a.alfxdf, a.jasjdf, a.gbzdf, a.zhdf, a.cjdrcreate_time, a.msqr, a.msqrcreate_time, a.msjgmnktjxdf, a.yjdf, a.zhdf2,a.lqzt, c.name as faname, d.jdxmc,b.name as jsname,b.xb,b.rjxd,b.rjxk,b.phone,b.prdwmc from tsbz_jdcx a LEFT JOIN tsbz_jxjsjbxx b ON a.jsid=b.id LEFT JOIN tsbz_jxzxpxfa c ON a.faid=c.id LEFT JOIN tsbz_jdx d ON b.jdxid=d.id
<where>
<if test="faid != null "> and a.faid = #{faid}</if>
<if test="jsid != null "> and a.jsid = #{jsid}</if>
<if test="dqzt != null and a.dqzt != ''"> and a.dqzt = #{dqzt}</if>
<if test="dqzt != null and dqzt != ''"> and a.dqzt = #{dqzt}</if>
<if test="createuserid != null "> and a.createuserid = #{createuserid}</if>
<if test="jdxshr != null "> and a.jdxshr = #{jdxshr}</if>
<if test="jdxshzt != null and a.jdxshzt != ''"> and a.jdxshzt = #{jdxshzt}</if>
<if test="sbly != null and a.sbly != ''"> and a.sbly = #{sbly}</if>
<if test="jdxshzt != null and jdxshzt != ''"> and a.jdxshzt = #{jdxshzt}</if>
<if test="sbly != null and sbly != ''"> and a.sbly = #{sbly}</if>
<if test="qjshr != null "> and a.qjshr = #{qjshr}</if>
<if test="qjshzt != null and a.qjshzt != ''"> and a.qjshzt = #{qjshzt}</if>
<if test="qjshyj != null and a.qjshyj != ''"> and a.qjshyj = #{qjshyj}</if>
<if test="qjshzt != null and qjshzt != ''"> and a.qjshzt = #{qjshzt}</if>
<if test="qjshyj != null and qjshyj != ''"> and a.qjshyj = #{qjshyj}</if>
<if test="jdpx != null "> and a.jdpx = #{jdpx}</if>
<if test="alfxdf != null "> and a.alfxdf = #{alfxdf}</if>
<if test="jasjdf != null "> and a.jasjdf = #{jasjdf}</if>
<if test="gbzdf != null "> and a.gbzdf = #{gbzdf}</if>
<if test="zhdf != null "> and a.zhdf = #{zhdf}</if>
<if test="cjdrcreateTime != null "> and a.cjdrcreate_time = #{cjdrcreateTime}</if>
<if test="msqr != null and a.msqr != ''"> and a.msqr = #{msqr}</if>
<if test="msqr != null and msqr != ''"> and a.msqr = #{msqr}</if>
<if test="msqrcreateTime != null "> and a.msqrcreate_time = #{msqrcreateTime}</if>
<if test="msjgmnktjxdf != null "> and a.msjgmnktjxdf = #{msjgmnktjxdf}</if>
<if test="yjdf != null "> and a.yjdf = #{yjdf}</if>
<if test="zhdf2 != null "> and a.zhdf2 = #{zhdf2}</if>
<if test="lqzt != null and lqzt != ''"> and lqzt = #{lqzt}</if>
</where>
</select>
<update id="updateTsbzJdcxforjsfa" parameterType="TsbzJdcx">

304
ruoyi-ui/src/views/jxjs/bsmd/index.vue
View File

@@ -12,9 +12,9 @@
<el-option v-for="dict in faOptions" :key="dict.id" :label="dict.name" :value="dict.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="基地校" prop="faid">
<el-select v-model="queryParams.faid" placeholder="请选择基地校">
<el-option v-for="dict in faOptions" :key="dict.id" :label="dict.name" :value="dict.id"></el-option>
<el-form-item label="基地校" prop="jdxid">
<el-select v-model="queryParams.jdxid" filterable placeholder="请选择基地校">
<el-option v-for="item in jdxOptions" :key="item.id" :label="item.jdxmc" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="选择教师" prop="jsid">
@@ -33,6 +33,16 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="success"
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['jxjs:jdcx:edit']"
>确认面试</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="info"
@@ -55,62 +65,29 @@
</el-row>
<el-table v-loading="loading" :data="jdcxList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="selection" width="55" align="center" :selectable="isShow" />
<el-table-column label="方案名称" align="center" prop="faname" />
<el-table-column label="基地校" align="center" prop="jdxmc" />
<el-table-column label="教师姓名" align="center" prop="jsname" />
<el-table-column label="区级审核意见" align="center" prop="qjshzt" :formatter="qjshztFormat" />
<el-table-column label="性别" align="center" prop="xb" :formatter="xbFormat" />
<el-table-column label="学段" align="center" prop="rjxd" :formatter="xdFormat" />
<el-table-column label="学科" align="center" prop="rjxk" :formatter="xkFormat" />
<el-table-column label="联系方式" align="center" prop="phone" />
<el-table-column label="聘任校" align="center" prop="prdwmc" />
<el-table-column label="评审状态" align="center" prop="qjshzt" :formatter="qjshztFormat" />
<!-- <el-table-column label="编号" align="center" prop="id" />
<el-table-column label="方案名称" align="center" prop="faid" :formatter="faFormat" />
<el-table-column label="教师姓名" align="center" prop="jsid" />
<el-table-column label="当前状态" align="center" prop="dqzt" :formatter="dqztFormat" />
<el-table-column label="基地校审核状态" align="center" prop="jdxshzt" :formatter="jdxshztFormat" />
<el-table-column label="区级审核状态" align="center" prop="qjshzt" :formatter="qjshztFormat" />
<el-table-column label="区级审核意见" align="center" prop="qjshyj" :formatter="qjshyjFormat" />
<el-table-column label="综合得分" align="center" prop="zhdf" /> -->
<!-- <el-table-column label="综合得分2" align="center" prop="zhdf2" /> -->
<!-- <el-table-column label="创建人" align="center" prop="createuserid" />
<el-table-column label="基地校审核人" align="center" prop="jdxshr" />
<el-table-column label="上报理由" align="center" prop="sbly" />
<el-table-column label="区级审核人" align="center" prop="qjshr" />
<el-table-column label="基地排序" align="center" prop="jdpx" />
<el-table-column label="案例分析得分" align="center" prop="alfxdf" />
<el-table-column label="教案设计得分" align="center" prop="jasjdf" />
<el-table-column label="钢笔字得分" align="center" prop="gbzdf" />
<el-table-column label="成绩导入创建时间" align="center" prop="cjdrcreateTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.cjdrcreateTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="面试确认" align="center" prop="msqr" />
<el-table-column label="面试确认时间" align="center" prop="msqrcreateTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.msqrcreateTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="面试结果模拟课堂教学" align="center" prop="msjgmnktjxdf" />
<el-table-column label="演讲得分" align="center" prop="yjdf" />-->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-view"
@click="handleDelete(scope.row)"
v-hasPermi="['jxjs:jdcx:view']"
>详情</el-button>
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['jxjs:jdcx:edit']"
v-show="isShow(scope.row)"
>确认面试</el-button>
</template>
</el-table-column> -->
</el-table-column>
</el-table>
<pagination
@@ -124,112 +101,14 @@
<!-- 添加或修改基地区级审核对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="方案编号" prop="faid">
<el-input v-model="form.faid" placeholder="请输入方案编号" />
</el-form-item>
<el-form-item label="教师编号" prop="jsid">
<el-input v-model="form.jsid" placeholder="请输入教师编号" />
</el-form-item>
<el-form-item label="当前状态" prop="dqzt">
<el-select v-model="form.dqzt" placeholder="请选择当前状态">
<el-option
v-for="dict in dqztOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="创建人" prop="createuserid">
<el-input v-model="form.createuserid" placeholder="请输入创建人" />
</el-form-item>
<el-form-item label="基地校审核人" prop="jdxshr">
<el-input v-model="form.jdxshr" placeholder="请输入基地校审核人" />
</el-form-item>
<el-form-item label="基地校审核状态" prop="jdxshzt">
<el-select v-model="form.jdxshzt" placeholder="请选择基地校审核状态">
<el-option
v-for="dict in jdxshztOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="上报理由" prop="sbly">
<el-input v-model="form.sbly" placeholder="请输入上报理由" />
</el-form-item>
<el-form-item label="区级审核人" prop="qjshr">
<el-input v-model="form.qjshr" placeholder="请输入区级审核人" />
</el-form-item>
<el-form-item label="区级审核状态" prop="qjshzt">
<el-select v-model="form.qjshzt" placeholder="请选择区级审核状态">
<el-option
v-for="dict in qjshztOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="区级审核意见" prop="qjshyj">
<el-select v-model="form.qjshyj" placeholder="请选择区级审核意见">
<el-option
v-for="dict in qjshyjOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="基地排序" prop="jdpx">
<el-input v-model="form.jdpx" placeholder="请输入基地排序" />
</el-form-item>
<el-form-item label="案例分析得分" prop="alfxdf">
<el-input v-model="form.alfxdf" placeholder="请输入案例分析得分" />
</el-form-item>
<el-form-item label="教案设计得分" prop="jasjdf">
<el-input v-model="form.jasjdf" placeholder="请输入教案设计得分" />
</el-form-item>
<el-form-item label="钢笔字得分" prop="gbzdf">
<el-input v-model="form.gbzdf" placeholder="请输入钢笔字得分" />
</el-form-item>
<el-form-item label="综合得分" prop="zhdf">
<el-input v-model="form.zhdf" placeholder="请输入综合得分" />
</el-form-item>
<el-form-item label="成绩导入创建时间" prop="cjdrcreateTime">
<el-date-picker
clearable
size="small"
style="width: 200px"
v-model="form.cjdrcreateTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择成绩导入创建时间"
></el-date-picker>
</el-form-item>
<el-form-item label="面试确认" prop="msqr">
<el-input v-model="form.msqr" placeholder="请输入面试确认" />
</el-form-item>
<el-form-item label="面试确认时间" prop="msqrcreateTime">
<el-date-picker
clearable
size="small"
style="width: 200px"
v-model="form.msqrcreateTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择面试确认时间"
></el-date-picker>
</el-form-item>
<el-form-item label="面试结果模拟课堂教学" prop="msjgmnktjxdf">
<el-input v-model="form.msjgmnktjxdf" placeholder="请输入面试结果模拟课堂教学" />
</el-form-item>
<el-form-item label="演讲得分" prop="yjdf">
<el-input v-model="form.yjdf" placeholder="请输入演讲得分" />
</el-form-item>
<el-form-item label="综合得分2" prop="zhdf2">
<el-input v-model="form.zhdf2" placeholder="请输入综合得分2" />
<el-radio-group v-model="form.msqr">
<el-radio
v-for="dict in msqrOptions"
:key="dict.dictValue"
:label="dict.dictValue"
>{{dict.dictLabel}}</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -240,7 +119,18 @@
<!-- excel导入对话框lu -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-link type="info" style="font-size:14px" @click="importTemplate">下载模板</el-link>
<el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?faide=' + upload.faide" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
<el-upload
ref="upload"
:limit="1"
accept=".xlsx, .xls"
:headers="upload.headers"
:action="upload.url + '?faide=' + upload.faide"
:disabled="upload.isUploading"
:on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess"
:auto-upload="false"
drag
>
<i class="el-icon-upload"></i>
<div class="el-upload__text">
将文件拖到此处，或
@@ -248,13 +138,12 @@
</div>
<div class="el-upload__tip" slot="tip">
<!-- <el-form-item label="评选方案" prop="faid"> -->
<el-select v-model="upload.faide" placeholder="请选择方案">
<el-option v-for="dict in faOptions" :key="dict.id" :label="dict.name" :value="dict.id"></el-option>
</el-select>
<br/>
<el-select v-model="upload.faide" placeholder="请选择方案">
<el-option v-for="dict in faOptions" :key="dict.id" :label="dict.name" :value="dict.id"></el-option>
</el-select>
<br />
<!-- </el-form-item> -->
<!-- <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据 -->
</div>
<div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
</el-upload>
@@ -279,6 +168,7 @@ import {
import { getToken } from "@/utils/auth";
import { listJxzxpxfa } from "@/api/jxjs/jxzxpxfa";
import { listJdx } from "@/api/jxjs/jdx";
export default {
name: "Jdcx",
@@ -304,12 +194,8 @@ export default {
open: false,
// 当前状态字典
dqztOptions: [],
// 基地校审核状态字典
jdxshztOptions: [],
// 区级审核状态字典
qjshztOptions: [],
// 区级审核意见字典
qjshyjOptions: [],
// 性别
xbOptions: [],
// 学段
@@ -318,6 +204,10 @@ export default {
xkOptions: [],
//方案
faOptions: [],
//字典
msqrOptions: [],
//基地校
jdxOptions: [],
// 用户导入参数lu
upload: {
// 是否显示弹出层（用户导入）
@@ -347,7 +237,7 @@ export default {
jdxshzt: null,
sbly: null,
qjshr: null,
qjshzt: null,
qjshzt: "1",
qjshyj: null,
jdpx: null,
alfxdf: null,
@@ -369,51 +259,24 @@ export default {
form: {},
// 表单校验
rules: {
faid: [
{ required: true, message: "方案编号不能为空", trigger: "blur" },
],
jsid: [
{ required: true, message: "教师编号不能为空", trigger: "blur" },
],
dqzt: [
{ required: true, message: "当前状态不能为空", trigger: "blur" },
],
jdxshzt: [
{
required: true,
message: "基地校审核状态不能为空",
trigger: "blur",
},
],
qjshzt: [
{ required: true, message: "区级审核状态不能为空", trigger: "blur" },
],
qjshyj: [
{ required: true, message: "区级审核意见不能为空", trigger: "blur" },
],
zhdf: [
{ required: true, message: "综合得分不能为空", trigger: "blur" },
],
zhdf2: [
{ required: true, message: "综合得分2不能为空", trigger: "blur" },
msqr: [
{ required: true, message: "面试确认不能为空", trigger: "blur" },
],
},
};
},
created() {
this.getFaList();
this.getJdxList();
this.getList();
this.getDicts("sys_dm_msqr").then((response) => {
this.msqrOptions = response.data;
});
this.getDicts("sys_dm_shzt").then((response) => {
this.dqztOptions = response.data;
});
this.getDicts("sys_dm_shzt").then((response) => {
this.jdxshztOptions = response.data;
});
this.getDicts("sys_dm_shzt").then((response) => {
this.qjshztOptions = response.data;
});
this.getDicts("sys_dm_shyj").then((response) => {
this.qjshyjOptions = response.data;
this.qjshztOptions = response.data;
});
this.getDicts("sys_user_sex").then((response) => {
this.xbOptions = response.data;
@@ -426,6 +289,18 @@ export default {
});
},
methods: {
getJdxList() {
listJdx(null).then((response) => {
this.jdxOptions = response.rows;
});
},
isShow(row) {
if (row.msqr == "1") {
return false;
} else {
return true;
}
},
// 字典翻译
faFormat(row, column) {
// return this.selectDictLabel(this.classOptions, row.classid);
@@ -459,18 +334,10 @@ export default {
dqztFormat(row, column) {
return this.selectDictLabel(this.dqztOptions, row.dqzt);
},
// 基地校审核状态字典翻译
jdxshztFormat(row, column) {
return this.selectDictLabel(this.jdxshztOptions, row.jdxshzt);
},
// 区级审核状态字典翻译
qjshztFormat(row, column) {
return this.selectDictLabel(this.qjshztOptions, row.qjshzt);
},
// 区级审核意见字典翻译
qjshyjFormat(row, column) {
return this.selectDictLabel(this.qjshyjOptions, row.qjshyj);
},
// 性别字典翻译
xbFormat(row, column) {
return this.selectDictLabel(this.xbOptions, row.xb);
@@ -533,12 +400,6 @@ export default {
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加基地区级审核";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
@@ -546,7 +407,7 @@ export default {
getJdcx(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改基地区级审核";
this.title = "面试确认";
});
},
/** 提交按钮 */
@@ -561,14 +422,6 @@ export default {
this.getList();
}
});
} else {
addJdcx(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
}
});
}
}
});
@@ -597,7 +450,7 @@ export default {
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm("是否确认导出所有基地区级审核数据项?", "警告", {
this.$confirm("是否确认导出所有笔试名单数据项?", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
@@ -630,17 +483,20 @@ export default {
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
this.$alert("成功导入："+response.msg+"条数据。", "导入结果", { dangerouslyUseHTMLString: true });
this.$alert("成功导入：" + response.msg + "条数据。", "导入结果", {
dangerouslyUseHTMLString: true,
});
this.getList();
},
// 提交上传文件
submitFileForm() {
if(this.upload.faide==""){
this.$alert("请选择方案", "导入结果", { dangerouslyUseHTMLString: true });
}else{
if (this.upload.faide == "") {
this.$alert("请选择方案", "导入结果", {
dangerouslyUseHTMLString: true,
});
} else {
this.$refs.upload.submit();
}
},
},
};

108
ruoyi-ui/src/views/jxjs/msqr/index.vue
View File

@@ -22,7 +22,7 @@
<el-option
v-for="item in lqztOptions"
:key="item.dictValue"
:label="item.dictLable"
:label="item.dictLabel"
:value="item.dictValue"
></el-option>
</el-select>
@@ -42,7 +42,7 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['jxjs:jdcx:edit']"
>确认</el-button>
>确认录取</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@@ -92,7 +92,7 @@
@click="handleUpdate(scope.row)"
v-hasPermi="['jxjs:jdcx:edit']"
v-show="isShow(scope.row)"
>确认</el-button>
>确认录取</el-button>
</template>
</el-table-column>
</el-table>
@@ -124,15 +124,57 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- excel导入对话框lu -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-link type="info" style="font-size:14px" @click="importTemplate">下载模板</el-link>
<el-upload
ref="upload"
:limit="1"
accept=".xlsx, .xls"
:headers="upload.headers"
:action="upload.url + '?faide=' + upload.faide"
:disabled="upload.isUploading"
:on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess"
:auto-upload="false"
drag
>
<i class="el-icon-upload"></i>
<div class="el-upload__text">
将文件拖到此处，或
<em>点击上传</em>
</div>
<div class="el-upload__tip" slot="tip">
<!-- <el-form-item label="评选方案" prop="faid"> -->
<el-select v-model="upload.faide" placeholder="请选择方案">
<el-option v-for="dict in faOptions" :key="dict.id" :label="dict.name" :value="dict.id"></el-option>
</el-select>
<br />
<!-- </el-form-item> -->
<!-- <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据 -->
</div>
<div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
</el-upload>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitFileForm">确 定</el-button>
<el-button @click="upload.open = false">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listJdcx, getJdcx, updateJdcx, exportJdcx } from "@/api/jxjs/jdcx";
import {
listJdcx,
getJdcx,
updateJdcx,
exportJdcx,
importTemplate,
} from "@/api/jxjs/jdcx";
import { listJxzxpxfa } from "@/api/jxjs/jxzxpxfa";
import { listJxjsjbxx, getJxjsjbxx } from "@/api/jxjs/jxjsjbxx";
import { getToken } from "@/utils/auth";
export default {
name: "Jdcx",
@@ -166,6 +208,23 @@ export default {
faOptions: [],
//教师
jsOptions: [],
// 用户导入参数lu
upload: {
// 是否显示弹出层（用户导入）
open: false,
// 弹出层标题（用户导入）
title: "",
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的用户数据
updateSupport: 0,
//方案id
faide: "",
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
url: process.env.VUE_APP_BASE_API + "/jxjs/jdcx/importData",
},
// 查询参数
queryParams: {
pageNum: 1,
@@ -370,7 +429,7 @@ export default {
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm("是否确认导出所有基地区级审核数据项?", "警告", {
this.$confirm("是否确认导出所有面试名单数据项?", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
@@ -383,6 +442,41 @@ export default {
})
.catch(function () {});
},
/** 导入按钮操作 */
handleImport() {
this.upload.title = "成绩导入";
this.upload.open = true;
},
/** 下载模板操作 */
importTemplate() {
importTemplate().then((response) => {
this.download(response.msg);
});
},
// 文件上传中处理
handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true;
},
// 文件上传成功处理
handleFileSuccess(response, file, fileList) {
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
this.$alert("成功导入：" + response.msg + "条数据。", "导入结果", {
dangerouslyUseHTMLString: true,
});
this.getList();
},
// 提交上传文件
submitFileForm() {
if (this.upload.faide == "") {
this.$alert("请选择方案", "导入结果", {
dangerouslyUseHTMLString: true,
});
} else {
this.$refs.upload.submit();
}
},
},
};
</script>