diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJdcxController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJdcxController.java
index 01025beef..af6f8c856 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJdcxController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJdcxController.java
@@ -1,8 +1,12 @@
package com.ruoyi.web.controller.jxjs;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.jxjs.domain.TsbzJxzxmd;
+import com.ruoyi.jxjs.service.ITsbzJxzxmdService;
import com.ruoyi.web.controller.common.SchoolCommonController;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +40,8 @@ public class TsbzJdcxController extends BaseController {
private ITsbzJdcxService tsbzJdcxService;
@Autowired
private SchoolCommonController schoolCommonController;
+ @Autowired
+ private ITsbzJxzxmdService tsbzJxzxmdService;
/**
* 查询基地区级审核列表
@@ -100,7 +106,27 @@ public class TsbzJdcxController extends BaseController {
@Log(title = "基地区级审核", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TsbzJdcx tsbzJdcx) {
- tsbzJdcx.setQjshr(SecurityUtils.getLoginUser().getUser().getUserId());
+
+ //区级审核人
+ if (tsbzJdcx.getQjshr() != null && tsbzJdcx.getQjshr().equals(2)) {
+ tsbzJdcx.setQjshr(SecurityUtils.getLoginUser().getUser().getUserId());
+ }
+
+ //如果lqzt为1，则代表录取成功，则在见习名单表插入一条记录
+ if (tsbzJdcx.getLqzt().equals("1")) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
+ Date date = new Date();
+ System.out.println("year=" + sdf.format(date));
+
+ TsbzJxzxmd tsbzJxzxmd = new TsbzJxzxmd();
+
+ tsbzJxzxmd.setJsid(tsbzJdcx.getJsid());
+ tsbzJxzxmd.setNf(sdf.format(date));
+ tsbzJxzxmd.setCreateuserid(SecurityUtils.getLoginUser().getUser().getUserId());
+
+ tsbzJxzxmdService.insertTsbzJxzxmd(tsbzJxzxmd);
+ }
+
return toAjax(tsbzJdcxService.updateTsbzJdcx(tsbzJdcx));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJxzxmdController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJxzxmdController.java
new file mode 100644
index 000000000..05a4ffade
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJxzxmdController.java
@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.jxjs;
+
+import java.util.List;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.jxjs.domain.TsbzJxzxmd;
+import com.ruoyi.jxjs.service.ITsbzJxzxmdService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 见习之星名单Controller
+ *
+ * @author ruoyi
+ * @date 2020-08-23
+ */
+@RestController
+@RequestMapping("/jxjs/jxzxmd")
+public class TsbzJxzxmdController extends BaseController {
+ @Autowired
+ private ITsbzJxzxmdService tsbzJxzxmdService;
+
+ /**
+ * 查询见习之星名单列表
+ */
+ @PreAuthorize("@ss.hasPermi('jxjs:jxzxmd:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(TsbzJxzxmd tsbzJxzxmd) {
+ startPage();
+ List<TsbzJxzxmd> list = tsbzJxzxmdService.selectTsbzJxzxmdList(tsbzJxzxmd);
+ return getDataTable(list);
+ }
+
+ /**
+ * 导出见习之星名单列表
+ */
+ @PreAuthorize("@ss.hasPermi('jxjs:jxzxmd:export')")
+ @Log(title = "见习之星名单", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
+ public AjaxResult export(TsbzJxzxmd tsbzJxzxmd) {
+ List<TsbzJxzxmd> list = tsbzJxzxmdService.selectTsbzJxzxmdList(tsbzJxzxmd);
+ ExcelUtil<TsbzJxzxmd> util = new ExcelUtil<TsbzJxzxmd>(TsbzJxzxmd.class);
+ return util.exportExcel(list, "jxzxmd");
+ }
+
+ /**
+ * 获取见习之星名单详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('jxjs:jxzxmd:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return AjaxResult.success(tsbzJxzxmdService.selectTsbzJxzxmdById(id));
+ }
+
+ /**
+ * 新增见习之星名单
+ */
+ @PreAuthorize("@ss.hasPermi('jxjs:jxzxmd:add')")
+ @Log(title = "见习之星名单", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody TsbzJxzxmd tsbzJxzxmd) {
+ return toAjax(tsbzJxzxmdService.insertTsbzJxzxmd(tsbzJxzxmd));
+ }
+
+ /**
+ * 修改见习之星名单
+ */
+ @PreAuthorize("@ss.hasPermi('jxjs:jxzxmd:edit')")
+ @Log(title = "见习之星名单", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody TsbzJxzxmd tsbzJxzxmd) {
+ return toAjax(tsbzJxzxmdService.updateTsbzJxzxmd(tsbzJxzxmd));
+ }
+
+ /**
+ * 删除见习之星名单
+ */
+ @PreAuthorize("@ss.hasPermi('jxjs:jxzxmd:remove')")
+ @Log(title = "见习之星名单", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(tsbzJxzxmdService.deleteTsbzJxzxmdByIds(ids));
+ }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJdcx.java b/ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJdcx.java
index 5a597095d..5fcfeb2d9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJdcx.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJdcx.java
@@ -2,6 +2,7 @@ package com.ruoyi.jxjs.domain;
import java.math.BigDecimal;
import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -10,328 +11,363 @@ 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 faid;
- /** 教师编号 */
+ /**
+ * 教师编号
+ */
@Excel(name = "教师编号")
private Long jsid;
- /** 当前状态 */
+ /**
+ * 当前状态
+ */
@Excel(name = "当前状态")
private String dqzt;
- /** 创建人 */
+ /**
+ * 创建人
+ */
@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 qjshzt;
- /** 区级审核意见 */
+ /**
+ * 区级审核意见
+ */
@Excel(name = "区级审核意见")
private String qjshyj;
- /** 基地排序 */
+ /**
+ * 基地排序
+ */
@Excel(name = "基地排序")
private Long jdpx;
- /** 案例分析得分 */
+ /**
+ * 案例分析得分
+ */
@Excel(name = "案例分析得分")
private BigDecimal alfxdf;
- /** 教案设计得分 */
+ /**
+ * 教案设计得分
+ */
@Excel(name = "教案设计得分")
private BigDecimal jasjdf;
- /** 钢笔字得分 */
+ /**
+ * 钢笔字得分
+ */
@Excel(name = "钢笔字得分")
private BigDecimal gbzdf;
- /** 综合得分 */
+ /**
+ * 综合得分
+ */
@Excel(name = "综合得分")
private BigDecimal zhdf;
- /** 成绩导入创建时间 */
+ /**
+ * 成绩导入创建时间
+ */
@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;
- /** 演讲得分 */
+ /**
+ * 演讲得分
+ */
@Excel(name = "演讲得分")
private BigDecimal yjdf;
- /** 综合得分2 */
+ /**
+ * 综合得分2
+ */
@Excel(name = "综合得分2")
private BigDecimal zhdf2;
- public void setId(Long id)
- {
+ /**
+ * 录取状态
+ */
+ @Excel(name = "录取状态")
+ private String lqzt;
+
+ 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;
+ }
+
+ 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())
- .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();
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJxzxmd.java b/ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJxzxmd.java
new file mode 100644
index 000000000..0e180693d
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJxzxmd.java
@@ -0,0 +1,82 @@
+package com.ruoyi.jxjs.domain;
+
+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;
+
+/**
+ * 见习之星名单对象 tsbz_jxzxmd
+ *
+ * @author ruoyi
+ * @date 2020-08-23
+ */
+public class TsbzJxzxmd extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 编号
+ */
+ private Long id;
+
+ /**
+ * 教师id
+ */
+ @Excel(name = "教师id")
+ private Long jsid;
+
+ /**
+ * 年份
+ */
+ @Excel(name = "年份")
+ private String nf;
+
+ /**
+ * 创建人
+ */
+ @Excel(name = "创建人")
+ private Long createuserid;
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setJsid(Long jsid) {
+ this.jsid = jsid;
+ }
+
+ public Long getJsid() {
+ return jsid;
+ }
+
+ public void setNf(String nf) {
+ this.nf = nf;
+ }
+
+ public String getNf() {
+ return nf;
+ }
+
+ public void setCreateuserid(Long createuserid) {
+ this.createuserid = createuserid;
+ }
+
+ public Long getCreateuserid() {
+ return createuserid;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("jsid", getJsid())
+ .append("nf", getNf())
+ .append("createuserid", getCreateuserid())
+ .append("createTime", getCreateTime())
+ .toString();
+ }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxjs/mapper/TsbzJxzxmdMapper.java b/ruoyi-system/src/main/java/com/ruoyi/jxjs/mapper/TsbzJxzxmdMapper.java
new file mode 100644
index 000000000..97d5e1afb
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/jxjs/mapper/TsbzJxzxmdMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.jxjs.mapper;
+
+import java.util.List;
+
+import com.ruoyi.jxjs.domain.TsbzJxzxmd;
+
+/**
+ * 见习之星名单Mapper接口
+ *
+ * @author ruoyi
+ * @date 2020-08-23
+ */
+public interface TsbzJxzxmdMapper {
+ /**
+ * 查询见习之星名单
+ *
+ * @param id 见习之星名单ID
+ * @return 见习之星名单
+ */
+ public TsbzJxzxmd selectTsbzJxzxmdById(Long id);
+
+ /**
+ * 查询见习之星名单列表
+ *
+ * @param tsbzJxzxmd 见习之星名单
+ * @return 见习之星名单集合
+ */
+ public List<TsbzJxzxmd> selectTsbzJxzxmdList(TsbzJxzxmd tsbzJxzxmd);
+
+ /**
+ * 新增见习之星名单
+ *
+ * @param tsbzJxzxmd 见习之星名单
+ * @return 结果
+ */
+ public int insertTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd);
+
+ /**
+ * 修改见习之星名单
+ *
+ * @param tsbzJxzxmd 见习之星名单
+ * @return 结果
+ */
+ public int updateTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd);
+
+ /**
+ * 删除见习之星名单
+ *
+ * @param id 见习之星名单ID
+ * @return 结果
+ */
+ public int deleteTsbzJxzxmdById(Long id);
+
+ /**
+ * 批量删除见习之星名单
+ *
+ * @param ids 需要删除的数据ID
+ * @return 结果
+ */
+ public int deleteTsbzJxzxmdByIds(Long[] ids);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/ITsbzJxzxmdService.java b/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/ITsbzJxzxmdService.java
new file mode 100644
index 000000000..fa5782e8a
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/ITsbzJxzxmdService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.jxjs.service;
+
+import java.util.List;
+import com.ruoyi.jxjs.domain.TsbzJxzxmd;
+
+/**
+ * 见习之星名单Service接口
+ *
+ * @author ruoyi
+ * @date 2020-08-23
+ */
+public interface ITsbzJxzxmdService
+{
+ /**
+ * 查询见习之星名单
+ *
+ * @param id 见习之星名单ID
+ * @return 见习之星名单
+ */
+ public TsbzJxzxmd selectTsbzJxzxmdById(Long id);
+
+ /**
+ * 查询见习之星名单列表
+ *
+ * @param tsbzJxzxmd 见习之星名单
+ * @return 见习之星名单集合
+ */
+ public List<TsbzJxzxmd> selectTsbzJxzxmdList(TsbzJxzxmd tsbzJxzxmd);
+
+ /**
+ * 新增见习之星名单
+ *
+ * @param tsbzJxzxmd 见习之星名单
+ * @return 结果
+ */
+ public int insertTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd);
+
+ /**
+ * 修改见习之星名单
+ *
+ * @param tsbzJxzxmd 见习之星名单
+ * @return 结果
+ */
+ public int updateTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd);
+
+ /**
+ * 批量删除见习之星名单
+ *
+ * @param ids 需要删除的见习之星名单ID
+ * @return 结果
+ */
+ public int deleteTsbzJxzxmdByIds(Long[] ids);
+
+ /**
+ * 删除见习之星名单信息
+ *
+ * @param id 见习之星名单ID
+ * @return 结果
+ */
+ public int deleteTsbzJxzxmdById(Long id);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/impl/TsbzJxzxmdServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/impl/TsbzJxzxmdServiceImpl.java
new file mode 100644
index 000000000..4b9ea498e
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/impl/TsbzJxzxmdServiceImpl.java
@@ -0,0 +1,95 @@
+package com.ruoyi.jxjs.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.jxjs.mapper.TsbzJxzxmdMapper;
+import com.ruoyi.jxjs.domain.TsbzJxzxmd;
+import com.ruoyi.jxjs.service.ITsbzJxzxmdService;
+
+/**
+ * 见习之星名单Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2020-08-23
+ */
+@Service
+public class TsbzJxzxmdServiceImpl implements ITsbzJxzxmdService
+{
+ @Autowired
+ private TsbzJxzxmdMapper tsbzJxzxmdMapper;
+
+ /**
+ * 查询见习之星名单
+ *
+ * @param id 见习之星名单ID
+ * @return 见习之星名单
+ */
+ @Override
+ public TsbzJxzxmd selectTsbzJxzxmdById(Long id)
+ {
+ return tsbzJxzxmdMapper.selectTsbzJxzxmdById(id);
+ }
+
+ /**
+ * 查询见习之星名单列表
+ *
+ * @param tsbzJxzxmd 见习之星名单
+ * @return 见习之星名单
+ */
+ @Override
+ public List<TsbzJxzxmd> selectTsbzJxzxmdList(TsbzJxzxmd tsbzJxzxmd)
+ {
+ return tsbzJxzxmdMapper.selectTsbzJxzxmdList(tsbzJxzxmd);
+ }
+
+ /**
+ * 新增见习之星名单
+ *
+ * @param tsbzJxzxmd 见习之星名单
+ * @return 结果
+ */
+ @Override
+ public int insertTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd)
+ {
+ tsbzJxzxmd.setCreateTime(DateUtils.getNowDate());
+ return tsbzJxzxmdMapper.insertTsbzJxzxmd(tsbzJxzxmd);
+ }
+
+ /**
+ * 修改见习之星名单
+ *
+ * @param tsbzJxzxmd 见习之星名单
+ * @return 结果
+ */
+ @Override
+ public int updateTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd)
+ {
+ return tsbzJxzxmdMapper.updateTsbzJxzxmd(tsbzJxzxmd);
+ }
+
+ /**
+ * 批量删除见习之星名单
+ *
+ * @param ids 需要删除的见习之星名单ID
+ * @return 结果
+ */
+ @Override
+ public int deleteTsbzJxzxmdByIds(Long[] ids)
+ {
+ return tsbzJxzxmdMapper.deleteTsbzJxzxmdByIds(ids);
+ }
+
+ /**
+ * 删除见习之星名单信息
+ *
+ * @param id 见习之星名单ID
+ * @return 结果
+ */
+ @Override
+ public int deleteTsbzJxzxmdById(Long id)
+ {
+ return tsbzJxzxmdMapper.deleteTsbzJxzxmdById(id);
+ }
+}
diff --git a/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJdcxMapper.xml b/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJdcxMapper.xml
index fb12eebf5..d4a459abe 100644
--- a/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJdcxMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJdcxMapper.xml
@@ -28,10 +28,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="msjgmnktjxdf" column="msjgmnktjxdf" />
<result property="yjdf" column="yjdf" />
<result property="zhdf2" column="zhdf2" />
+ <result property="lqzt" column="lqzt" />
</resultMap>
<sql id="selectTsbzJdcxVo">
- select id, faid, jsid, dqzt, createuserid, create_time, jdxshr, jdxshzt, sbly, qjshr, qjshzt, qjshyj, jdpx, alfxdf, jasjdf, gbzdf, zhdf, cjdrcreate_time, msqr, msqrcreate_time, msjgmnktjxdf, yjdf, zhdf2 from tsbz_jdcx
+ select id, faid, jsid, dqzt, createuserid, create_time, jdxshr, jdxshzt, sbly, qjshr, qjshzt, qjshyj, jdpx, alfxdf, jasjdf, gbzdf, zhdf, cjdrcreate_time, msqr, msqrcreate_time, msjgmnktjxdf, yjdf, zhdf2, lqzt from tsbz_jdcx
</sql>
<select id="selectTsbzJdcxList" parameterType="TsbzJdcx" resultMap="TsbzJdcxResult">
@@ -58,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="msjgmnktjxdf != null "> and msjgmnktjxdf = #{msjgmnktjxdf}</if>
<if test="yjdf != null "> and yjdf = #{yjdf}</if>
<if test="zhdf2 != null "> and zhdf2 = #{zhdf2}</if>
+ <if test="lqzt != null and lqzt != ''"> and lqzt = #{lqzt}</if>
</where>
</select>
@@ -91,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="msjgmnktjxdf != null">msjgmnktjxdf,</if>
<if test="yjdf != null">yjdf,</if>
<if test="zhdf2 != null">zhdf2,</if>
+ <if test="lqzt != null">lqzt,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="faid != null">#{faid},</if>
@@ -115,6 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="msjgmnktjxdf != null">#{msjgmnktjxdf},</if>
<if test="yjdf != null">#{yjdf},</if>
<if test="zhdf2 != null">#{zhdf2},</if>
+ <if test="lqzt != null">#{lqzt},</if>
</trim>
</insert>
@@ -143,6 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="msjgmnktjxdf != null">msjgmnktjxdf = #{msjgmnktjxdf},</if>
<if test="yjdf != null">yjdf = #{yjdf},</if>
<if test="zhdf2 != null">zhdf2 = #{zhdf2},</if>
+ <if test="lqzt != null">lqzt = #{lqzt},</if>
</trim>
where id = #{id}
</update>
diff --git a/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJxzxmdMapper.xml b/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJxzxmdMapper.xml
new file mode 100644
index 000000000..45213f46f
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJxzxmdMapper.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.jxjs.mapper.TsbzJxzxmdMapper">
+
+ <resultMap type="TsbzJxzxmd" id="TsbzJxzxmdResult">
+ <result property="id" column="id" />
+ <result property="jsid" column="jsid" />
+ <result property="nf" column="nf" />
+ <result property="createuserid" column="createuserid" />
+ <result property="createTime" column="create_time" />
+ </resultMap>
+
+ <sql id="selectTsbzJxzxmdVo">
+ select id, jsid, nf, createuserid, create_time from tsbz_jxzxmd
+ </sql>
+
+ <select id="selectTsbzJxzxmdList" parameterType="TsbzJxzxmd" resultMap="TsbzJxzxmdResult">
+ <include refid="selectTsbzJxzxmdVo"/>
+ <where>
+ <if test="jsid != null "> and jsid = #{jsid}</if>
+ <if test="nf != null and nf != ''"> and nf = #{nf}</if>
+ <if test="createuserid != null "> and createuserid = #{createuserid}</if>
+ </where>
+ </select>
+
+ <select id="selectTsbzJxzxmdById" parameterType="Long" resultMap="TsbzJxzxmdResult">
+ <include refid="selectTsbzJxzxmdVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertTsbzJxzxmd" parameterType="TsbzJxzxmd" useGeneratedKeys="true" keyProperty="id">
+ insert into tsbz_jxzxmd
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="jsid != null">jsid,</if>
+ <if test="nf != null">nf,</if>
+ <if test="createuserid != null">createuserid,</if>
+ <if test="createTime != null">create_time,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="jsid != null">#{jsid},</if>
+ <if test="nf != null">#{nf},</if>
+ <if test="createuserid != null">#{createuserid},</if>
+ <if test="createTime != null">#{createTime},</if>
+ </trim>
+ </insert>
+
+ <update id="updateTsbzJxzxmd" parameterType="TsbzJxzxmd">
+ update tsbz_jxzxmd
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="jsid != null">jsid = #{jsid},</if>
+ <if test="nf != null">nf = #{nf},</if>
+ <if test="createuserid != null">createuserid = #{createuserid},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteTsbzJxzxmdById" parameterType="Long">
+ delete from tsbz_jxzxmd where id = #{id}
+ </delete>
+
+ <delete id="deleteTsbzJxzxmdByIds" parameterType="String">
+ delete from tsbz_jxzxmd where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/jxjs/msqr/index.vue b/ruoyi-ui/src/views/jxjs/msqr/index.vue
index 9b1efb1a2..5ee995614 100644
--- a/ruoyi-ui/src/views/jxjs/msqr/index.vue
+++ b/ruoyi-ui/src/views/jxjs/msqr/index.vue
@@ -13,13 +13,19 @@
</el-select>
</el-form-item>
<el-form-item label="选择教师" prop="jsid">
- <el-input
- v-model="queryParams.jsid"
- placeholder="请输入教师"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
+ <el-select v-model="queryParams.jsid" filterable placeholder="请选择教师">
+ <el-option v-for="item in jsOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="录取状态" prop="lqzt">
+ <el-select v-model="queryParams.lqzt" filterable placeholder="请选择录取状态">
+ <el-option
+ v-for="item in lqztOptions"
+ :key="item.dictValue"
+ :label="item.dictLable"
+ :value="item.dictValue"
+ ></el-option>
+ </el-select>
</el-form-item>
<el-form-item>
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -38,16 +44,6 @@
v-hasPermi="['jxjs:jdcx:edit']"
>确认</el-button>
</el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['jxjs:jdcx:remove']"
- >删除</el-button>
- </el-col>
<el-col :span="1.5">
<el-button
type="info"
@@ -70,38 +66,22 @@
</el-row>
<el-table v-loading="loading" :data="jdcxList" @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="faid" :formatter="faFormat" />
- <el-table-column label="教师姓名" align="center" prop="jsid" />
+ <el-table-column type="selection" width="55" align="center" :selectable="isShow" />
+ <!-- <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" :formatter="jsFormat" />
<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="lqzt" :formatter="lqztFormat" />
+ <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="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" prop="zhdf" />
+ <el-table-column label="基地排序" align="center" prop="jdpx" />
+ <el-table-column label="模拟课堂教学得分" align="center" prop="msjgmnktjxdf" />
+ <el-table-column label="演讲得分" align="center" prop="yjdf" />
+ <el-table-column label="面试综合得分" align="center" prop="zhdf2" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -111,14 +91,8 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['jxjs:jdcx:edit']"
+ v-show="isShow(scope.row)"
>确认</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['jxjs:jdcx:remove']"
- >删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -134,113 +108,16 @@
<!-- 添加或修改基地区级审核对话框 -->
<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-form-item label="录取状态" prop="lqzt">
+ <el-select v-model="form.lqzt" placeholder="请选择录取状态">
<el-option
- v-for="dict in dqztOptions"
+ v-for="dict in lqztOptions"
: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-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@@ -251,17 +128,12 @@
</template>
<script>
-import {
- listJdcx,
- getJdcx,
- delJdcx,
- addJdcx,
- updateJdcx,
- exportJdcx,
-} from "@/api/jxjs/jdcx";
+import { listJdcx, getJdcx, updateJdcx, exportJdcx } from "@/api/jxjs/jdcx";
import { listJxzxpxfa } from "@/api/jxjs/jxzxpxfa";
+import { listJxjsjbxx, getJxjsjbxx } from "@/api/jxjs/jxjsjbxx";
+
export default {
name: "Jdcx",
data() {
@@ -286,14 +158,14 @@ export default {
open: false,
// 当前状态字典
dqztOptions: [],
- // 基地校审核状态字典
- jdxshztOptions: [],
// 区级审核状态字典
qjshztOptions: [],
- // 区级审核意见字典
- qjshyjOptions: [],
+ // 录取状态字典
+ lqztOptions: [],
//方案
faOptions: [],
+ //教师
+ jsOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
@@ -314,11 +186,12 @@ export default {
gbzdf: null,
zhdf: null,
cjdrcreateTime: null,
- msqr: null,
+ msqr: "1",
msqrcreateTime: null,
msjgmnktjxdf: null,
yjdf: null,
zhdf2: null,
+ lqzt: null,
},
// 查询参数
queryParams_fa: {
@@ -328,54 +201,35 @@ 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" },
+ lqzt: [
+ { required: true, message: "录取状态不能为空", trigger: "blur" },
],
},
};
},
created() {
this.getFaList();
+ this.getJsList();
this.getList();
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.getDicts("sys_dm_shyj").then((response) => {
this.qjshztOptions = response.data;
});
- this.getDicts("sys_dm_shyj").then((response) => {
- this.qjshyjOptions = response.data;
+ this.getDicts("sys_dm_lqzt").then((response) => {
+ this.lqztOptions = response.data;
});
},
methods: {
+ isShow(row) {
+ console.log(row.dqzt);
+ if (row.dqzt == "9") {
+ return false;
+ } else {
+ return true;
+ }
+ },
// 字典翻译
faFormat(row, column) {
// return this.selectDictLabel(this.classOptions, row.classid);
@@ -390,12 +244,30 @@ export default {
});
return actions.join("");
},
+ // 字典翻译
+ jsFormat(row, column) {
+ // return this.selectDictLabel(this.classOptions, row.classid);
+ var actions = [];
+ var datas = this.jsOptions;
+ Object.keys(datas).map((key) => {
+ if (datas[key].id == "" + row.jsid) {
+ actions.push(datas[key].name);
+ return false;
+ }
+ });
+ return actions.join("");
+ },
getFaList() {
this.queryParams_fa.fazt = "1";
listJxzxpxfa(this.queryParams_fa).then((response) => {
this.faOptions = response.rows;
});
},
+ getJsList() {
+ listJxjsjbxx(null).then((response) => {
+ this.jsOptions = response.rows;
+ });
+ },
/** 查询基地区级审核列表 */
getList() {
this.loading = true;
@@ -405,22 +277,18 @@ export default {
this.loading = false;
});
},
+ // 录取状态字典翻译
+ lqztFormat(row, column) {
+ return this.selectDictLabel(this.lqztOptions, row.lqzt);
+ },
// 当前状态字典翻译
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);
- },
// 取消按钮
cancel() {
this.open = false;
@@ -452,6 +320,7 @@ export default {
msjgmnktjxdf: null,
yjdf: null,
zhdf2: null,
+ lqzt: null,
};
this.resetForm("form");
},
@@ -471,12 +340,6 @@ export default {
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
- /** 新增按钮操作 */
- handleAdd() {
- this.reset();
- this.open = true;
- this.title = "添加基地区级审核";
- },
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
@@ -484,25 +347,18 @@ export default {
getJdcx(id).then((response) => {
this.form = response.data;
this.open = true;
- this.title = "修改基地区级审核";
+ this.title = "面试结果审核";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
+ this.form.dqzt = "9";
if (this.form.id != null) {
updateJdcx(this.form).then((response) => {
if (response.code === 200) {
- this.msgSuccess("修改成功");
- this.open = false;
- this.getList();
- }
- });
- } else {
- addJdcx(this.form).then((response) => {
- if (response.code === 200) {
- this.msgSuccess("新增成功");
+ this.msgSuccess("录取成功");
this.open = false;
this.getList();
}
@@ -511,27 +367,6 @@ export default {
}
});
},
- /** 删除按钮操作 */
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$confirm(
- '是否确认删除基地区级审核编号为"' + ids + '"的数据项?',
- "警告",
- {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- }
- )
- .then(function () {
- return delJdcx(ids);
- })
- .then(() => {
- this.getList();
- this.msgSuccess("删除成功");
- })
- .catch(function () {});
- },
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;