Skip to content

Z
zhengyuan-danger-chemistry-manage
Commit 90556ae9 authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

访客和承包商考试统计 gengdidi

parent f68cc9cf
Hide whitespace changes
Inline Side-by-side
Showing with 287 additions and 11 deletions
danger-manage-system/src/main/java/com/zehong/system/domain/TContractorTrainResult.java
View file @ 90556ae9
......@@ -37,13 +37,13 @@ public class TContractorTrainResult extends BaseEntity
private String phoneNum;
/** 考试开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "考试开始时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "考试开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date testBeginTime;
/** 考试结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "考试结束时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "考试结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date testEndTime;
/** 答对数量 */
......
danger-manage-system/src/main/java/com/zehong/system/service/impl/TContractorTrainCourseTopicServiceImpl.java
View file @ 90556ae9
package com.zehong.system.service.impl;
import java.util.List;
import com.zehong.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zehong.system.mapper.TContractorTrainCourseTopicMapper;
import com.zehong.system.domain.TContractorTrainCourse;
import com.zehong.system.domain.TContractorTrainCourseTopic;
import com.zehong.system.mapper.TContractorTrainCourseMapper;
import com.zehong.system.mapper.TContractorTrainCourseTopicMapper;
import com.zehong.system.service.ITContractorTrainCourseTopicService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
/**
* 承包商及访客培训题库Service业务层处理
......@@ -19,6 +24,8 @@ public class TContractorTrainCourseTopicServiceImpl implements ITContractorTrain
{
@Autowired
private TContractorTrainCourseTopicMapper tContractorTrainCourseTopicMapper;
@Resource
private TContractorTrainCourseMapper tContractorTrainCourseMapper;
/**
* 查询承包商及访客培训题库
......@@ -51,8 +58,14 @@ public class TContractorTrainCourseTopicServiceImpl implements ITContractorTrain
* @return 结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int insertTContractorTrainCourseTopic(TContractorTrainCourseTopic tContractorTrainCourseTopic)
{
TContractorTrainCourse course = tContractorTrainCourseMapper.selectTContractorTrainCourseById(tContractorTrainCourseTopic.getContractorCourseId());
if(course!=null){
course.setTopicNum(course.getTopicNum()+1);
tContractorTrainCourseMapper.updateTContractorTrainCourse(course);
}
tContractorTrainCourseTopic.setCreateTime(DateUtils.getNowDate());
return tContractorTrainCourseTopicMapper.insertTContractorTrainCourseTopic(tContractorTrainCourseTopic);
}
......@@ -76,8 +89,18 @@ public class TContractorTrainCourseTopicServiceImpl implements ITContractorTrain
* @return 结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int deleteTContractorTrainCourseTopicByIds(Long[] topicIds)
{
for(Long topicId : topicIds){
TContractorTrainCourseTopic topic = tContractorTrainCourseTopicMapper.selectTContractorTrainCourseTopicById(topicId);
TContractorTrainCourse course = tContractorTrainCourseMapper.selectTContractorTrainCourseById(topic.getContractorCourseId());
if(course!=null){
course.setTopicNum(course.getTopicNum() - 1);
tContractorTrainCourseMapper.updateTContractorTrainCourse(course);
}
}
return tContractorTrainCourseTopicMapper.deleteTContractorTrainCourseTopicByIds(topicIds);
}
......
danger-manage-system/src/main/resources/mapper/system/TContractorTrainResultMapper.xml
View file @ 90556ae9
......@@ -30,8 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="sex != null and sex != ''"> and sex = #{sex}</if>
<if test="phoneNum != null and phoneNum != ''"> and phone_num = #{phoneNum}</if>
<if test="testBeginTime != null "> and test_begin_time = #{testBeginTime}</if>
<if test="testEndTime != null "> and test_end_time = #{testEndTime}</if>
<if test="testBeginTime != null and testEndTime != null"> and test_begin_time BETWEEN #{testBeginTime} AND #{testEndTime}</if>
<if test="score != null and score != ''"> and score = #{score}</if>
<if test="isQualified != null and isQualified != ''"> and is_qualified = #{isQualified}</if>
</where>
......
danger-manage-web/src/api/contractTrain/contractTrainResult.js 0 → 100644
View file @ 90556ae9
import request from '@/utils/request'
// 查询承包商及访客培训考试结果详情列表
export function listResult(query) {
return request({
url: '/system/result/list',
method: 'get',
params: query
})
}
// 查询承包商及访客培训考试结果详情详细
export function getResult(resultId) {
return request({
url: '/system/result/' + resultId,
method: 'get'
})
}
// 新增承包商及访客培训考试结果详情
export function addResult(data) {
return request({
url: '/system/result',
method: 'post',
data: data
})
}
// 修改承包商及访客培训考试结果详情
export function updateResult(data) {
return request({
url: '/system/result',
method: 'put',
data: data
})
}
// 删除承包商及访客培训考试结果详情
export function delResult(resultId) {
return request({
url: '/system/result/' + resultId,
method: 'delete'
})
}
// 导出承包商及访客培训考试结果详情
export function exportResult(query) {
return request({
url: '/system/result/export',
method: 'get',
params: query
})
}
\ No newline at end of file
danger-manage-web/src/views/educationPlanExam/testStat/index.vue
View file @ 90556ae9
......@@ -181,7 +181,8 @@
dataKind: "",
releaseTimeBegin: "",
releaseTimeEnd: ""
}
};
this.getTestList();
},
courseDetail(courseId){
this.testStatDetailOpen = true;
......
danger-manage-web/src/views/educationPlanExam/visitorTestStat/index.vue 0 → 100644
View file @ 90556ae9
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="姓名" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入姓名"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="所属单位" prop="beyondUnit">
<el-input
v-model="queryParams.beyondUnit"
placeholder="请输入所属单位"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="考试时间" prop="releaseTimeBegin">
<el-date-picker
v-model="testTime"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
@change="dateFormat">
</el-date-picker>
</el-form-item>
<el-form-item label="是否合格" prop="isQualified">
<el-select v-model="queryParams.isQualified" placeholder="请选择" clearable size="small">
<el-option label="合格" value="0" />
<el-option label="不合格" value="1" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" 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="resultList">
<el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="所属单位" align="center" prop="beyondUnit" />
<el-table-column label="性别" align="center" prop="sex">
<template slot-scope="scope">
<span v-if="scope.row.sex == '0'">男</span>
<span v-if="scope.row.sex == '1'">女</span>
</template>
</el-table-column>
<el-table-column label="手机号" align="center" prop="phoneNum" />
<el-table-column label="考试开始时间" align="center" prop="testBeginTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.testBeginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="考试结束时间" align="center" prop="testEndTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.testEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="正确率" align="center" prop="score">
<template slot-scope="scope">
<span>{{Math.round(scope.row.score/topicNum* 100)}}%</span>
</template>
</el-table-column>
<el-table-column label="是否合格" align="center" prop="isQualified">
<template slot-scope="scope">
<span v-if="scope.row.isQualified == '0'">合格</span>
<span v-if="scope.row.isQualified == '1'">不合格</span>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</template>
<script>
import { listResult, getResult, delResult, addResult, updateResult, exportResult } from "@/api/contractTrain/contractTrainResult";
import {listCourse} from "@/api/contractTrain/contractTrain";
export default {
name: "Result",
components: {
},
data() {
return {
// 遮罩层
loading: true,
// 导出遮罩层
exportLoading: false,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 承包商及访客培训考试结果详情表格数据
resultList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
beyondUnit: null,
name: null,
sex: null,
phoneNum: null,
testBeginTime: null,
testEndTime: null,
score: null,
isQualified: null,
},
testTime: "",
//题目数量
topicNum: 0
};
},
created() {
this.getList();
this.getQualifiedNum();
},
methods: {
/** 查询承包商及访客培训考试结果详情列表 */
getList() {
this.loading = true;
console.log("this.queryParams---",this.queryParams)
listResult(this.queryParams).then(response => {
this.resultList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
resultId: null,
beyondUnit: null,
name: null,
sex: null,
phoneNum: null,
testBeginTime: null,
testEndTime: null,
score: null,
isQualified: null,
createTime: null,
isDel: null,
remark: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.testTime = "";
this.queryParams.testBeginTime = "";
this.queryParams.testEndTime = "";
this.handleQuery();
},
dateFormat(picker){
this.queryParams.testBeginTime = picker[0];
this.queryParams.testEndTime = picker[1];
},
getQualifiedNum(){
listCourse().then(res =>{
if(res.code == 200){
this.topicNum = res.rows[0].topicNum;
}
})
}
}
};
</script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment