diff --git a/ruoyi-ui/src/api/benyi/mathtermplan.js b/ruoyi-ui/src/api/benyi/mathtermplan.js
new file mode 100644
index 000000000..6d18ac341
--- /dev/null
+++ b/ruoyi-ui/src/api/benyi/mathtermplan.js
@@ -0,0 +1,61 @@
+import request from '@/utils/request'
+
+// 查询游戏数学学期计划列表
+export function listMathtermplan(query) {
+ return request({
+ url: '/benyi/mathtermplan/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询游戏数学学期计划详细
+export function getMathtermplan(id) {
+ return request({
+ url: '/benyi/mathtermplan/' + id,
+ method: 'get'
+ })
+}
+
+// 新增游戏数学学期计划
+export function addMathtermplan(data) {
+ return request({
+ url: '/benyi/mathtermplan',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改游戏数学学期计划
+export function updateMathtermplan(data) {
+ return request({
+ url: '/benyi/mathtermplan',
+ method: 'put',
+ data: data
+ })
+}
+
+// 提交主题整合学期计划
+export function checkTermplan(id) {
+ return request({
+ url: '/benyi/mathtermplan/check/' + id,
+ method: 'post'
+ })
+}
+
+// 删除游戏数学学期计划
+export function delMathtermplan(id) {
+ return request({
+ url: '/benyi/mathtermplan/' + id,
+ method: 'delete'
+ })
+}
+
+// 导出游戏数学学期计划
+export function exportMathtermplan(query) {
+ return request({
+ url: '/benyi/mathtermplan/export',
+ method: 'get',
+ params: query
+ })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/benyi/child_preserve/index.vue b/ruoyi-ui/src/views/benyi/child_preserve/index.vue
index 47de43f53..1c7d209ec 100644
--- a/ruoyi-ui/src/views/benyi/child_preserve/index.vue
+++ b/ruoyi-ui/src/views/benyi/child_preserve/index.vue
@@ -387,26 +387,7 @@ export default {
};
},
created() {
- // const sid = this.$route.params && this.$route.params.id;
- // this.queryParams.schoolid = sid;
- // this.getDicts("sys_user_sex").then(response => {
- // this.sexOptions = response.data;
- // });
- // this.getDicts("sys_normal_disable").then(response => {
- // this.statusOptions = response.data;
- // });
- // this.getDicts("sys_dm_mz").then(response => {
- // this.mzOptions = response.data;
- // });
- // this.getDicts("sys_yes_no").then(response => {
- // this.ynOptions = response.data;
- // });
- // this.getDicts("sys_dm_ryqd").then(response => {
- // this.sourceOptions = response.data;
- // });
- // this.getDicts("sys_dm_jtgx").then((response) => {
- // this.jtgxOptions = response.data;
- // });
+
},
components: {
//省市区三级联动全局组件
@@ -417,26 +398,7 @@ export default {
onInput() {
this.$forceUpdate();
},
- // // 性别字典翻译
- // xbFormat(row, column) {
- // return this.selectDictLabel(this.sexOptions, row.xb);
- // },
- // // 字典翻译
- // mzFormat(row, column) {
- // return this.selectDictLabel(this.mzOptions, row.mz);
- // },
- // // 字典翻译
- // ynFormat(row, column) {
- // return this.selectDictLabel(this.ynOptions, row.learnEnglish);
- // },
- // // 字典翻译
- // sourceFormat(row, column) {
- // return this.selectDictLabel(this.sourceOptions, row.source);
- // },
- // // 字典翻译
- // statusFormat(row, column) {
- // return this.selectDictLabel(this.statusOptions, row.status);
- // },
+
// 字典翻译
classFormat(row, column) {
// return this.selectDictLabel(this.classOptions, row.classid);
diff --git a/ruoyi-ui/src/views/benyi/mathtermplan/index.vue b/ruoyi-ui/src/views/benyi/mathtermplan/index.vue
new file mode 100644
index 000000000..1a2198e56
--- /dev/null
+++ b/ruoyi-ui/src/views/benyi/mathtermplan/index.vue
@@ -0,0 +1,504 @@
+<template>
+ <div class="app-container">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ :inline="true"
+ label-width="68px"
+ >
+ <el-form-item label="班级编码" prop="classid">
+ <el-select v-model="queryParams.classid" placeholder="请选择班级">
+ <el-option
+ v-for="dict in classOptions"
+ :key="dict.bjbh"
+ :label="dict.bjmc"
+ :value="dict.bjbh"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="学年学期" prop="xnxq">
+ <el-select
+ v-model="queryParams.xnxq"
+ placeholder="请选择学年学期"
+ clearable
+ size="small"
+ >
+ <el-option
+ v-for="dict in xnxqOptions"
+ :key="dict.dictValue"
+ :label="dict.dictLabel"
+ :value="dict.dictValue"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="状态" prop="status">
+ <el-select
+ v-model="queryParams.status"
+ placeholder="请选择状态"
+ clearable
+ size="small"
+ >
+ <el-option
+ v-for="dict in statusOptions"
+ :key="dict.dictValue"
+ :label="dict.dictLabel"
+ :value="dict.dictValue"
+ />
+ </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-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAdd"
+ v-hasPermi="['benyi:mathtermplan:add']"
+ >新增</el-button
+ >
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="success"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="handleUpdate"
+ v-hasPermi="['benyi:mathtermplan:edit']"
+ >修改</el-button
+ >
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="danger"
+ icon="el-icon-delete"
+ size="mini"
+ :disabled="multiple"
+ @click="handleDelete"
+ v-hasPermi="['benyi:mathtermplan:remove']"
+ >删除</el-button
+ >
+ </el-col>
+ </el-row>
+
+ <el-table
+ v-loading="loading"
+ :data="mathtermplanList"
+ @selection-change="handleSelectionChange"
+ >
+ <el-table-column type="selection" width="55" align="center" :selectable="isShow" />
+ <el-table-column label="班级名称" align="center" prop="classid" :formatter="classFormat"/>
+ <el-table-column
+ label="计划名称"
+ align="center"
+ prop="name"
+ :show-overflow-tooltip="true"
+ >
+ <template slot-scope="scope">
+ <router-link
+ :to="'/benyi_course/mathtermplan/data/' + scope.row.id"
+ class="link-type"
+ >
+ <span>{{ scope.row.name }}</span>
+ </router-link>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="开始月份"
+ align="center"
+ prop="startmonth"
+ width="180"
+ >
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.startmonth, "{y}-{m}") }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="结束月份"
+ align="center"
+ prop="endmonth"
+ width="180"
+ >
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.endmonth, "{y}-{m}") }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="学年学期"
+ align="center"
+ prop="xnxq"
+ :formatter="xnxqFormat"
+ />
+ <el-table-column
+ label="状态"
+ align="center"
+ prop="status"
+ :formatter="statusFormat"
+ />
+ <el-table-column label="备注" align="center" prop="remark" />
+ <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-edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['benyi:mathtermplan:edit']"
+ v-show="isShow(scope.row)"
+ >修改</el-button
+ >
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['benyi:mathtermplan:remove']"
+ v-show="isShow(scope.row)"
+ >删除</el-button
+ >
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-check"
+ @click="handleCheck(scope.row)"
+ v-hasPermi="['benyi:mathtermplan:edit']"
+ v-show="isShow(scope.row)"
+ >提交</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-view"
+ @click="handleView(scope.row)"
+ v-hasPermi="['benyi:mathtermplan:query']"
+ :disabled=true
+ >预览</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>
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form-item label="月份" prop="startmonth">
+ <el-date-picker
+ v-model="form.startmonth"
+ type="monthrange"
+ range-separator="至"
+ start-placeholder="开始月份"
+ end-placeholder="结束月份"
+ value-format="yyyy-MM"
+ ></el-date-picker>
+ </el-form-item>
+ <el-form-item label="学年学期">
+ <el-select v-model="form.xnxq" placeholder="请选择学年学期">
+ <el-option
+ v-for="dict in xnxqOptions"
+ :key="dict.dictValue"
+ :label="dict.dictLabel"
+ :value="dict.dictValue"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="备注" prop="remark">
+ <el-input
+ v-model="form.remark"
+ type="textarea"
+ placeholder="请输入备注"
+ />
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitForm">确 定</el-button>
+ <el-button @click="cancel">取 消</el-button>
+ </div>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import {
+ listMathtermplan,
+ getMathtermplan,
+ delMathtermplan,
+ addMathtermplan,
+ updateMathtermplan,
+ checkTermplan,
+} from "@/api/benyi/mathtermplan";
+
+import { listClass } from "@/api/system/class";
+
+export default {
+ name: "Mathtermplan",
+ data() {
+ return {
+ // 遮罩层
+ loading: true,
+ // 选中数组
+ ids: [],
+ // 非单个禁用
+ single: true,
+ // 非多个禁用
+ multiple: true,
+ // 总条数
+ total: 0,
+ // 游戏数学学期计划表格数据
+ mathtermplanList: [],
+ // 弹出层标题
+ title: "",
+ // 是否显示弹出层
+ open: false,
+ // 学年学期字典
+ xnxqOptions: [],
+ // 班级字典
+ classOptions: [],
+ // 状态字典
+ statusOptions: [],
+ // 查询参数
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ schoolid: undefined,
+ classid: undefined,
+ name: undefined,
+ startmonth: undefined,
+ endmonth: undefined,
+ xnxq: undefined,
+ status: undefined,
+ spr: undefined,
+ sptime: undefined,
+ spyj: undefined,
+ createuserid: undefined,
+ },
+ // 表单参数
+ form: {},
+ // 表单校验
+ rules: {
+ xnxq: [
+ { required: true, message: "学年学期不能为空", trigger: "blur" },
+ ],
+ startmonth: [
+ { required: true, message: "日期不能为空", trigger: "blur" },
+ ],
+ },
+ };
+ },
+ created() {
+ this.getClassList();
+ this.getList();
+ this.getDicts("sys_xnxq").then((response) => {
+ this.xnxqOptions = response.data;
+ });
+ this.getDicts("sys_dm_planweekstatus").then((response) => {
+ this.statusOptions = response.data;
+ });
+ },
+ methods: {
+ isShow(row) {
+ //console.log(row.status);
+ if (row.status == "0") {
+ return true;
+ } else {
+ return false;
+ }
+ },
+ // 查询班级列表
+ getClassList() {
+ listClass(null).then((response) => {
+ this.classOptions = response.rows;
+ });
+ },
+ /** 查询游戏数学学期计划列表 */
+ getList() {
+ this.loading = true;
+ listMathtermplan(this.queryParams).then((response) => {
+ this.mathtermplanList = response.rows;
+ this.total = response.total;
+ this.loading = false;
+ });
+ },
+ // 字典翻译
+ classFormat(row, column) {
+ var actions = [];
+ var datas = this.classOptions;
+ Object.keys(datas).map((key) => {
+ if (datas[key].bjbh == "" + row.classid) {
+ actions.push(datas[key].bjmc);
+ return false;
+ }
+ });
+ return actions.join("");
+ },
+ // 学年学期字典翻译
+ xnxqFormat(row, column) {
+ return this.selectDictLabel(this.xnxqOptions, row.xnxq);
+ },
+ // 状态字典翻译
+ statusFormat(row, column) {
+ return this.selectDictLabel(this.statusOptions, row.status);
+ },
+ // 取消按钮
+ cancel() {
+ this.open = false;
+ this.reset();
+ },
+ // 表单重置
+ reset() {
+ this.form = {
+ id: undefined,
+ schoolid: undefined,
+ classid: undefined,
+ name: undefined,
+ startmonth: undefined,
+ endmonth: undefined,
+ xnxq: undefined,
+ status: "0",
+ spr: undefined,
+ sptime: undefined,
+ spyj: undefined,
+ remark: undefined,
+ createuserid: undefined,
+ createTime: undefined,
+ };
+ this.resetForm("form");
+ },
+ /** 搜索按钮操作 */
+ handleQuery() {
+ this.queryParams.pageNum = 1;
+ this.getList();
+ },
+ /** 重置按钮操作 */
+ resetQuery() {
+ this.resetForm("queryForm");
+ this.handleQuery();
+ },
+ // 多选框选中数据
+ handleSelectionChange(selection) {
+ this.ids = selection.map((item) => item.id);
+ this.single = selection.length != 1;
+ this.multiple = !selection.length;
+ },
+ /** 新增按钮操作 */
+ handleAdd() {
+ this.reset();
+ this.open = true;
+ this.title = "添加游戏数学学期计划";
+ },
+ /** 修改按钮操作 */
+ handleUpdate(row) {
+ this.reset();
+ const id = row.id || this.ids;
+ getMathtermplan(id).then((response) => {
+ this.form = response.data;
+ this.open = true;
+ this.title = "修改游戏数学学期计划";
+ const time = [];
+ time.push(response.data.startmonth);
+ time.push(response.data.endmonth);
+ this.form.startmonth = time;
+ });
+ },
+ /** 提交按钮 */
+ submitForm: function () {
+ this.$refs["form"].validate((valid) => {
+ if (valid) {
+ const time = this.form.startmonth;
+ this.form.startmonth = time[0];
+ this.form.endmonth = time[1];
+ if (this.form.id != undefined) {
+ updateMathtermplan(this.form).then((response) => {
+ if (response.code === 200) {
+ this.msgSuccess("修改成功");
+ this.open = false;
+ this.getList();
+ }
+ });
+ } else {
+ addMathtermplan(this.form).then((response) => {
+ if (response.code === 200) {
+ this.msgSuccess("新增成功");
+ this.open = false;
+ this.getList();
+ }
+ });
+ }
+ }
+ });
+ },
+ /** 删除按钮操作 */
+ handleDelete(row) {
+ const ids = row.id || this.ids;
+ this.$confirm(
+ '是否确认删除游戏数学学期计划数据项?',
+ "警告",
+ {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(function () {
+ return delMathtermplan(ids);
+ })
+ .then(() => {
+ this.getList();
+ this.msgSuccess("删除成功");
+ })
+ .catch(function () {});
+ },
+ /** 提交按钮操作 */
+ handleCheck(row) {
+ const id = row.id;
+ this.$confirm(
+ "是否确认提交游戏数学学期计划?提交后数据无法维护",
+ "警告",
+ {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ }
+ )
+ .then(function () {
+ return checkTermplan(id);
+ })
+ .then(() => {
+ this.getList();
+ this.msgSuccess("提交成功");
+ })
+ .catch(function () {});
+ },
+ /** 预览按钮操作 */
+ // handleView(row) {
+ // const id = row.id;
+ // this.$router.push({
+ // path: "/benyi_course/mathtermplanprint/table/"+id,
+ // });
+ // },
+
+ },
+};
+</script>
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java
index 3b48047ec..cbad7f1c2 100644
--- a/ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -6,26 +6,24 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
/**
* 启动程序
- *
+ *
* @author ruoyi
*/
-@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
-public class RuoYiApplication
-{
- public static void main(String[] args)
- {
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+public class RuoYiApplication {
+ public static void main(String[] args) {
System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(RuoYiApplication.class, args);
System.out.println(
"-------^&^-------" +
- "BenYi Startup success" +
- "-------^&^-------\n" +
- "-------^&^-------" +
- "BenYi Startup success" +
- "-------^&^-------\n" +
- "-------^&^-------" +
- "BenYi Startup success" +
- "-------^&^-------\n"
+ "BenYi Startup success" +
+ "-------^&^-------\n" +
+ "-------^&^-------" +
+ "BenYi Startup success" +
+ "-------^&^-------\n" +
+ "-------^&^-------" +
+ "BenYi Startup success" +
+ "-------^&^-------\n"
);
}
}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java
new file mode 100644
index 000000000..a44c7854d
--- /dev/null
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java
@@ -0,0 +1,134 @@
+package com.ruoyi.project.benyi.controller;
+
+import java.util.List;
+
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.project.common.SchoolCommon;
+import com.ruoyi.project.system.service.IByClassService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.benyi.domain.ByMathTermplan;
+import com.ruoyi.project.benyi.service.IByMathTermplanService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 游戏数学学期计划Controller
+ *
+ * @author tsbz
+ * @date 2020-10-29
+ */
+@RestController
+@RequestMapping("/benyi/mathtermplan")
+public class ByMathTermplanController extends BaseController
+{
+ @Autowired
+ private IByMathTermplanService byMathTermplanService;
+ @Autowired
+ private SchoolCommon schoolCommon;
+ @Autowired
+ private IByClassService byClassService;
+
+/**
+ * 查询游戏数学学期计划列表
+ */
+@PreAuthorize("@ss.hasPermi('benyi:mathtermplan:list')")
+@GetMapping("/list")
+ public TableDataInfo list(ByMathTermplan byMathTermplan)
+ {
+ startPage();
+ List<ByMathTermplan> list = byMathTermplanService.selectByMathTermplanList(byMathTermplan);
+ return getDataTable(list);
+ }
+
+ /**
+ * 导出游戏数学学期计划列表
+ */
+ @PreAuthorize("@ss.hasPermi('benyi:mathtermplan:export')")
+ @Log(title = "游戏数学学期计划", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
+ public AjaxResult export(ByMathTermplan byMathTermplan)
+ {
+ List<ByMathTermplan> list = byMathTermplanService.selectByMathTermplanList(byMathTermplan);
+ ExcelUtil<ByMathTermplan> util = new ExcelUtil<ByMathTermplan>(ByMathTermplan.class);
+ return util.exportExcel(list, "mathtermplan");
+ }
+
+ /**
+ * 获取游戏数学学期计划详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('benyi:mathtermplan:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") String id)
+ {
+ return AjaxResult.success(byMathTermplanService.selectByMathTermplanById(id));
+ }
+
+ /**
+ * 新增游戏数学学期计划
+ */
+ @PreAuthorize("@ss.hasPermi('benyi:mathtermplan:add')")
+ @Log(title = "游戏数学学期计划", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ByMathTermplan byMathTermplan)
+ {
+ String classId = schoolCommon.getClassId();
+
+ int iCount = schoolCommon.getDifMonth(byMathTermplan.getStartmonth(), byMathTermplan.getEndmonth());
+ System.out.println("月份差=" + iCount);
+ String uuid = schoolCommon.getUuid();
+ byMathTermplan.setId(uuid);
+ byMathTermplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+ byMathTermplan.setCreateuserid(SecurityUtils.getLoginUser().getUser().getUserId());
+ byMathTermplan.setClassid(classId);
+ byMathTermplan.setName(byClassService.selectByClassById(classId).getBjmc() + "-主题整合学期计划");
+ return toAjax(byMathTermplanService.insertByMathTermplan(byMathTermplan));
+ }
+
+ /**
+ * 修改游戏数学学期计划
+ */
+ @PreAuthorize("@ss.hasPermi('benyi:mathtermplan:edit')")
+ @Log(title = "游戏数学学期计划", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ByMathTermplan byMathTermplan)
+ {
+ return toAjax(byMathTermplanService.updateByMathTermplan(byMathTermplan));
+ }
+
+ /**
+ * 删除游戏数学学期计划
+ */
+ @PreAuthorize("@ss.hasPermi('benyi:mathtermplan:remove')")
+ @Log(title = "游戏数学学期计划", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable String[] ids)
+ {
+ return toAjax(byMathTermplanService.deleteByMathTermplanByIds(ids));
+ }
+
+ /**
+ * 提交主题整合学期计划
+ */
+ @PreAuthorize("@ss.hasPermi('benyi:themetermplan:edit')")
+ @Log(title = "主题整合学期计划", businessType = BusinessType.UPDATE)
+ @PostMapping("/check/{id}")
+ public AjaxResult check(@PathVariable String id) {
+ ByMathTermplan byMathTermplan = new ByMathTermplan();
+ byMathTermplan.setId(id);
+ byMathTermplan.setStatus("1");
+ return toAjax(byMathTermplanService.updateByMathTermplan(byMathTermplan));
+ }
+}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByMathTermplan.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByMathTermplan.java
new file mode 100644
index 000000000..cbc208a69
--- /dev/null
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByMathTermplan.java
@@ -0,0 +1,209 @@
+package com.ruoyi.project.benyi.domain;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+
+/**
+ * 游戏数学学期计划对象 by_math_termplan
+ *
+ * @author tsbz
+ * @date 2020-10-29
+ */
+public class ByMathTermplan extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 编号
+ */
+ private String id;
+
+ /**
+ * 学校ID
+ */
+ @Excel(name = "学校ID")
+ private Long schoolid;
+
+ /**
+ * 班级id
+ */
+ @Excel(name = "班级id")
+ private String classid;
+
+ /**
+ * 名称
+ */
+ @Excel(name = "名称")
+ private String name;
+
+ /**
+ * 开始月份
+ */
+ @JsonFormat(pattern = "yyyy-MM")
+ @Excel(name = "开始月份", width = 30, dateFormat = "yyyy-MM")
+ private Date startmonth;
+
+ /**
+ * 结束月份
+ */
+ @JsonFormat(pattern = "yyyy-MM")
+ @Excel(name = "结束月份", width = 30, dateFormat = "yyyy-MM")
+ private Date endmonth;
+
+ /**
+ * 学年学期
+ */
+ @Excel(name = "学年学期")
+ private String xnxq;
+
+ /**
+ * 状态
+ */
+ @Excel(name = "状态")
+ private String status;
+
+ /**
+ * 审批人
+ */
+ @Excel(name = "审批人")
+ private Integer spr;
+
+ /**
+ * 审批时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date sptime;
+
+ /**
+ * 审批意见
+ */
+ @Excel(name = "审批意见")
+ private String spyj;
+
+ /**
+ * 创建人
+ */
+ @Excel(name = "创建人")
+ private Long createuserid;
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setSchoolid(Long schoolid) {
+ this.schoolid = schoolid;
+ }
+
+ public Long getSchoolid() {
+ return schoolid;
+ }
+
+ public void setClassid(String classid) {
+ this.classid = classid;
+ }
+
+ public String getClassid() {
+ return classid;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setStartmonth(Date startmonth) {
+ this.startmonth = startmonth;
+ }
+
+ public Date getStartmonth() {
+ return startmonth;
+ }
+
+ public void setEndmonth(Date endmonth) {
+ this.endmonth = endmonth;
+ }
+
+ public Date getEndmonth() {
+ return endmonth;
+ }
+
+ public void setXnxq(String xnxq) {
+ this.xnxq = xnxq;
+ }
+
+ public String getXnxq() {
+ return xnxq;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setSpr(Integer spr) {
+ this.spr = spr;
+ }
+
+ public Integer getSpr() {
+ return spr;
+ }
+
+ public void setSptime(Date sptime) {
+ this.sptime = sptime;
+ }
+
+ public Date getSptime() {
+ return sptime;
+ }
+
+ public void setSpyj(String spyj) {
+ this.spyj = spyj;
+ }
+
+ public String getSpyj() {
+ return spyj;
+ }
+
+ public void setCreateuserid(Long createuserid) {
+ this.createuserid = createuserid;
+ }
+
+ public Long getCreateuserid() {
+ return createuserid;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("schoolid", getSchoolid())
+ .append("classid", getClassid())
+ .append("name", getName())
+ .append("startmonth", getStartmonth())
+ .append("endmonth", getEndmonth())
+ .append("xnxq", getXnxq())
+ .append("status", getStatus())
+ .append("spr", getSpr())
+ .append("sptime", getSptime())
+ .append("spyj", getSpyj())
+ .append("remark", getRemark())
+ .append("createuserid", getCreateuserid())
+ .append("createTime", getCreateTime())
+ .toString();
+ }
+}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByMathTermplanMapper.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByMathTermplanMapper.java
new file mode 100644
index 000000000..133674b3c
--- /dev/null
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByMathTermplanMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.project.benyi.mapper;
+
+import java.util.List;
+import com.ruoyi.project.benyi.domain.ByMathTermplan;
+
+/**
+ * 游戏数学学期计划Mapper接口
+ *
+ * @author tsbz
+ * @date 2020-10-29
+ */
+public interface ByMathTermplanMapper
+{
+ /**
+ * 查询游戏数学学期计划
+ *
+ * @param id 游戏数学学期计划ID
+ * @return 游戏数学学期计划
+ */
+ public ByMathTermplan selectByMathTermplanById(String id);
+
+ /**
+ * 查询游戏数学学期计划列表
+ *
+ * @param byMathTermplan 游戏数学学期计划
+ * @return 游戏数学学期计划集合
+ */
+ public List<ByMathTermplan> selectByMathTermplanList(ByMathTermplan byMathTermplan);
+
+ /**
+ * 新增游戏数学学期计划
+ *
+ * @param byMathTermplan 游戏数学学期计划
+ * @return 结果
+ */
+ public int insertByMathTermplan(ByMathTermplan byMathTermplan);
+
+ /**
+ * 修改游戏数学学期计划
+ *
+ * @param byMathTermplan 游戏数学学期计划
+ * @return 结果
+ */
+ public int updateByMathTermplan(ByMathTermplan byMathTermplan);
+
+ /**
+ * 删除游戏数学学期计划
+ *
+ * @param id 游戏数学学期计划ID
+ * @return 结果
+ */
+ public int deleteByMathTermplanById(String id);
+
+ /**
+ * 批量删除游戏数学学期计划
+ *
+ * @param ids 需要删除的数据ID
+ * @return 结果
+ */
+ public int deleteByMathTermplanByIds(String[] ids);
+}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByMathTermplanService.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByMathTermplanService.java
new file mode 100644
index 000000000..a2b2ddd56
--- /dev/null
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByMathTermplanService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.project.benyi.service;
+
+import java.util.List;
+import com.ruoyi.project.benyi.domain.ByMathTermplan;
+
+/**
+ * 游戏数学学期计划Service接口
+ *
+ * @author tsbz
+ * @date 2020-10-29
+ */
+public interface IByMathTermplanService
+{
+ /**
+ * 查询游戏数学学期计划
+ *
+ * @param id 游戏数学学期计划ID
+ * @return 游戏数学学期计划
+ */
+ public ByMathTermplan selectByMathTermplanById(String id);
+
+ /**
+ * 查询游戏数学学期计划列表
+ *
+ * @param byMathTermplan 游戏数学学期计划
+ * @return 游戏数学学期计划集合
+ */
+ public List<ByMathTermplan> selectByMathTermplanList(ByMathTermplan byMathTermplan);
+
+ /**
+ * 新增游戏数学学期计划
+ *
+ * @param byMathTermplan 游戏数学学期计划
+ * @return 结果
+ */
+ public int insertByMathTermplan(ByMathTermplan byMathTermplan);
+
+ /**
+ * 修改游戏数学学期计划
+ *
+ * @param byMathTermplan 游戏数学学期计划
+ * @return 结果
+ */
+ public int updateByMathTermplan(ByMathTermplan byMathTermplan);
+
+ /**
+ * 批量删除游戏数学学期计划
+ *
+ * @param ids 需要删除的游戏数学学期计划ID
+ * @return 结果
+ */
+ public int deleteByMathTermplanByIds(String[] ids);
+
+ /**
+ * 删除游戏数学学期计划信息
+ *
+ * @param id 游戏数学学期计划ID
+ * @return 结果
+ */
+ public int deleteByMathTermplanById(String id);
+}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByMathTermplanServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByMathTermplanServiceImpl.java
new file mode 100644
index 000000000..fecc4d807
--- /dev/null
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByMathTermplanServiceImpl.java
@@ -0,0 +1,95 @@
+package com.ruoyi.project.benyi.service.impl;
+
+import java.util.List;
+ import com.ruoyi.common.utils.DateUtils;
+ import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.benyi.mapper.ByMathTermplanMapper;
+import com.ruoyi.project.benyi.domain.ByMathTermplan;
+import com.ruoyi.project.benyi.service.IByMathTermplanService;
+
+/**
+ * 游戏数学学期计划Service业务层处理
+ *
+ * @author tsbz
+ * @date 2020-10-29
+ */
+@Service
+public class ByMathTermplanServiceImpl implements IByMathTermplanService
+{
+ @Autowired
+ private ByMathTermplanMapper byMathTermplanMapper;
+
+ /**
+ * 查询游戏数学学期计划
+ *
+ * @param id 游戏数学学期计划ID
+ * @return 游戏数学学期计划
+ */
+ @Override
+ public ByMathTermplan selectByMathTermplanById(String id)
+ {
+ return byMathTermplanMapper.selectByMathTermplanById(id);
+ }
+
+ /**
+ * 查询游戏数学学期计划列表
+ *
+ * @param byMathTermplan 游戏数学学期计划
+ * @return 游戏数学学期计划
+ */
+ @Override
+ public List<ByMathTermplan> selectByMathTermplanList(ByMathTermplan byMathTermplan)
+ {
+ return byMathTermplanMapper.selectByMathTermplanList(byMathTermplan);
+ }
+
+ /**
+ * 新增游戏数学学期计划
+ *
+ * @param byMathTermplan 游戏数学学期计划
+ * @return 结果
+ */
+ @Override
+ public int insertByMathTermplan(ByMathTermplan byMathTermplan)
+ {
+ byMathTermplan.setCreateTime(DateUtils.getNowDate());
+ return byMathTermplanMapper.insertByMathTermplan(byMathTermplan);
+ }
+
+ /**
+ * 修改游戏数学学期计划
+ *
+ * @param byMathTermplan 游戏数学学期计划
+ * @return 结果
+ */
+ @Override
+ public int updateByMathTermplan(ByMathTermplan byMathTermplan)
+ {
+ return byMathTermplanMapper.updateByMathTermplan(byMathTermplan);
+ }
+
+ /**
+ * 批量删除游戏数学学期计划
+ *
+ * @param ids 需要删除的游戏数学学期计划ID
+ * @return 结果
+ */
+ @Override
+ public int deleteByMathTermplanByIds(String[] ids)
+ {
+ return byMathTermplanMapper.deleteByMathTermplanByIds(ids);
+ }
+
+ /**
+ * 删除游戏数学学期计划信息
+ *
+ * @param id 游戏数学学期计划ID
+ * @return 结果
+ */
+ @Override
+ public int deleteByMathTermplanById(String id)
+ {
+ return byMathTermplanMapper.deleteByMathTermplanById(id);
+ }
+}
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByMathTermplanMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByMathTermplanMapper.xml
new file mode 100644
index 000000000..6ca8adde9
--- /dev/null
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByMathTermplanMapper.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.benyi.mapper.ByMathTermplanMapper">
+
+ <resultMap type="ByMathTermplan" id="ByMathTermplanResult">
+ <result property="id" column="id"/>
+ <result property="schoolid" column="schoolid"/>
+ <result property="classid" column="classid"/>
+ <result property="name" column="name"/>
+ <result property="startmonth" column="startmonth"/>
+ <result property="endmonth" column="endmonth"/>
+ <result property="xnxq" column="xnxq"/>
+ <result property="status" column="status"/>
+ <result property="spr" column="spr"/>
+ <result property="sptime" column="sptime"/>
+ <result property="spyj" column="spyj"/>
+ <result property="remark" column="remark"/>
+ <result property="createuserid" column="createuserid"/>
+ <result property="createTime" column="create_time"/>
+ </resultMap>
+
+ <sql id="selectByMathTermplanVo">
+ select id, schoolid, classid, name, startmonth, endmonth, xnxq, status, spr, sptime, spyj, remark, createuserid, create_time from by_math_termplan
+ </sql>
+
+ <select id="selectByMathTermplanList" parameterType="ByMathTermplan" resultMap="ByMathTermplanResult">
+ <include refid="selectByMathTermplanVo"/>
+ <where>
+ <if test="schoolid != null ">and schoolid = #{schoolid}</if>
+ <if test="classid != null and classid != ''">and classid = #{classid}</if>
+ <if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
+ <if test="startmonth != null ">and startmonth = #{startmonth}</if>
+ <if test="endmonth != null ">and endmonth = #{endmonth}</if>
+ <if test="xnxq != null and xnxq != ''">and xnxq = #{xnxq}</if>
+ <if test="status != null and status != ''">and status = #{status}</if>
+ <if test="spr != null ">and spr = #{spr}</if>
+ <if test="sptime != null ">and sptime = #{sptime}</if>
+ <if test="spyj != null and spyj != ''">and spyj = #{spyj}</if>
+ <if test="createuserid != null ">and createuserid = #{createuserid}</if>
+ </where>
+ </select>
+
+ <select id="selectByMathTermplanById" parameterType="String" resultMap="ByMathTermplanResult">
+ <include refid="selectByMathTermplanVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertByMathTermplan" parameterType="ByMathTermplan">
+ insert into by_math_termplan
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null and id != ''">id,</if>
+ <if test="schoolid != null ">schoolid,</if>
+ <if test="classid != null and classid != ''">classid,</if>
+ <if test="name != null and name != ''">name,</if>
+ <if test="startmonth != null ">startmonth,</if>
+ <if test="endmonth != null ">endmonth,</if>
+ <if test="xnxq != null and xnxq != ''">xnxq,</if>
+ <if test="status != null and status != ''">status,</if>
+ <if test="spr != null ">spr,</if>
+ <if test="sptime != null ">sptime,</if>
+ <if test="spyj != null and spyj != ''">spyj,</if>
+ <if test="remark != null and remark != ''">remark,</if>
+ <if test="createuserid != null ">createuserid,</if>
+ <if test="createTime != null ">create_time,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null and id != ''">#{id},</if>
+ <if test="schoolid != null ">#{schoolid},</if>
+ <if test="classid != null and classid != ''">#{classid},</if>
+ <if test="name != null and name != ''">#{name},</if>
+ <if test="startmonth != null ">#{startmonth},</if>
+ <if test="endmonth != null ">#{endmonth},</if>
+ <if test="xnxq != null and xnxq != ''">#{xnxq},</if>
+ <if test="status != null and status != ''">#{status},</if>
+ <if test="spr != null ">#{spr},</if>
+ <if test="sptime != null ">#{sptime},</if>
+ <if test="spyj != null and spyj != ''">#{spyj},</if>
+ <if test="remark != null and remark != ''">#{remark},</if>
+ <if test="createuserid != null ">#{createuserid},</if>
+ <if test="createTime != null ">#{createTime},</if>
+ </trim>
+ </insert>
+
+ <update id="updateByMathTermplan" parameterType="ByMathTermplan">
+ update by_math_termplan
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="schoolid != null ">schoolid = #{schoolid},</if>
+ <if test="classid != null and classid != ''">classid = #{classid},</if>
+ <if test="name != null and name != ''">name = #{name},</if>
+ <if test="startmonth != null ">startmonth = #{startmonth},</if>
+ <if test="endmonth != null ">endmonth = #{endmonth},</if>
+ <if test="xnxq != null and xnxq != ''">xnxq = #{xnxq},</if>
+ <if test="status != null and status != ''">status = #{status},</if>
+ <if test="spr != null ">spr = #{spr},</if>
+ <if test="sptime != null ">sptime = #{sptime},</if>
+ <if test="spyj != null and spyj != ''">spyj = #{spyj},</if>
+ <if test="remark != null and remark != ''">remark = #{remark},</if>
+ <if test="createuserid != null ">createuserid = #{createuserid},</if>
+ <if test="createTime != null ">create_time = #{createTime},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteByMathTermplanById" parameterType="String">
+ delete from by_math_termplan where id = #{id}
+ </delete>
+
+ <delete id="deleteByMathTermplanByIds" parameterType="String">
+ delete from by_math_termplan where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+
+</mapper>
\ No newline at end of file