2023.6.17

1. 完成了实验审核
This commit is contained in:
KaiyuanOSG 2023-06-17 11:33:30 +08:00
parent e44e7d9afb
commit c6c30a9934
5 changed files with 48 additions and 38 deletions

View File

@ -15,6 +15,7 @@ public class ExperimentFactory {
public static Experiment createExperiment(JSONObject jsonObject) {
Experiment experiment = new Experiment();
log.info("解析实验信息");
log.info("实验信息为:{}", jsonObject);
try {
experiment.setId(jsonObject.getInteger("id"));
} catch (Exception e) {

View File

@ -65,7 +65,7 @@ public class BorrowInfoController {
if (borrowInfo != null) {
borrowInfo.setTime(jsonObject.getString("time"));
}
log.error("borrowInfo: " + borrowInfo);
return borrowInfoService.getBorrowInfo(borrowInfo, pageNum, pageSize);
}
}

View File

@ -42,7 +42,8 @@ public class Experiment implements Serializable {
* 申请时间
*/
private Date applyTime;
@TableField(exist = false)
private String applyTimeStr;
/**
* 申请人
*/

View File

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sdut.labex.entity.Experiment;
import com.sdut.labex.mapper.ExperimentsMapper;
import com.sdut.labex.service.ExperimentsService;
import com.sdut.labex.utils.FormatDate;
import com.sdut.labex.utils.ResVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@ -85,8 +86,14 @@ public class ExperimentsServiceImpl extends ServiceImpl<ExperimentsMapper, Exper
log.info("getExperiments: experiment = " + experiment + ", pageNum = " + pageNum + ", pageSize = " + pageSize);
Page<Experiment> page = new Page<>(pageNum, pageSize);
experimentsMapper.getExperimentsByPage(page, experiment);
List<Experiment> list = page.getRecords();
for (Experiment e : list) {
e.setApplyTimeStr(FormatDate.formatDate(e.getApplyTime()));
}
Map<String, Object> res = new HashMap<>();
res.put("list", page.getRecords());
res.put("list", list);
res.put("total", page.getTotal());
res.put("current", page.getCurrent());
return ResVo.ok(res);

View File

@ -1,11 +1,9 @@
<template>
<el-table :data="admitlist" stripe border v-loading="loading" :highlight-current-row="true">
<el-table-column align="center" prop="date" label="日期" width="120" />
<el-table-column align="center" prop="time" label="时间" width="120" />
<el-table-column align="center" prop="roomName" label="教室名称" width="100" />
<el-table-column align="center" prop="reason" label="用途" width="150"/>
<el-table-column align="center" prop="name" label="借用人" />
<el-table-column align="center" prop="applyDate" label="申请时间" width="180"/>
<el-table :data="admitList" stripe border v-loading="loading" :highlight-current-row="true">
<el-table-column align="center" prop="name" label="项目名称"/>
<el-table-column align="center" prop="className" label="教学班"/>
<el-table-column align="center" prop="applyUser" label="申请人"/>
<el-table-column align="center" prop="applyTimeStr" label="申请时间"/>
<el-table-column align="center" label="操作">
<template #default="scope">
<el-button type="success" @click="access(scope.row.id)" v-show="userInfo.role === 'admin'">允许</el-button>
@ -20,16 +18,16 @@ import {ElMessage} from "element-plus";
export default {
name: "Admit",
data(){
return{
data() {
return {
loading: true,
userInfo:{
userId:'',
role:'',
username:'',
userDepart:'',
userInfo: {
userId: '',
role: '',
username: '',
userDepart: '',
},
admitlist:[],
admitList: [],
}
},
mounted() {
@ -37,54 +35,57 @@ export default {
this.userInfo.userId = window.sessionStorage.getItem("userId");
this.getAllAdmit()
},
methods:{
getAllAdmit(){
methods: {
getAllAdmit() {
this.loading = true;
this.$http({
url:'/admit',
method:'get',
}).then(({data})=>{
if (data.code !== 200){
url: '/experiments/1/10',
method: 'post',
data: {
status: 0
}
}).then(({data}) => {
if (data.code !== 200) {
ElMessage({
message: '信息获取失败',
type: 'error',
})
}else {
this.admitlist = data.list;
} else {
this.admitList = data.list;
}
this.loading = false;
})
},
access(id){
access(id) {
this.loading = true;
this.$http({
url:'/admit/access/' + id,
method:'put',
}).then(({data})=>{
if (data.code !== 200){
url: '/isAdmitted/' + id + '/1',
method: 'put',
}).then(({data}) => {
if (data.code !== 200) {
ElMessage({
message: '操作失败',
type: 'error',
})
}else {
} else {
this.getAllAdmit();
}
this.loading = false;
})
},
deny(id){
deny(id) {
this.loading = true;
this.$http({
url:'/admit/deny/' + id,
method:'put',
}).then(({data})=>{
if (data.code !== 200){
url: '/isAdmitted/' + id + '/2',
method: 'put',
}).then(({data}) => {
if (data.code !== 200) {
ElMessage({
message: '操作失败',
type: 'error',
})
}else {
} else {
this.getAllAdmit();
}
this.loading = false;