笔试名单导出更新
This commit is contained in:
mumu
parent
708bee6eee
commit
f552043554
@ -55,9 +55,10 @@ 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.selectTsbzJdcxList(tsbzJdcx);
|
||||
List<TsbzJdcx> list = tsbzJdcxService.selectTsbzJdcxExport(tsbzJdcx);
|
||||
ExcelUtil<TsbzJdcx> util = new ExcelUtil<TsbzJdcx>(TsbzJdcx.class);
|
||||
return util.exportExcel(list, "jdcx");
|
||||
return util.exportExcel(list, "笔试名单");
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -22,91 +22,133 @@ public class TsbzJdcx extends BaseEntity
|
||||
private Long id;
|
||||
|
||||
/** 方案编号 */
|
||||
@Excel(name = "方案编号")
|
||||
// @Excel(name = "方案编号")
|
||||
private Long faid;
|
||||
|
||||
/** 教师编号 */
|
||||
@Excel(name = "教师编号")
|
||||
// @Excel(name = "教师编号")
|
||||
private Long jsid;
|
||||
|
||||
/** 当前状态 */
|
||||
@Excel(name = "当前状态")
|
||||
private String dqzt;
|
||||
|
||||
|
||||
/** 创建人 */
|
||||
@Excel(name = "创建人")
|
||||
// @Excel(name = "创建人")
|
||||
private Long createuserid;
|
||||
|
||||
/** 基地校审核人 */
|
||||
@Excel(name = "基地校审核人")
|
||||
// @Excel(name = "基地校审核人")
|
||||
private Long jdxshr;
|
||||
|
||||
/** 基地校审核状态 */
|
||||
@Excel(name = "基地校审核状态")
|
||||
// @Excel(name = "基地校审核状态")
|
||||
private String jdxshzt;
|
||||
|
||||
/** 上报理由 */
|
||||
@Excel(name = "上报理由")
|
||||
// @Excel(name = "上报理由")
|
||||
private String sbly;
|
||||
|
||||
/** 区级审核人 */
|
||||
@Excel(name = "区级审核人")
|
||||
// @Excel(name = "区级审核人")
|
||||
private Long qjshr;
|
||||
|
||||
/** 区级审核状态 */
|
||||
@Excel(name = "区级审核状态")
|
||||
// @Excel(name = "区级审核状态")
|
||||
private String qjshzt;
|
||||
|
||||
/** 区级审核意见 */
|
||||
@Excel(name = "区级审核意见")
|
||||
// @Excel(name = "区级审核意见")
|
||||
private String qjshyj;
|
||||
|
||||
/** 基地排序 */
|
||||
@Excel(name = "基地排序")
|
||||
// @Excel(name = "基地排序")
|
||||
private Long jdpx;
|
||||
|
||||
/** 案例分析得分 */
|
||||
@Excel(name = "案例分析得分")
|
||||
// @Excel(name = "案例分析得分")
|
||||
private BigDecimal alfxdf;
|
||||
|
||||
/** 教案设计得分 */
|
||||
@Excel(name = "教案设计得分")
|
||||
// @Excel(name = "教案设计得分")
|
||||
private BigDecimal jasjdf;
|
||||
|
||||
/** 钢笔字得分 */
|
||||
@Excel(name = "钢笔字得分")
|
||||
// @Excel(name = "钢笔字得分")
|
||||
private BigDecimal gbzdf;
|
||||
|
||||
/** 综合得分 */
|
||||
@Excel(name = "综合得分")
|
||||
// @Excel(name = "综合得分")
|
||||
private BigDecimal zhdf;
|
||||
|
||||
/** 成绩导入创建时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "成绩导入创建时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
// @Excel(name = "成绩导入创建时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date cjdrcreateTime;
|
||||
|
||||
/** 面试确认 */
|
||||
@Excel(name = "面试确认")
|
||||
// @Excel(name = "面试确认")
|
||||
private String msqr;
|
||||
|
||||
/** 面试确认时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "面试确认时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
// @Excel(name = "面试确认时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date msqrcreateTime;
|
||||
|
||||
/** 面试结果模拟课堂教学 */
|
||||
@Excel(name = "面试结果模拟课堂教学")
|
||||
// @Excel(name = "面试结果模拟课堂教学")
|
||||
private BigDecimal msjgmnktjxdf;
|
||||
|
||||
/** 演讲得分 */
|
||||
@Excel(name = "演讲得分")
|
||||
// @Excel(name = "演讲得分")
|
||||
private BigDecimal yjdf;
|
||||
|
||||
/** 综合得分2 */
|
||||
@Excel(name = "综合得分2")
|
||||
// @Excel(name = "综合得分2")
|
||||
private BigDecimal zhdf2;
|
||||
|
||||
@Excel(name = "评选名称")
|
||||
private String faname;
|
||||
@Excel(name = "基地校")
|
||||
private String jdxmc;
|
||||
@Excel(name = "姓名")
|
||||
private String jsname;
|
||||
@Excel(name = "性别", readConverterExp = "0=男,1=女,2=未知")
|
||||
private String xb;
|
||||
@Excel(name = "学段", readConverterExp = "1=学前教育,2=小学,3=普通初中,4=普通高中")
|
||||
private String rjxd;
|
||||
@Excel(name = "学科", readConverterExp = "11=品德与生活（社会） ,12=思想品德（政治） ,13=语文 ,14=数学 ,15=科学 ,16=物理 ,17=化学 ,18=生物 ,19=历史与社会 ,20=地理 ,21=历史 ,22=体育与健康 ,23=艺术 ,24=音乐 ,25=美术 ,41=英语")
|
||||
private String rjxk;
|
||||
@Excel(name = "联系方式")
|
||||
private String phone;
|
||||
@Excel(name = "聘任校")
|
||||
private String prdwmc;
|
||||
/** 当前状态 */
|
||||
@Excel(name = "当前状态")
|
||||
private String dqzt;
|
||||
|
||||
public String getFaname() { return faname; }
|
||||
public void setFaname(String faname) { this.faname = faname;}
|
||||
|
||||
public String getJdxmc() { return jdxmc; }
|
||||
public void setJdxmc(String jdxmc) { this.jdxmc = jdxmc; }
|
||||
|
||||
public String getJsname() { return jsname; }
|
||||
public void setJsname(String jsname) { this.jsname = jsname; }
|
||||
|
||||
public String getXb() { return xb; }
|
||||
public void setXb(String xb) { this.xb = xb; }
|
||||
|
||||
public String getRjxd() { return rjxd; }
|
||||
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;
|
||||
|
||||
@ -58,4 +58,11 @@ public interface TsbzJdcxMapper
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteTsbzJdcxByIds(Long[] ids);
|
||||
/**
|
||||
* 查询基地区级审核列表
|
||||
*
|
||||
* @param tsbzJdcx 基地区级审核
|
||||
* @return 基地区级审核集合
|
||||
*/
|
||||
public List<TsbzJdcx> selectTsbzJdcxExport(TsbzJdcx tsbzJdcx);
|
||||
}
|
||||
|
||||
@ -58,4 +58,12 @@ public interface ITsbzJdcxService
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteTsbzJdcxById(Long id);
|
||||
|
||||
/**
|
||||
* 查询基地区级审核导出
|
||||
*
|
||||
* @param tsbzJdcx 基地区级审核
|
||||
* @return 基地区级审核集合
|
||||
*/
|
||||
public List<TsbzJdcx> selectTsbzJdcxExport(TsbzJdcx tsbzJdcx);
|
||||
}
|
||||
|
||||
@ -92,4 +92,17 @@ public class TsbzJdcxServiceImpl implements ITsbzJdcxService
|
||||
{
|
||||
return tsbzJdcxMapper.deleteTsbzJdcxById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询基地区级审核导出
|
||||
*
|
||||
* @param tsbzJdcx 基地区级审核
|
||||
* @return 基地区级审核
|
||||
*/
|
||||
@Override
|
||||
public List<TsbzJdcx> selectTsbzJdcxExport(TsbzJdcx tsbzJdcx)
|
||||
{
|
||||
return tsbzJdcxMapper.selectTsbzJdcxExport(tsbzJdcx);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -158,4 +158,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
</foreach>
|
||||
</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
|
||||
<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="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="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="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="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>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@ -225,6 +225,25 @@
|
||||
<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-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :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-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
|
||||
<el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
|
||||
</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>
|
||||
|
||||
@ -238,6 +257,7 @@ import {
|
||||
exportJdcx,
|
||||
} from "@/api/jxjs/jdcx";
|
||||
|
||||
import { getToken } from "@/utils/auth";
|
||||
import { listJxzxpxfa } from "@/api/jxjs/jxzxpxfa";
|
||||
|
||||
export default {
|
||||
@ -272,6 +292,21 @@ export default {
|
||||
qjshyjOptions: [],
|
||||
//方案
|
||||
faOptions: [],
|
||||
// 用户导入参数lu
|
||||
upload: {
|
||||
// 是否显示弹出层（用户导入）
|
||||
open: false,
|
||||
// 弹出层标题（用户导入）
|
||||
title: "",
|
||||
// 是否禁用上传
|
||||
isUploading: false,
|
||||
// 是否更新已经存在的用户数据
|
||||
updateSupport: 0,
|
||||
// 设置上传的请求头部
|
||||
headers: { Authorization: "Bearer " + getToken() },
|
||||
// 上传的地址
|
||||
url: process.env.VUE_APP_BASE_API + "/system/user/importData",
|
||||
},
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
@ -526,6 +561,33 @@ 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() {
|
||||
// this.$refs.upload.submit();
|
||||
// },
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user