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 new file mode 100644 index 000000000..0623aeb41 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJdcxController.java @@ -0,0 +1,103 @@ +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.TsbzJdcx; +import com.ruoyi.jxjs.service.ITsbzJdcxService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 基地区级审核Controller + * + * @author ruoyi + * @date 2020-08-20 + */ +@RestController +@RequestMapping("/jxjs/jdcx") +public class TsbzJdcxController extends BaseController +{ + @Autowired + private ITsbzJdcxService tsbzJdcxService; + + /** + * 查询基地区级审核列表 + */ + @PreAuthorize("@ss.hasPermi('jxjs:jdcx:list')") + @GetMapping("/list") + public TableDataInfo list(TsbzJdcx tsbzJdcx) + { + startPage(); + List list = tsbzJdcxService.selectTsbzJdcxList(tsbzJdcx); + return getDataTable(list); + } + + /** + * 导出基地区级审核列表 + */ + @PreAuthorize("@ss.hasPermi('jxjs:jdcx:export')") + @Log(title = "基地区级审核", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(TsbzJdcx tsbzJdcx) + { + List list = tsbzJdcxService.selectTsbzJdcxList(tsbzJdcx); + ExcelUtil util = new ExcelUtil(TsbzJdcx.class); + return util.exportExcel(list, "jdcx"); + } + + /** + * 获取基地区级审核详细信息 + */ + @PreAuthorize("@ss.hasPermi('jxjs:jdcx:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(tsbzJdcxService.selectTsbzJdcxById(id)); + } + + /** + * 新增基地区级审核 + */ + @PreAuthorize("@ss.hasPermi('jxjs:jdcx:add')") + @Log(title = "基地区级审核", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody TsbzJdcx tsbzJdcx) + { + return toAjax(tsbzJdcxService.insertTsbzJdcx(tsbzJdcx)); + } + + /** + * 修改基地区级审核 + */ + @PreAuthorize("@ss.hasPermi('jxjs:jdcx:edit')") + @Log(title = "基地区级审核", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody TsbzJdcx tsbzJdcx) + { + return toAjax(tsbzJdcxService.updateTsbzJdcx(tsbzJdcx)); + } + + /** + * 删除基地区级审核 + */ + @PreAuthorize("@ss.hasPermi('jxjs:jdcx:remove')") + @Log(title = "基地区级审核", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(tsbzJdcxService.deleteTsbzJdcxByIds(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 new file mode 100644 index 000000000..5a597095d --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJdcx.java @@ -0,0 +1,337 @@ +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; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 基地区级审核对象 tsbz_jdcx + * + * @author ruoyi + * @date 2020-08-20 + */ +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 */ + @Excel(name = "综合得分2") + private BigDecimal zhdf2; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setFaid(Long faid) + { + this.faid = faid; + } + + public Long getFaid() + { + return faid; + } + public void setJsid(Long jsid) + { + this.jsid = jsid; + } + + public Long getJsid() + { + return jsid; + } + public void setDqzt(String dqzt) + { + this.dqzt = dqzt; + } + + public String getDqzt() + { + return dqzt; + } + public void setCreateuserid(Long createuserid) + { + this.createuserid = createuserid; + } + + public Long getCreateuserid() + { + return createuserid; + } + public void setJdxshr(Long jdxshr) + { + this.jdxshr = jdxshr; + } + + public Long getJdxshr() + { + return jdxshr; + } + public void setJdxshzt(String jdxshzt) + { + this.jdxshzt = jdxshzt; + } + + public String getJdxshzt() + { + return jdxshzt; + } + public void setSbly(String sbly) + { + this.sbly = sbly; + } + + public String getSbly() + { + return sbly; + } + public void setQjshr(Long qjshr) + { + this.qjshr = qjshr; + } + + public Long getQjshr() + { + return qjshr; + } + public void setQjshzt(String qjshzt) + { + this.qjshzt = qjshzt; + } + + public String getQjshzt() + { + return qjshzt; + } + public void setQjshyj(String qjshyj) + { + this.qjshyj = qjshyj; + } + + public String getQjshyj() + { + return qjshyj; + } + public void setJdpx(Long jdpx) + { + this.jdpx = jdpx; + } + + public Long getJdpx() + { + return jdpx; + } + public void setAlfxdf(BigDecimal alfxdf) + { + this.alfxdf = alfxdf; + } + + public BigDecimal getAlfxdf() + { + return alfxdf; + } + public void setJasjdf(BigDecimal jasjdf) + { + this.jasjdf = jasjdf; + } + + public BigDecimal getJasjdf() + { + return jasjdf; + } + public void setGbzdf(BigDecimal gbzdf) + { + this.gbzdf = gbzdf; + } + + public BigDecimal getGbzdf() + { + return gbzdf; + } + public void setZhdf(BigDecimal zhdf) + { + this.zhdf = zhdf; + } + + public BigDecimal getZhdf() + { + return zhdf; + } + public void setCjdrcreateTime(Date cjdrcreateTime) + { + this.cjdrcreateTime = cjdrcreateTime; + } + + public Date getCjdrcreateTime() + { + return cjdrcreateTime; + } + public void setMsqr(String msqr) + { + this.msqr = msqr; + } + + public String getMsqr() + { + return msqr; + } + public void setMsqrcreateTime(Date msqrcreateTime) + { + this.msqrcreateTime = msqrcreateTime; + } + + public Date getMsqrcreateTime() + { + return msqrcreateTime; + } + public void setMsjgmnktjxdf(BigDecimal msjgmnktjxdf) + { + this.msjgmnktjxdf = msjgmnktjxdf; + } + + public BigDecimal getMsjgmnktjxdf() + { + return msjgmnktjxdf; + } + public void setYjdf(BigDecimal yjdf) + { + this.yjdf = yjdf; + } + + public BigDecimal getYjdf() + { + return yjdf; + } + public void setZhdf2(BigDecimal zhdf2) + { + this.zhdf2 = zhdf2; + } + + public BigDecimal getZhdf2() + { + return zhdf2; + } + + @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(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxjs/mapper/TsbzJdcxMapper.java b/ruoyi-system/src/main/java/com/ruoyi/jxjs/mapper/TsbzJdcxMapper.java new file mode 100644 index 000000000..88660b099 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/jxjs/mapper/TsbzJdcxMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.jxjs.mapper; + +import java.util.List; +import com.ruoyi.jxjs.domain.TsbzJdcx; + +/** + * 基地区级审核Mapper接口 + * + * @author ruoyi + * @date 2020-08-20 + */ +public interface TsbzJdcxMapper +{ + /** + * 查询基地区级审核 + * + * @param id 基地区级审核ID + * @return 基地区级审核 + */ + public TsbzJdcx selectTsbzJdcxById(Long id); + + /** + * 查询基地区级审核列表 + * + * @param tsbzJdcx 基地区级审核 + * @return 基地区级审核集合 + */ + public List selectTsbzJdcxList(TsbzJdcx tsbzJdcx); + + /** + * 新增基地区级审核 + * + * @param tsbzJdcx 基地区级审核 + * @return 结果 + */ + public int insertTsbzJdcx(TsbzJdcx tsbzJdcx); + + /** + * 修改基地区级审核 + * + * @param tsbzJdcx 基地区级审核 + * @return 结果 + */ + public int updateTsbzJdcx(TsbzJdcx tsbzJdcx); + + /** + * 删除基地区级审核 + * + * @param id 基地区级审核ID + * @return 结果 + */ + public int deleteTsbzJdcxById(Long id); + + /** + * 批量删除基地区级审核 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTsbzJdcxByIds(Long[] ids); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/ITsbzJdcxService.java b/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/ITsbzJdcxService.java new file mode 100644 index 000000000..c96498dff --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/ITsbzJdcxService.java @@ -0,0 +1,61 @@ +package com.ruoyi.jxjs.service; + +import java.util.List; +import com.ruoyi.jxjs.domain.TsbzJdcx; + +/** + * 基地区级审核Service接口 + * + * @author ruoyi + * @date 2020-08-20 + */ +public interface ITsbzJdcxService +{ + /** + * 查询基地区级审核 + * + * @param id 基地区级审核ID + * @return 基地区级审核 + */ + public TsbzJdcx selectTsbzJdcxById(Long id); + + /** + * 查询基地区级审核列表 + * + * @param tsbzJdcx 基地区级审核 + * @return 基地区级审核集合 + */ + public List selectTsbzJdcxList(TsbzJdcx tsbzJdcx); + + /** + * 新增基地区级审核 + * + * @param tsbzJdcx 基地区级审核 + * @return 结果 + */ + public int insertTsbzJdcx(TsbzJdcx tsbzJdcx); + + /** + * 修改基地区级审核 + * + * @param tsbzJdcx 基地区级审核 + * @return 结果 + */ + public int updateTsbzJdcx(TsbzJdcx tsbzJdcx); + + /** + * 批量删除基地区级审核 + * + * @param ids 需要删除的基地区级审核ID + * @return 结果 + */ + public int deleteTsbzJdcxByIds(Long[] ids); + + /** + * 删除基地区级审核信息 + * + * @param id 基地区级审核ID + * @return 结果 + */ + public int deleteTsbzJdcxById(Long id); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/impl/TsbzJdcxServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/impl/TsbzJdcxServiceImpl.java new file mode 100644 index 000000000..a2455ea94 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/impl/TsbzJdcxServiceImpl.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.TsbzJdcxMapper; +import com.ruoyi.jxjs.domain.TsbzJdcx; +import com.ruoyi.jxjs.service.ITsbzJdcxService; + +/** + * 基地区级审核Service业务层处理 + * + * @author ruoyi + * @date 2020-08-20 + */ +@Service +public class TsbzJdcxServiceImpl implements ITsbzJdcxService +{ + @Autowired + private TsbzJdcxMapper tsbzJdcxMapper; + + /** + * 查询基地区级审核 + * + * @param id 基地区级审核ID + * @return 基地区级审核 + */ + @Override + public TsbzJdcx selectTsbzJdcxById(Long id) + { + return tsbzJdcxMapper.selectTsbzJdcxById(id); + } + + /** + * 查询基地区级审核列表 + * + * @param tsbzJdcx 基地区级审核 + * @return 基地区级审核 + */ + @Override + public List selectTsbzJdcxList(TsbzJdcx tsbzJdcx) + { + return tsbzJdcxMapper.selectTsbzJdcxList(tsbzJdcx); + } + + /** + * 新增基地区级审核 + * + * @param tsbzJdcx 基地区级审核 + * @return 结果 + */ + @Override + public int insertTsbzJdcx(TsbzJdcx tsbzJdcx) + { + tsbzJdcx.setCreateTime(DateUtils.getNowDate()); + return tsbzJdcxMapper.insertTsbzJdcx(tsbzJdcx); + } + + /** + * 修改基地区级审核 + * + * @param tsbzJdcx 基地区级审核 + * @return 结果 + */ + @Override + public int updateTsbzJdcx(TsbzJdcx tsbzJdcx) + { + return tsbzJdcxMapper.updateTsbzJdcx(tsbzJdcx); + } + + /** + * 批量删除基地区级审核 + * + * @param ids 需要删除的基地区级审核ID + * @return 结果 + */ + @Override + public int deleteTsbzJdcxByIds(Long[] ids) + { + return tsbzJdcxMapper.deleteTsbzJdcxByIds(ids); + } + + /** + * 删除基地区级审核信息 + * + * @param id 基地区级审核ID + * @return 结果 + */ + @Override + public int deleteTsbzJdcxById(Long id) + { + return tsbzJdcxMapper.deleteTsbzJdcxById(id); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJdcxMapper.xml b/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJdcxMapper.xml new file mode 100644 index 000000000..fb12eebf5 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJdcxMapper.xml @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + insert into tsbz_jdcx + + 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, + + + #{faid}, + #{jsid}, + #{dqzt}, + #{createuserid}, + #{createTime}, + #{jdxshr}, + #{jdxshzt}, + #{sbly}, + #{qjshr}, + #{qjshzt}, + #{qjshyj}, + #{jdpx}, + #{alfxdf}, + #{jasjdf}, + #{gbzdf}, + #{zhdf}, + #{cjdrcreateTime}, + #{msqr}, + #{msqrcreateTime}, + #{msjgmnktjxdf}, + #{yjdf}, + #{zhdf2}, + + + + + update tsbz_jdcx + + faid = #{faid}, + jsid = #{jsid}, + dqzt = #{dqzt}, + createuserid = #{createuserid}, + create_time = #{createTime}, + jdxshr = #{jdxshr}, + jdxshzt = #{jdxshzt}, + sbly = #{sbly}, + qjshr = #{qjshr}, + qjshzt = #{qjshzt}, + qjshyj = #{qjshyj}, + jdpx = #{jdpx}, + alfxdf = #{alfxdf}, + jasjdf = #{jasjdf}, + gbzdf = #{gbzdf}, + zhdf = #{zhdf}, + cjdrcreate_time = #{cjdrcreateTime}, + msqr = #{msqr}, + msqrcreate_time = #{msqrcreateTime}, + msjgmnktjxdf = #{msjgmnktjxdf}, + yjdf = #{yjdf}, + zhdf2 = #{zhdf2}, + + where id = #{id} + + + + delete from tsbz_jdcx where id = #{id} + + + + delete from tsbz_jdcx where id in + + #{id} + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/api/jxjs/jdcx.js b/ruoyi-ui/src/api/jxjs/jdcx.js new file mode 100644 index 000000000..bfcd623d2 --- /dev/null +++ b/ruoyi-ui/src/api/jxjs/jdcx.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询基地区级审核列表 +export function listJdcx(query) { + return request({ + url: '/jxjs/jdcx/list', + method: 'get', + params: query + }) +} + +// 查询基地区级审核详细 +export function getJdcx(id) { + return request({ + url: '/jxjs/jdcx/' + id, + method: 'get' + }) +} + +// 新增基地区级审核 +export function addJdcx(data) { + return request({ + url: '/jxjs/jdcx', + method: 'post', + data: data + }) +} + +// 修改基地区级审核 +export function updateJdcx(data) { + return request({ + url: '/jxjs/jdcx', + method: 'put', + data: data + }) +} + +// 删除基地区级审核 +export function delJdcx(id) { + return request({ + url: '/jxjs/jdcx/' + id, + method: 'delete' + }) +} + +// 导出基地区级审核 +export function exportJdcx(query) { + return request({ + url: '/jxjs/jdcx/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/views/jxjs/jdcx/index.vue b/ruoyi-ui/src/views/jxjs/jdcx/index.vue new file mode 100644 index 000000000..d0e09bf33 --- /dev/null +++ b/ruoyi-ui/src/views/jxjs/jdcx/index.vue @@ -0,0 +1,642 @@ + + +