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

见习之星考核-进度

Browse Source
This commit is contained in:
paidaxing444
2020-09-03 16:20:32 +08:00
parent 9aab741c49
commit 5520d5e218
8 changed files with 348 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxStatisticsController.java Normal file
View File

@ -0,0 +1,40 @@
package com.ruoyi.web.controller.jxzxkhgl;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.jxjs.domain.TsbzJxzxmd;
import com.ruoyi.jxjs.service.ITsbzJxzxmdService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* 见习之星考核方案Controller
*
* @author ruoyi
* @date 2020-08-29
*/
@RestController
@RequestMapping("/jxzxkhgl/statistics")
public class TsbzJxzxStatisticsController extends BaseController {
@Autowired
private ITsbzJxzxmdService tsbzJxzxmdService;
/**
* 查询见习之星名单列表
*/
@PreAuthorize("@ss.hasPermi('jxzxkhgl:statistics:list')")
@GetMapping("/list")
public TableDataInfo list(TsbzJxzxmd tsbzJxzxmd) {
System.out.println("nf:" + tsbzJxzxmd.getNf());
System.out.println("faid:" + tsbzJxzxmd.getFaid());
startPage();
List<TsbzJxzxmd> list = tsbzJxzxmdService.selectTsbzJxzxmdKhjdList(tsbzJxzxmd);
return getDataTable(list);
}
}

34
ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJxzxmd.java
View File

@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import java.math.BigDecimal;
/**
* 见习之星名单对象 tsbz_jxzxmd
*
@ -37,6 +39,11 @@ public class TsbzJxzxmd extends BaseEntity {
@Excel(name = "创建人")
private Long createuserid;
private BigDecimal bfb;
private String faid;
private TsbzJxjsjbxx tsbzJxjsjbxx;
public void setId(Long id) {
this.id = id;
}
@ -69,6 +76,30 @@ public class TsbzJxzxmd extends BaseEntity {
return createuserid;
}
public BigDecimal getBfb() {
return bfb;
}
public void setBfb(BigDecimal bfb) {
this.bfb = bfb;
}
public String getFaid() {
return faid;
}
public void setFaid(String faid) {
this.faid = faid;
}
public TsbzJxjsjbxx getTsbzJxjsjbxx() {
return tsbzJxjsjbxx;
}
public void setTsbzJxjsjbxx(TsbzJxjsjbxx tsbzJxjsjbxx) {
this.tsbzJxjsjbxx = tsbzJxjsjbxx;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@ -77,6 +108,9 @@ public class TsbzJxzxmd extends BaseEntity {
.append("nf", getNf())
.append("createuserid", getCreateuserid())
.append("createTime", getCreateTime())
.append("bfb", getBfb())
.append("faid", getFaid())
.append("tsbzJxjsjbxx", getTsbzJxjsjbxx())
.toString();
}
}

8
ruoyi-system/src/main/java/com/ruoyi/jxjs/mapper/TsbzJxzxmdMapper.java
View File

@ -58,4 +58,12 @@ public interface TsbzJxzxmdMapper {
* @return 结果
*/
public int deleteTsbzJxzxmdByIds(Long[] ids);
/**
* 查询见习之星名单列表
*
* @param tsbzJxzxmd 见习之星名单
* @return 见习之星名单集合
*/
public List<TsbzJxzxmd> selectTsbzJxzxmdKhjdList(TsbzJxzxmd tsbzJxzxmd);
}

8
ruoyi-system/src/main/java/com/ruoyi/jxjs/service/ITsbzJxzxmdService.java
View File

@ -58,4 +58,12 @@ public interface ITsbzJxzxmdService
* @return 结果
*/
public int deleteTsbzJxzxmdById(Long id);
/**
* 查询见习之星名单列表
*
* @param tsbzJxzxmd 见习之星名单
* @return 见习之星名单集合
*/
public List<TsbzJxzxmd> selectTsbzJxzxmdKhjdList(TsbzJxzxmd tsbzJxzxmd);
}

33
ruoyi-system/src/main/java/com/ruoyi/jxjs/service/impl/TsbzJxzxmdServiceImpl.java
View File

@ -1,6 +1,7 @@
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;
@ -15,8 +16,7 @@ import com.ruoyi.jxjs.service.ITsbzJxzxmdService;
* @date 2020-08-23
*/
@Service
public class TsbzJxzxmdServiceImpl implements ITsbzJxzxmdService
{
public class TsbzJxzxmdServiceImpl implements ITsbzJxzxmdService {
@Autowired
private TsbzJxzxmdMapper tsbzJxzxmdMapper;
@ -27,8 +27,7 @@ public class TsbzJxzxmdServiceImpl implements ITsbzJxzxmdService
* @return 见习之星名单
*/
@Override
public TsbzJxzxmd selectTsbzJxzxmdById(Long id)
{
public TsbzJxzxmd selectTsbzJxzxmdById(Long id) {
return tsbzJxzxmdMapper.selectTsbzJxzxmdById(id);
}
@ -39,8 +38,7 @@ public class TsbzJxzxmdServiceImpl implements ITsbzJxzxmdService
* @return 见习之星名单
*/
@Override
public List<TsbzJxzxmd> selectTsbzJxzxmdList(TsbzJxzxmd tsbzJxzxmd)
{
public List<TsbzJxzxmd> selectTsbzJxzxmdList(TsbzJxzxmd tsbzJxzxmd) {
return tsbzJxzxmdMapper.selectTsbzJxzxmdList(tsbzJxzxmd);
}
@ -51,8 +49,7 @@ public class TsbzJxzxmdServiceImpl implements ITsbzJxzxmdService
* @return 结果
*/
@Override
public int insertTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd)
{
public int insertTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd) {
tsbzJxzxmd.setCreateTime(DateUtils.getNowDate());
return tsbzJxzxmdMapper.insertTsbzJxzxmd(tsbzJxzxmd);
}
@ -64,8 +61,7 @@ public class TsbzJxzxmdServiceImpl implements ITsbzJxzxmdService
* @return 结果
*/
@Override
public int updateTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd)
{
public int updateTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd) {
return tsbzJxzxmdMapper.updateTsbzJxzxmd(tsbzJxzxmd);
}
@ -76,8 +72,7 @@ public class TsbzJxzxmdServiceImpl implements ITsbzJxzxmdService
* @return 结果
*/
@Override
public int deleteTsbzJxzxmdByIds(Long[] ids)
{
public int deleteTsbzJxzxmdByIds(Long[] ids) {
return tsbzJxzxmdMapper.deleteTsbzJxzxmdByIds(ids);
}
@ -88,8 +83,18 @@ public class TsbzJxzxmdServiceImpl implements ITsbzJxzxmdService
* @return 结果
*/
@Override
public int deleteTsbzJxzxmdById(Long id)
{
public int deleteTsbzJxzxmdById(Long id) {
return tsbzJxzxmdMapper.deleteTsbzJxzxmdById(id);
}
/**
* 查询见习之星名单列表
*
* @param tsbzJxzxmd 见习之星名单
* @return 见习之星名单集合
*/
@Override
public List<TsbzJxzxmd> selectTsbzJxzxmdKhjdList(TsbzJxzxmd tsbzJxzxmd) {
return tsbzJxzxmdMapper.selectTsbzJxzxmdKhjdList(tsbzJxzxmd);
}
}

36
ruoyi-system/src/main/resources/mapper/jxjs/TsbzJxzxmdMapper.xml
View File

@ -10,6 +10,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="nf" column="nf" />
<result property="createuserid" column="createuserid" />
<result property="createTime" column="create_time" />
<result property="bfb" column="bfb" />
<result property="faid" column="faid" />
<association property="tsbzJxjsjbxx" column="jsid" javaType="TsbzJxjsjbxx" resultMap="TsbzJxjsjbxxResult"/>
</resultMap>
<resultMap type="TsbzJxjsjbxx" id="TsbzJxjsjbxxResult">
<result property="id" column="id"/>
<result property="otherid" column="otherid"/>
<result property="name" column="name"/>
<result property="jxbh" column="jxbh"/>
<result property="xb" column="xb"/>
<result property="csrq" column="csrq"/>
<result property="email" column="email"/>
<result property="phone" column="phone"/>
<result property="yzbm" column="yzbm"/>
<result property="zzmm" column="zzmm"/>
<result property="mz" column="mz"/>
<result property="prdwid" column="prdwid"/>
<result property="prdwmc" column="prdwmc"/>
<result property="jdxid" column="jdxid"/>
<result property="rjxd" column="rjxd"/>
<result property="rjxk" column="rjxk"/>
<result property="rjnj" column="rjnj"/>
<result property="byyx" column="byyx"/>
<result property="xl" column="xl"/>
<result property="xw" column="xw"/>
<result property="sfsfs" column="sfsfs"/>
<result property="lqnf" column="lqnf"/>
<result property="createTime" column="create_time"/>
</resultMap>
<sql id="selectTsbzJxzxmdVo">
@ -68,4 +97,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
<select id="selectTsbzJxzxmdKhjdList" parameterType="TsbzJxzxmd" resultMap="TsbzJxzxmdResult">
select b.id, b.otherid, b.name, b.jxbh, b.xb, b.csrq, b.email, b.phone, b.yzbm, b.zzmm, b.mz, b.prdwid, b.prdwmc, b.jdxid, b.rjxd, b.rjxk, b.rjnj, b.byyx, b.xl, b.xw, b.sfsfs, b.lqnf, b.create_time,
(select count(*)from tsbz_jxzxkhgcsj where faid=#{faid} and createuserid=a.jsid)/(select count(*) from tsbz_jxzxkhzbx where faid=#{faid}) bfb from tsbz_jxzxmd a
left join tsbz_jxjsjbxx b on a.jsid=b.id
where a.nf=#{nf}
</select>
</mapper>

18
ruoyi-ui/src/api/jxzxkhgl/statistics.js Normal file
View File

@ -0,0 +1,18 @@
import request from '@/utils/request'
// 查询见习之星名单列表
export function listJxzxKhjd(query) {
return request({
url: '/jxzxkhgl/statistics/list',
method: 'get',
params: query
})
}
// 查询见习之星名单详细
export function getJxzxKhjd(id) {
return request({
url: '/jxzxkhgl/statistics/' + id,
method: 'get'
})
}

178
ruoyi-ui/src/views/jxzxkhgl/statistics/index.vue Normal file
View File

@ -0,0 +1,178 @@
<template>
<div class="app-container">
<el-form
:model="queryParams"
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="考核方案" prop="faid">
<el-select v-model="queryParams.faid" size="small">
<el-option
v-for="item in jxzxkhfaOptions"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="选择学校" prop="prdwid">
<el-input
v-model="queryParams.prdwid"
placeholder="请选择学校"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="选择教师" prop="jsid">
<el-input
v-model="queryParams.jsid"
placeholder="请输入教师"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="jzxzkhjdList">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="编号" align="center" prop="id" /> -->
<el-table-column label="姓名" align="center" prop="tsbzJxjsjbxx.name" />
<el-table-column prop="bfb" label="完成进度">
<template slot-scope="scope">
<el-progress :text-inside="true" :stroke-width="24" :percentage="scope.row.bfb*100" status="success"></el-progress>
</template>
</el-table-column>
<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="handleUpdate(scope.row)"
v-hasPermi="['jxzxkhgl:statistics:edit']"
>详情</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改考核审核过程对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listJxzxKhjd, getJxzxKhjd } from "@/api/jxzxkhgl/statistics";
import { listJxzxkhfa, getJxzxkhfa } from "@/api/jxzxkhgl/jxzxkhfa";
export default {
name: "Jzxzkhjd",
data() {
return {
//默认方案id
defaultFaid: "",
//默认方案年份
defaultNf: "",
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 考核进度表格数据
jzxzkhjdList: [],
//考核方案
jxzxkhfaOptions: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
faid: null,
nf: null,
},
// 查询参数
queryParams_fa: {
status: null,
},
// 表单参数
form: {},
// 表单校验
rules: {},
};
},
created() {
this.getKhfa();
},
methods: {
/** 查询考核审核过程列表 */
getList() {
this.loading = true;
listJxzxKhjd(this.queryParams).then((response) => {
console.log(response.rows);
this.jzxzkhjdList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//考核方案
async getKhfa() {
await listJxzxkhfa(this.queryParams_fa).then((response) => {
this.jxzxkhfaOptions = response.rows;
console.log(response.rows);
this.defaultFaid = response.rows[0].id;
this.queryParams.faid = this.defaultFaid;
this.defaultNf = response.rows[0].khnf;
this.queryParams.nf = this.defaultNf;
this.getList();
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.queryParams.faid = this.defaultFaid;
this.queryParams.nf = this.defaultNf;
this.handleQuery();
},
},
};
</script>