2023.6.17
1. 完成了实验审核
This commit is contained in:
parent
e44e7d9afb
commit
c6c30a9934
@ -15,6 +15,7 @@ public class ExperimentFactory {
|
|||||||
public static Experiment createExperiment(JSONObject jsonObject) {
|
public static Experiment createExperiment(JSONObject jsonObject) {
|
||||||
Experiment experiment = new Experiment();
|
Experiment experiment = new Experiment();
|
||||||
log.info("解析实验信息");
|
log.info("解析实验信息");
|
||||||
|
log.info("实验信息为:{}", jsonObject);
|
||||||
try {
|
try {
|
||||||
experiment.setId(jsonObject.getInteger("id"));
|
experiment.setId(jsonObject.getInteger("id"));
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
@ -65,7 +65,7 @@ public class BorrowInfoController {
|
|||||||
if (borrowInfo != null) {
|
if (borrowInfo != null) {
|
||||||
borrowInfo.setTime(jsonObject.getString("time"));
|
borrowInfo.setTime(jsonObject.getString("time"));
|
||||||
}
|
}
|
||||||
log.error("borrowInfo: " + borrowInfo);
|
|
||||||
return borrowInfoService.getBorrowInfo(borrowInfo, pageNum, pageSize);
|
return borrowInfoService.getBorrowInfo(borrowInfo, pageNum, pageSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -42,7 +42,8 @@ public class Experiment implements Serializable {
|
|||||||
* 申请时间
|
* 申请时间
|
||||||
*/
|
*/
|
||||||
private Date applyTime;
|
private Date applyTime;
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String applyTimeStr;
|
||||||
/**
|
/**
|
||||||
* 申请人
|
* 申请人
|
||||||
*/
|
*/
|
||||||
|
@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|||||||
import com.sdut.labex.entity.Experiment;
|
import com.sdut.labex.entity.Experiment;
|
||||||
import com.sdut.labex.mapper.ExperimentsMapper;
|
import com.sdut.labex.mapper.ExperimentsMapper;
|
||||||
import com.sdut.labex.service.ExperimentsService;
|
import com.sdut.labex.service.ExperimentsService;
|
||||||
|
import com.sdut.labex.utils.FormatDate;
|
||||||
import com.sdut.labex.utils.ResVo;
|
import com.sdut.labex.utils.ResVo;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Service;
|
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);
|
log.info("getExperiments: experiment = " + experiment + ", pageNum = " + pageNum + ", pageSize = " + pageSize);
|
||||||
Page<Experiment> page = new Page<>(pageNum, pageSize);
|
Page<Experiment> page = new Page<>(pageNum, pageSize);
|
||||||
experimentsMapper.getExperimentsByPage(page, experiment);
|
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<>();
|
Map<String, Object> res = new HashMap<>();
|
||||||
res.put("list", page.getRecords());
|
res.put("list", list);
|
||||||
res.put("total", page.getTotal());
|
res.put("total", page.getTotal());
|
||||||
res.put("current", page.getCurrent());
|
res.put("current", page.getCurrent());
|
||||||
return ResVo.ok(res);
|
return ResVo.ok(res);
|
||||||
|
@ -1,11 +1,9 @@
|
|||||||
<template>
|
<template>
|
||||||
<el-table :data="admitlist" stripe border v-loading="loading" :highlight-current-row="true">
|
<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="name" label="项目名称"/>
|
||||||
<el-table-column align="center" prop="time" label="时间" width="120" />
|
<el-table-column align="center" prop="className" label="教学班"/>
|
||||||
<el-table-column align="center" prop="roomName" label="教室名称" width="100" />
|
<el-table-column align="center" prop="applyUser" label="申请人"/>
|
||||||
<el-table-column align="center" prop="reason" label="用途" width="150"/>
|
<el-table-column align="center" prop="applyTimeStr" label="申请时间"/>
|
||||||
<el-table-column align="center" prop="name" label="借用人" />
|
|
||||||
<el-table-column align="center" prop="applyDate" label="申请时间" width="180"/>
|
|
||||||
<el-table-column align="center" label="操作">
|
<el-table-column align="center" label="操作">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-button type="success" @click="access(scope.row.id)" v-show="userInfo.role === 'admin'">允许</el-button>
|
<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 {
|
export default {
|
||||||
name: "Admit",
|
name: "Admit",
|
||||||
data(){
|
data() {
|
||||||
return{
|
return {
|
||||||
loading: true,
|
loading: true,
|
||||||
userInfo:{
|
userInfo: {
|
||||||
userId:'',
|
userId: '',
|
||||||
role:'',
|
role: '',
|
||||||
username:'',
|
username: '',
|
||||||
userDepart:'',
|
userDepart: '',
|
||||||
},
|
},
|
||||||
admitlist:[],
|
admitList: [],
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
@ -37,54 +35,57 @@ export default {
|
|||||||
this.userInfo.userId = window.sessionStorage.getItem("userId");
|
this.userInfo.userId = window.sessionStorage.getItem("userId");
|
||||||
this.getAllAdmit()
|
this.getAllAdmit()
|
||||||
},
|
},
|
||||||
methods:{
|
methods: {
|
||||||
getAllAdmit(){
|
getAllAdmit() {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
this.$http({
|
this.$http({
|
||||||
url:'/admit',
|
url: '/experiments/1/10',
|
||||||
method:'get',
|
method: 'post',
|
||||||
}).then(({data})=>{
|
data: {
|
||||||
if (data.code !== 200){
|
status: 0
|
||||||
|
}
|
||||||
|
}).then(({data}) => {
|
||||||
|
if (data.code !== 200) {
|
||||||
ElMessage({
|
ElMessage({
|
||||||
message: '信息获取失败',
|
message: '信息获取失败',
|
||||||
type: 'error',
|
type: 'error',
|
||||||
})
|
})
|
||||||
}else {
|
} else {
|
||||||
this.admitlist = data.list;
|
this.admitList = data.list;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
access(id){
|
access(id) {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
this.$http({
|
this.$http({
|
||||||
url:'/admit/access/' + id,
|
url: '/isAdmitted/' + id + '/1',
|
||||||
method:'put',
|
method: 'put',
|
||||||
}).then(({data})=>{
|
}).then(({data}) => {
|
||||||
if (data.code !== 200){
|
if (data.code !== 200) {
|
||||||
ElMessage({
|
ElMessage({
|
||||||
message: '操作失败',
|
message: '操作失败',
|
||||||
type: 'error',
|
type: 'error',
|
||||||
})
|
})
|
||||||
}else {
|
} else {
|
||||||
this.getAllAdmit();
|
this.getAllAdmit();
|
||||||
}
|
}
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
deny(id){
|
deny(id) {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
this.$http({
|
this.$http({
|
||||||
url:'/admit/deny/' + id,
|
url: '/isAdmitted/' + id + '/2',
|
||||||
method:'put',
|
method: 'put',
|
||||||
}).then(({data})=>{
|
}).then(({data}) => {
|
||||||
if (data.code !== 200){
|
if (data.code !== 200) {
|
||||||
ElMessage({
|
ElMessage({
|
||||||
message: '操作失败',
|
message: '操作失败',
|
||||||
type: 'error',
|
type: 'error',
|
||||||
})
|
})
|
||||||
}else {
|
} else {
|
||||||
this.getAllAdmit();
|
this.getAllAdmit();
|
||||||
}
|
}
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
|
Loading…
Reference in New Issue
Block a user