Skip to content

Z
zhengyuan-danger-chemistry-manage
Commit 27762a83 authored by zhangjianqian's avatar zhangjianqian
Browse files
Options

培训计划管理，修改

parent 5caa8611
Hide whitespace changes
Inline Side-by-side
Showing with 535 additions and 22 deletions
danger-manage-admin/src/main/java/com/zehong/web/controller/train/TTrainPlanController.java
View file @ 27762a83
package com.zehong.web.controller.train;
import java.util.List;
import java.util.Map;
import com.alibaba.fastjson.JSON;
import com.zehong.system.domain.vo.PlanVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -87,7 +89,8 @@ public class TTrainPlanController extends BaseController
{
TTrainPlan tTrainPlan = new TTrainPlan();
tTrainPlan.setPlanName(planVo.getPlanName());
return AjaxResult.success(tTrainPlanService.insertTTrainPlan(tTrainPlan,planVo.getPostIds()));
List<Map<String,Object>> list = (List<Map<String,Object>>) JSON.parse(planVo.getPeopleList());
return AjaxResult.success(tTrainPlanService.insertTTrainPlan(tTrainPlan,list));
}
/**
......@@ -104,7 +107,8 @@ public class TTrainPlanController extends BaseController
TTrainPlan tTrainPlan = new TTrainPlan();
tTrainPlan.setPlanId(planVo.getPlanId());
tTrainPlan.setPlanName(planVo.getPlanName());
return toAjax(tTrainPlanService.updateTTrainPlan(tTrainPlan,planVo.getPostIds()));
List<Map<String,Object>> list = (List<Map<String,Object>>) JSON.parse(planVo.getPeopleList());
return toAjax(tTrainPlanService.updateTTrainPlan(tTrainPlan,list));
}
/**
......
danger-manage-system/src/main/java/com/zehong/system/domain/vo/PlanVo.java
View file @ 27762a83
......@@ -10,5 +10,5 @@ public class PlanVo {
private Long[] postIds;
private String peopleList;
}
danger-manage-system/src/main/java/com/zehong/system/mapper/TTrainPlanMapper.java
View file @ 27762a83
......@@ -52,7 +52,7 @@ public interface TTrainPlanMapper
* @param postIds
* @return
*/
public int insetsPlanPost(@Param("planId") Long planId, @Param("postIds")Long[] postIds);
public int insetsPlanPost(@Param("planId") Long planId, @Param("list")List<Map<String,Object>> list);
/**
* 删除计划职位
......
danger-manage-system/src/main/java/com/zehong/system/service/ITTrainPlanService.java
View file @ 27762a83
package com.zehong.system.service;
import java.util.List;
import java.util.Map;
import com.zehong.system.domain.TTrainPlan;
/**
......@@ -34,7 +36,7 @@ public interface ITTrainPlanService
* @param tTrainPlan 培训计划
* @return 结果
*/
public Long insertTTrainPlan(TTrainPlan tTrainPlan,Long[] postIds);
public Long insertTTrainPlan(TTrainPlan tTrainPlan,List<Map<String,Object>> list);
/**
* 修改培训计划
......@@ -42,7 +44,7 @@ public interface ITTrainPlanService
* @param tTrainPlan 培训计划
* @return 结果
*/
public int updateTTrainPlan(TTrainPlan tTrainPlan,Long[] postIds);
public int updateTTrainPlan(TTrainPlan tTrainPlan,List<Map<String,Object>> list);
/**
* 批量删除培训计划
......
danger-manage-system/src/main/java/com/zehong/system/service/impl/TTrainPlanServiceImpl.java
View file @ 27762a83
......@@ -64,11 +64,11 @@ public class TTrainPlanServiceImpl implements ITTrainPlanService
*/
@Override
@Transactional
public Long insertTTrainPlan(TTrainPlan tTrainPlan,Long[] postIds)
public Long insertTTrainPlan(TTrainPlan tTrainPlan,List<Map<String,Object>> list)
{
tTrainPlan.setCreateTime(DateUtils.getNowDate());
int a = tTrainPlanMapper.insertTTrainPlan(tTrainPlan);
tTrainPlanMapper.insetsPlanPost(tTrainPlan.getPlanId(),postIds);
tTrainPlanMapper.insetsPlanPost(tTrainPlan.getPlanId(),list);
return tTrainPlan.getPlanId();
}
......@@ -80,11 +80,11 @@ public class TTrainPlanServiceImpl implements ITTrainPlanService
*/
@Override
@Transactional
public int updateTTrainPlan(TTrainPlan tTrainPlan,Long[] postIds)
public int updateTTrainPlan(TTrainPlan tTrainPlan,List<Map<String,Object>> list)
{
int a = tTrainPlanMapper.updateTTrainPlan(tTrainPlan);
tTrainPlanMapper.deletePlanPost(tTrainPlan.getPlanId());
tTrainPlanMapper.insetsPlanPost(tTrainPlan.getPlanId(),postIds);
tTrainPlanMapper.insetsPlanPost(tTrainPlan.getPlanId(),list);
return a;
}
......
danger-manage-system/src/main/resources/mapper/system/TTrainPlanMapper.xml
View file @ 27762a83
......@@ -52,8 +52,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</insert>
<insert id="insetsPlanPost">
INSERT INTO t_train_plan_post(plan_id,post_id) VALUES
<foreach collection="postIds" separator="," item="item">
(#{planId},#{item})
<foreach collection="list" separator="," item="item">
(#{planId},#{item.staffId})
</foreach>
</insert>
......@@ -84,8 +84,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<select id="selectTrainPostByPlanId" parameterType="Long" resultType="com.zehong.system.domain.vo.PlanPostVo">
SELECT p.`post_id` as postId,p.`post_name` as postName,IF(pp.`post_id` IS NULL,FALSE,TRUE) AS ischeck FROM sys_post p
LEFT JOIN t_train_plan_post pp ON ( p.`post_id` = pp.`post_id` AND pp.`plan_id` = #{planId} )
SELECT u.user_id AS postId, u.staff_name AS postName,TRUE AS ischeck FROM
t_train_plan_post p LEFT JOIN sys_user u ON u.`user_id` = p.`post_id`
WHERE p.`plan_id` = #{planId}
</select>
<select id="selectAlluserByplanId" resultType="java.lang.String">
SELECT post_id FROM t_train_plan_post WHERE plan_id =#{planId}
......
danger-manage-web/src/api/educationPlanExam/trainingProgram.js
View file @ 27762a83
......@@ -52,5 +52,11 @@ export function deletePlan(query) {
params: query
})
}
export function getPlan(query) {
return request({
url: '/system/plan/'+ query,
method: 'get',
})
}
danger-manage-web/src/views/educationPlanExam/trainingProgram/components/Dia.vue 0 → 100644
View file @ 27762a83
<!--
* @Author: 纪泽龙 jizelong@qq.com
* @Date: 2022-09-22 10:38:49
* @LastEditors: 纪泽龙 jizelong@qq.com
* @LastEditTime: 2022-12-19 14:01:37
* @FilePath: /danger-manage-web/src/views/lessonsProgram/components/addLesson.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
<el-dialog
class="add-lession"
:title="title"
:visible.sync="visible"
width="1020px"
:close-on-click-modal="false"
:close-on-press-escape="false"
:before-close="dialogCancel"
@closed="closeFinished"
destroy-on-close
>
<div v-if="visible" ref="myBody" class="body">
<transition name="fade" mode="out-in">
<component
:is="currentComponent"
:bankId.sync="bankId"
:subjectId.sync="subjectId"
ref="current"
></component>
</transition>
<!-- <Lesson ref='lesson'/> -->
<!-- <AddQuestion />
<QuestionList/> -->
</div>
<div slot="footer" class="dialog-footer">
<!--<el-button-->
<!--type="primary"-->
<!--v-if="this.componentsNum == 1 || this.componentsNum == 3"-->
<!--@click="save"-->
<!--&gt;保存</el-button-->
<!--&gt;-->
<!--<el-button type="primary" @click="saveAndNext">{{-->
<!--saveNextText-->
<!--}}</el-button>-->
<el-button
v-if="this.componentsNum == 2"
type="primary"
@click="savePlan"
>{{ "确认" }}</el-button
>
<el-button @click="dialogCancel">取消</el-button>
</div>
</el-dialog>
</template>
<script>
import Lesson from "./Lesson";
import AddQuestion from "../../textPaper/components/AddQuestion";
import QuestionList from "../../textPaper/components/QuestionList";
export default {
name: "AnswerLesson",
props: {
visible: {
type: Boolean,
default: false,
},
componentsNum: {
type: Number,
default: 1,
},
bankId: {
type: Number,
},
},
// components: {
// Lesson,
// AddQuestion,
// QuestionList,
// },
data() {
return {
title: "录入课程",
currentComponent: Lesson,
// 当前题目查看
subjectId: null,
};
},
watch: {
componentsNum: {
handler(num) {
if (num === 1) {
this.currentComponent = Lesson;
if (this.bankId) {
this.title = "修改课程";
} else {
this.title = "新增课程";
}
} else if (num === 2) {
this.currentComponent = QuestionList;
this.title = "题目列表";
} else {
this.currentComponent = AddQuestion;
if (this.subjectId) {
this.title = "修改题目";
} else {
this.title = "新增题目";
}
}
},
deep: true,
},
},
computed: {
saveNextText() {
let text;
if (this.componentsNum == 1) {
text = "保存并录入题目";
} else if (this.componentsNum == 2) {
text = "录入考题";
} else {
text = "保存并录入下一题";
}
return text;
},
},
methods: {
saveBody() {
this.startHeight = this.$refs.myBody.offsetHeight - 55 + "px";
},
closeFinished() {},
// 关闭之后
// 只保存
save() {
// this.answerClear();
this.$refs.current.save();
},
savePlan() {
// this.answerClear();
this.$refs.current.savePlan();
},
// 保存并录入
saveAndNext() {
this.$refs.current.saveAndNext();
},
// 隐藏与显示dialog
dialogCancel() {
this.$emit("update:visible", false);
},
// 把ID改变了
changeCourseId(bankId) {
this.$emit("update:bankId", bankId);
},
// 改变当前组件
componentsNumChange(num) {
this.$emit("update:componentsNum", num);
},
answerClear() {
this.answerArr = [];
this.changeCourseId(null);
},
},
};
</script>
<style lang="scss" scoped>
.body {
width: 100%;
height: 100%;
padding-right: 40px;
padding-left: 36px;
}
</style>
danger-manage-web/src/views/educationPlanExam/trainingProgram/components/Item.vue
View file @ 27762a83
......@@ -93,7 +93,9 @@ export default {
methods: {
edit() {
// 编辑
this.$emit("edit", this.oldInfoData);
//console.log(this.infoData);
this.$parent.addClick(this.infoData);
//this.$emit("edit", this.oldInfoData);
},
save() {
if (this.infoData.planName == "") {
......@@ -177,7 +179,7 @@ export default {
transition: all 0.5s;
width: 93.2%;
max-width: 1600px;
height: 111px;
min-height: 111px;
border: 1px solid #cecece;
box-shadow: -4px 0px 0px 0px rgba(0, 0, 0, 0.1);
background: linear-gradient(
......@@ -196,6 +198,7 @@ export default {
height: 100%;
align-items: center;
justify-content: right;
margin-top: 25px;
.left-item {
transition: all 0.5s;
width: 200px;
......
danger-manage-web/src/views/educationPlanExam/trainingProgram/components/Lesson.vue 0 → 100644
View file @ 27762a83
<!--
* @Author: 纪泽龙 jizelong@qq.com
* @Date: 2022-09-22 10:59:44
* @LastEditors: 纪泽龙 jizelong@qq.com
* @LastEditTime: 2022-12-21 17:30:33
* @FilePath: /danger-manage-web/src/views/lessonsProgram/components/Lession.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
<div class="form-wrapper">
<el-form
class="form"
ref="form"
:model="form"
label-width="auto"
:rules="rules"
>
<div class="top flex">
<el-form-item label="计划名称" prop="bankName">
<el-input style="width: 500px" v-model="form.bankName"></el-input>
</el-form-item>
<!--<el-form-item label="开始时间" prop="releaseTime">-->
<!--<el-date-picker-->
<!--v-model="form.startTime"-->
<!--value-format="yyyy-MM-dd HH:mm:ss"-->
<!--type="datetime"-->
<!--placeholder="开始时间"-->
<!--default-time="12:00:00"-->
<!--&gt;-->
<!--</el-date-picker>-->
<!--</el-form-item>-->
</div>
<!--<el-form-item label="结束时间" prop="releaseTime">-->
<!--<el-date-picker-->
<!--v-model="form.endTime"-->
<!--value-format="yyyy-MM-dd HH:mm:ss"-->
<!--type="datetime"-->
<!--placeholder="结束时间"-->
<!--default-time="12:00:00"-->
<!--&gt;-->
<!--</el-date-picker>-->
<!--</el-form-item>-->
<el-form-item label="选择人员" prop="releaseTime">
<!-- table -->
<!-- jsonSelectNameList就是呗选中的人员的json -->
<!-- getPeopleList 是每次选中或者删除人员都会返回 一个所有人员列表的json串，[{staffId:staffId,staffName:staffName},{staffId:staffId,staffName:staffName}] -->
<!-- 要在jsonSelectNameList赋值完毕之后 调用一下 this.$refs.changePaple.changeNameList 135行 -->
<ChangePapel
ref="changePaple"
:jsonSelectNameList="jsonSelectNameList"
@getPeopleList="getPeopleList"
/>
</el-form-item>
</el-form>
</div>
</template>
<script>
import ChangePapel from "@/components/PeopleChange";
// import { mapGetters } from "vuex";
// import {
// addLessons,
// getLessonById,
// changeLesson,
// } from "@/api/educationPlanExam/lessonsProgram";
import {
listBank,
addBank,
updateBank,
getBank,
} from "@/api/educationPlanExam/questionBank";
// 所有部门
import { treeselect } from "@/api/system/dept";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import {
getPersonnel,
addPlan,
editPlan,
getPlanList,
getPlan
} from "@/api/educationPlanExam/trainingProgram";
export default {
name: "",
props: {
bankId: {
type: Number,
},
// jsonSelectNameList: {
// type: String,
// default:
// '[{"staffId":880,"staffName":"孙卓亚"},{"staffId":871,"staffName":"张玉宾"},{"staffId":869,"staffName":"李二朝"},{"staffId":870,"staffName":"盖永峰"},{"staffId":868,"staffName":"刘丽艳"},{"staffId":867,"staffName":"霍文俊"},{"staffId":866,"staffName":"刘志坚"},{"staffId":865,"staffName":"郝文权"},{"staffId":864,"staffName":"齐雪军"},{"staffId":852,"staffName":"刘江平"},{"staffId":853,"staffName":"谷建海"},{"staffId":851,"staffName":"丁振国"},{"staffId":850,"staffName":"齐江波"},{"staffId":849,"staffName":"周立新"},{"staffId":848,"staffName":"史志波"},{"staffId":847,"staffName":"王增波"},{"staffId":846,"staffName":"杨彦龙"},{"staffId":845,"staffName":"杨华国"},{"staffId":844,"staffName":"王青华"}]',
// },
},
components: {
ChangePapel,
},
data() {
return {
form: {
bankName: "",
// courseType: "",
// courseConent: "",
// video: "",
// enclosure: "",
deptId: null,
abc: 0,
},
// 参考人员
jsonSelectNameList: null,
peopleList:[],
// 归属部门列表
deptOptions: [],
fileListVideo: [],
fileListFile: [],
readOnly: false,
// selectNameList: [],
rules: {
bankName: [
{ required: true, trigger: "blur", message: "计划名称不能为空" },
],
deptId: [
{ required: true, trigger: "blur", message: "请选择所属部门" },
],
},
};
},
computed: {
// 获取课程类型
// ...mapGetters(["courseOptions"]),
},
created() {
if (this.bankId) {
this.getLessonById();
}
// 归属部门列表
// this.getTreeselect();
},
mounted() {
// this.jsonSelectNameList
// '[{"staffId":880,"staffName":"孙卓亚"},{"staffId":871,"staffName":"张玉宾"},{"staffId":869,"staffName":"李二朝"},{"staffId":870,"staffName":"盖永峰"},{"staffId":868,"staffName":"刘丽艳"},{"staffId":867,"staffName":"霍文俊"},{"staffId":866,"staffName":"刘志坚"},{"staffId":865,"staffName":"郝文权"},{"staffId":864,"staffName":"齐雪军"},{"staffId":852,"staffName":"刘江平"},{"staffId":853,"staffName":"谷建海"},{"staffId":851,"staffName":"丁振国"},{"staffId":850,"staffName":"齐江波"},{"staffId":849,"staffName":"周立新"},{"staffId":848,"staffName":"史志波"},{"staffId":847,"staffName":"王增波"},{"staffId":846,"staffName":"杨彦龙"},{"staffId":845,"staffName":"杨华国"},{"staffId":844,"staffName":"王青华"}]';
this.$refs.changePaple.changeNameList(this.jsonSelectNameList);
},
methods: {
// 添加课程
addLessons(data) {
if (!this.bankId) {
console.log(data);
return addBank(data);
} else {
console.log("修改");
return updateBank({ bankId: this.bankId, ...data });
}
},
// 复现
getLessonById() {
getPlan(this.bankId).then((res) => {
console.log("res", res);
if (res.code == 200) {
this.form = {
bankName: res.data.planName,
deptId: res.data.planId,
};
// const data = res.data;
// const { bankName, courseType, courseConent, video, enclosure } =
// data;
// this.form = {
// bankName,
// courseType,
// courseConent,
// video,
// enclosure,
// };
// this.fileListVideo = [
// {
// name: bankName + "视频",
// url: uploadfile,
// },
// ];
// this.fileListFile = [
// {
// name: bankName + "附件",
// url: uploadfile,
// },
// ];
}
});
},
// 获取参考人员的list
getPeopleList(list) {
console.log("参考人员", list);
this.peopleList = list;
},
savePlan(){
this.$refs.form.validate((valid) => {
if (valid) {
if(this.peopleList.length<3){
this.$message.error('请至少选择一个考试人员');
return
}
//console.log(this.peopleList);
this.form.peopleList = this.peopleList.toString();
this.form.planName = this.form.bankName;
console.log(this.form)
if(this.bankId!=null){
this.form.planId = this.bankId;
return editPlan(this.form).then((res) => {
if (res.code == 200) {
this.$parent.$parent.$parent.getPlanList();
}
});
}else {
return addPlan(this.form).then((res) => {
if (res.code == 200) {
this.$parent.$parent.$parent.getPlanList();
}
});
}
}
});
},
save(num = 2) {
// 因为富文本编辑器会残留<p><br></p>，所以要清空
// if (this.form.courseConent === "<p><br></p>") {
// this.form.courseConent = "";
// }
this.$refs.form.validate((valid) => {
if (valid) {
this.addLessons({ ...this.form }).then((res) => {
// 如果添加会传回来，就用传回来的，如果是修改本身就有，就用本身的
// console.log('res',res)
const bankId = this.bankId || res;
// if (res.code == 200) {
// 这样调比较纯函数一点
if (num == 2) {
this.$message({
message: "保存题库成功",
type: "success",
});
} else if (num == 3) {
this.$message({
message: "保存题库成功,请开始录入题目",
type: "success",
});
}
this.$parent.$parent.componentsNumChange(num);
this.$parent.$parent.changeCourseId(bankId);
this.$parent.$parent.$parent.getList();
return true;
// }
});
} else {
if (!this.form.deptId) {
document.querySelector(
".vue-treeselect__control"
).style.borderColor = "red";
} else {
document.querySelector(
".vue-treeselect__control"
).style.borderColor = "";
this.$refs.treeItem.clearValidate();
}
}
});
},
// 保存并进入题目
saveAndNext() {
this.save(3);
},
},
};
</script>
<style lang="scss" scoped>
.form-wrapper {
padding-top: 22px;
width: 100%;
height: 550px;
// overflow: hidden;
// padding-bottom: 10px;
margin-bottom: 20px;
// border-bottom: 1px solid #bbbbbb;
.top {
width: 100%;
justify-content: space-between;
}
}
</style>
danger-manage-web/src/views/educationPlanExam/trainingProgram/index.vue
View file @ 27762a83
......@@ -28,7 +28,7 @@
v-for="item in list"
:key="item.planId"
:infoData="item"
:personnelOptions="personnelOptions"
:personnelOptions="item.postIds"
@edit="edit"
@save="itemSave"
@deletePlan="deletePlan"
......@@ -60,16 +60,22 @@
</el-checkbox-group>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="dialogSubmitForm">确 定</el-button>
<el-button @click="dialogCancel">取 消</el-button>
</div>
</el-dialog>
<Dia
ref="Dia"
:componentsNum.sync="componentsNum"
:bankId.sync="bankId"
:visible.sync="dilogFlag"
/>
</div>
</template>
<script>
import Dia from "./components/Dia";
import Item from "./components/Item";
import {
getPersonnel,
......@@ -91,7 +97,7 @@ const personnelOptions = [
export default {
name: "trainingProgram",
components: {
Item,
Item,Dia
},
data() {
return {
......@@ -106,6 +112,10 @@ export default {
planName: "",
postIds: [],
},
componentsNum: 2,
// 点击的id，如果是新增为空
bankId: null,
dilogFlag: false,
rules: {
planName: [
{
......@@ -143,17 +153,20 @@ export default {
});
},
getPlanList() {
this.dilogFlag = false;
return getPlanList().then((res) => {
console.log(res.data);
this.list = res.data.map((item) => {
return {
planId: item.planId,
planName: item.planName,
postIds: item.postList
postIds: item.postList,
postList: item.postList
.filter((item) => item.ischeck)
.map((item) => item.postId),
};
});
console.log(this.list);
});
},
addPlan(plan) {
......@@ -214,8 +227,18 @@ export default {
this.isActiveId = 999;
},
changeList() {},
addClick() {
this.addOpen = true;
addClick(form) {
this.$refs.Dia.title = "新增培训计划";
this.componentsNum = 2;
this.bankId = null;
this.dilogFlag = true;
if(form.planId!=undefined){
//console.log("=======")
this.$refs.Dia.title = "修改培训计划";
this.bankId = form.planId;
}
//this.addOpen = true;
},
dialogSubmitForm() {
this.$refs["form"].validate((valid) => {
......
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