From 90b454d7affe83b26f39fdd6a2901a0d942a59f3 Mon Sep 17 00:00:00 2001
From: paidaxing444 <12qwaszx>
Date: Mon, 24 Aug 2020 16:31:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A2=98=E6=95=B4=E5=90=88=E5=AD=A6?=
=?UTF-8?q?=E6=9C=9F=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/api/benyi/themetermplan.js | 53 +++
ruoyi-ui/src/api/benyi/themetermplanitem.js | 53 +++
.../src/views/benyi/themetermplan/data.vue | 351 +++++++++++++++
.../src/views/benyi/themetermplan/index.vue | 411 ++++++++++++++++++
.../controller/ByThemeTermplanController.java | 103 +++++
.../ByThemeTermplanitemController.java | 97 +++++
.../project/benyi/domain/ByThemeTermplan.java | 194 +++++++++
.../benyi/domain/ByThemeTermplanitem.java | 117 +++++
.../benyi/mapper/ByThemeTermplanMapper.java | 61 +++
.../mapper/ByThemeTermplanitemMapper.java | 61 +++
.../service/IByThemeTermplanService.java | 61 +++
.../service/IByThemeTermplanitemService.java | 61 +++
.../impl/ByThemeTermplanServiceImpl.java | 89 ++++
.../impl/ByThemeTermplanitemServiceImpl.java | 89 ++++
.../mybatis/benyi/ByThemeTermplanMapper.xml | 112 +++++
.../benyi/ByThemeTermplanitemMapper.xml | 86 ++++
16 files changed, 1999 insertions(+)
create mode 100644 ruoyi-ui/src/api/benyi/themetermplan.js
create mode 100644 ruoyi-ui/src/api/benyi/themetermplanitem.js
create mode 100644 ruoyi-ui/src/views/benyi/themetermplan/data.vue
create mode 100644 ruoyi-ui/src/views/benyi/themetermplan/index.vue
create mode 100644 ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeTermplanController.java
create mode 100644 ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeTermplanitemController.java
create mode 100644 ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByThemeTermplan.java
create mode 100644 ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByThemeTermplanitem.java
create mode 100644 ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByThemeTermplanMapper.java
create mode 100644 ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByThemeTermplanitemMapper.java
create mode 100644 ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByThemeTermplanService.java
create mode 100644 ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByThemeTermplanitemService.java
create mode 100644 ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByThemeTermplanServiceImpl.java
create mode 100644 ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByThemeTermplanitemServiceImpl.java
create mode 100644 ruoyi/src/main/resources/mybatis/benyi/ByThemeTermplanMapper.xml
create mode 100644 ruoyi/src/main/resources/mybatis/benyi/ByThemeTermplanitemMapper.xml
diff --git a/ruoyi-ui/src/api/benyi/themetermplan.js b/ruoyi-ui/src/api/benyi/themetermplan.js
new file mode 100644
index 000000000..47f5d0308
--- /dev/null
+++ b/ruoyi-ui/src/api/benyi/themetermplan.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询主题整合学期计划列表
+export function listTermplan(query) {
+ return request({
+ url: '/benyi/themetermplan/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询主题整合学期计划详细
+export function getTermplan(id) {
+ return request({
+ url: '/benyi/themetermplan/' + id,
+ method: 'get'
+ })
+}
+
+// 新增主题整合学期计划
+export function addTermplan(data) {
+ return request({
+ url: '/benyi/themetermplan',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改主题整合学期计划
+export function updateTermplan(data) {
+ return request({
+ url: '/benyi/themetermplan',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除主题整合学期计划
+export function delTermplan(id) {
+ return request({
+ url: '/benyi/themetermplan/' + id,
+ method: 'delete'
+ })
+}
+
+// 导出主题整合学期计划
+export function exportTermplan(query) {
+ return request({
+ url: '/benyi/themetermplan/export',
+ method: 'get',
+ params: query
+ })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/benyi/themetermplanitem.js b/ruoyi-ui/src/api/benyi/themetermplanitem.js
new file mode 100644
index 000000000..8ecfd3e3b
--- /dev/null
+++ b/ruoyi-ui/src/api/benyi/themetermplanitem.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询主题整合学期计划明细列表
+export function listTermplanitem(query) {
+ return request({
+ url: '/benyi/themetermplanitem/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询主题整合学期计划明细详细
+export function getTermplanitem(id) {
+ return request({
+ url: '/benyi/themetermplanitem/' + id,
+ method: 'get'
+ })
+}
+
+// 新增主题整合学期计划明细
+export function addTermplanitem(data) {
+ return request({
+ url: '/benyi/themetermplanitem',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改主题整合学期计划明细
+export function updateTermplanitem(data) {
+ return request({
+ url: '/benyi/themetermplanitem',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除主题整合学期计划明细
+export function delTermplanitem(id) {
+ return request({
+ url: '/benyi/themetermplanitem/' + id,
+ method: 'delete'
+ })
+}
+
+// 导出主题整合学期计划明细
+export function exportTermplanitem(query) {
+ return request({
+ url: '/benyi/themetermplanitem/export',
+ method: 'get',
+ params: query
+ })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/benyi/themetermplan/data.vue b/ruoyi-ui/src/views/benyi/themetermplan/data.vue
new file mode 100644
index 000000000..eb5101593
--- /dev/null
+++ b/ruoyi-ui/src/views/benyi/themetermplan/data.vue
@@ -0,0 +1,351 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.创建时间, '{y}-{m}-{d}') }}
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/benyi/themetermplan/index.vue b/ruoyi-ui/src/views/benyi/themetermplan/index.vue
new file mode 100644
index 000000000..bc746a5a2
--- /dev/null
+++ b/ruoyi-ui/src/views/benyi/themetermplan/index.vue
@@ -0,0 +1,411 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.startmonth, '{y}-{m}-{d}') }}
+
+
+
+
+ {{ parseTime(scope.row.endmonth, '{y}-{m}-{d}') }}
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.sptime, '{y}-{m}-{d}') }}
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 请选择字典生成
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeTermplanController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeTermplanController.java
new file mode 100644
index 000000000..765fac892
--- /dev/null
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeTermplanController.java
@@ -0,0 +1,103 @@
+package com.ruoyi.project.benyi.controller;
+
+import java.util.List;
+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.ByThemeTermplan;
+import com.ruoyi.project.benyi.service.IByThemeTermplanService;
+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-08-24
+ */
+@RestController
+@RequestMapping("/benyi/themetermplan")
+public class ByThemeTermplanController extends BaseController
+{
+ @Autowired
+ private IByThemeTermplanService byThemeTermplanService;
+
+/**
+ * 查询主题整合学期计划列表
+ */
+@PreAuthorize("@ss.hasPermi('benyi:themetermplan:list')")
+@GetMapping("/list")
+ public TableDataInfo list(ByThemeTermplan byThemeTermplan)
+ {
+ startPage();
+ List list = byThemeTermplanService.selectByThemeTermplanList(byThemeTermplan);
+ return getDataTable(list);
+ }
+
+ /**
+ * 导出主题整合学期计划列表
+ */
+ @PreAuthorize("@ss.hasPermi('benyi:themetermplan:export')")
+ @Log(title = "主题整合学期计划", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
+ public AjaxResult export(ByThemeTermplan byThemeTermplan)
+ {
+ List list = byThemeTermplanService.selectByThemeTermplanList(byThemeTermplan);
+ ExcelUtil util = new ExcelUtil(ByThemeTermplan.class);
+ return util.exportExcel(list, "themetermplan");
+ }
+
+ /**
+ * 获取主题整合学期计划详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('benyi:themetermplan:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return AjaxResult.success(byThemeTermplanService.selectByThemeTermplanById(id));
+ }
+
+ /**
+ * 新增主题整合学期计划
+ */
+ @PreAuthorize("@ss.hasPermi('benyi:themetermplan:add')")
+ @Log(title = "主题整合学期计划", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ByThemeTermplan byThemeTermplan)
+ {
+ return toAjax(byThemeTermplanService.insertByThemeTermplan(byThemeTermplan));
+ }
+
+ /**
+ * 修改主题整合学期计划
+ */
+ @PreAuthorize("@ss.hasPermi('benyi:themetermplan:edit')")
+ @Log(title = "主题整合学期计划", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ByThemeTermplan byThemeTermplan)
+ {
+ return toAjax(byThemeTermplanService.updateByThemeTermplan(byThemeTermplan));
+ }
+
+ /**
+ * 删除主题整合学期计划
+ */
+ @PreAuthorize("@ss.hasPermi('benyi:themetermplan:remove')")
+ @Log(title = "主题整合学期计划", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(byThemeTermplanService.deleteByThemeTermplanByIds(ids));
+ }
+}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeTermplanitemController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeTermplanitemController.java
new file mode 100644
index 000000000..488284fc0
--- /dev/null
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeTermplanitemController.java
@@ -0,0 +1,97 @@
+package com.ruoyi.project.benyi.controller;
+
+import java.util.List;
+
+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.ByThemeTermplanitem;
+import com.ruoyi.project.benyi.service.IByThemeTermplanitemService;
+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-08-24
+ */
+@RestController
+@RequestMapping("/benyi/termplanitem")
+public class ByThemeTermplanitemController extends BaseController {
+ @Autowired
+ private IByThemeTermplanitemService byThemeTermplanitemService;
+
+ /**
+ * 查询主题整合学期计划明细列表
+ */
+ @PreAuthorize("@ss.hasPermi('benyi:themetermplan:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(ByThemeTermplanitem byThemeTermplanitem) {
+ startPage();
+ List list = byThemeTermplanitemService.selectByThemeTermplanitemList(byThemeTermplanitem);
+ return getDataTable(list);
+ }
+
+ /**
+ * 导出主题整合学期计划明细列表
+ */
+ @PreAuthorize("@ss.hasPermi('benyi:themetermplan:export')")
+ @Log(title = "主题整合学期计划明细", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
+ public AjaxResult export(ByThemeTermplanitem byThemeTermplanitem) {
+ List list = byThemeTermplanitemService.selectByThemeTermplanitemList(byThemeTermplanitem);
+ ExcelUtil util = new ExcelUtil(ByThemeTermplanitem.class);
+ return util.exportExcel(list, "termplanitem");
+ }
+
+ /**
+ * 获取主题整合学期计划明细详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('benyi:themetermplan:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return AjaxResult.success(byThemeTermplanitemService.selectByThemeTermplanitemById(id));
+ }
+
+ /**
+ * 新增主题整合学期计划明细
+ */
+ @PreAuthorize("@ss.hasPermi('benyi:themetermplan:add')")
+ @Log(title = "主题整合学期计划明细", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ByThemeTermplanitem byThemeTermplanitem) {
+ return toAjax(byThemeTermplanitemService.insertByThemeTermplanitem(byThemeTermplanitem));
+ }
+
+ /**
+ * 修改主题整合学期计划明细
+ */
+ @PreAuthorize("@ss.hasPermi('benyi:themetermplan:edit')")
+ @Log(title = "主题整合学期计划明细", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ByThemeTermplanitem byThemeTermplanitem) {
+ return toAjax(byThemeTermplanitemService.updateByThemeTermplanitem(byThemeTermplanitem));
+ }
+
+ /**
+ * 删除主题整合学期计划明细
+ */
+ @PreAuthorize("@ss.hasPermi('benyi:themetermplan:remove')")
+ @Log(title = "主题整合学期计划明细", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(byThemeTermplanitemService.deleteByThemeTermplanitemByIds(ids));
+ }
+}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByThemeTermplan.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByThemeTermplan.java
new file mode 100644
index 000000000..f64bf8569
--- /dev/null
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByThemeTermplan.java
@@ -0,0 +1,194 @@
+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_theme_termplan
+ *
+ * @author tsbz
+ * @date 2020-08-24
+ */
+public class ByThemeTermplan 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-dd")
+ @Excel(name = "月份", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date startmonth;
+
+ /**
+ * 结束月份
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "结束月份", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date endmonth;
+
+ /**
+ * 学年学期
+ */
+ @Excel(name = "学年学期")
+ private String xnxq;
+
+ /**
+ * 创建人
+ */
+ @Excel(name = "创建人")
+ private Long createuserid;
+
+ /**
+ * 状态
+ */
+ @Excel(name = "状态")
+ private String status;
+
+ /**
+ * 审批人
+ */
+ @Excel(name = "审批人")
+ private Long spr;
+
+ /**
+ * 审批时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date sptime;
+
+ 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 setCreateuserid(Long createuserid) {
+ this.createuserid = createuserid;
+ }
+
+ public Long getCreateuserid() {
+ return createuserid;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setSpr(Long spr) {
+ this.spr = spr;
+ }
+
+ public Long getSpr() {
+ return spr;
+ }
+
+ public void setSptime(Date sptime) {
+ this.sptime = sptime;
+ }
+
+ public Date getSptime() {
+ return sptime;
+ }
+
+ @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("remark", getRemark())
+ .append("createuserid", getCreateuserid())
+ .append("createTime", getCreateTime())
+ .append("status", getStatus())
+ .append("spr", getSpr())
+ .append("sptime", getSptime())
+ .toString();
+ }
+}
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByThemeTermplanitem.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByThemeTermplanitem.java
new file mode 100644
index 000000000..561186e4f
--- /dev/null
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByThemeTermplanitem.java
@@ -0,0 +1,117 @@
+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_theme_termplanitem
+ *
+ * @author tsbz
+ * @date 2020-08-24
+ */
+public class ByThemeTermplanitem extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 编号
+ */
+ private Long id;
+
+ /**
+ * 所属计划
+ */
+ @Excel(name = "所属计划")
+ private String tpid;
+
+ /**
+ * 主题内容
+ */
+ @Excel(name = "主题内容")
+ private String themeconent;
+
+ /**
+ * 创建人
+ */
+ @Excel(name = "创建人")
+ private Long createuserid;
+
+ /**
+ * $column.columnComment
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "创建人", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date 创建时间;
+
+ /**
+ * 修改人
+ */
+ @Excel(name = "修改人")
+ private Long updateuserid;
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setTpid(String tpid) {
+ this.tpid = tpid;
+ }
+
+ public String getTpid() {
+ return tpid;
+ }
+
+ public void setThemeconent(String themeconent) {
+ this.themeconent = themeconent;
+ }
+
+ public String getThemeconent() {
+ return themeconent;
+ }
+
+ public void setCreateuserid(Long createuserid) {
+ this.createuserid = createuserid;
+ }
+
+ public Long getCreateuserid() {
+ return createuserid;
+ }
+
+ public void set创建时间(Date 创建时间) {
+ this.创建时间 = 创建时间;
+ }
+
+ public Date get创建时间() {
+ return 创建时间;
+ }
+
+ public void setUpdateuserid(Long updateuserid) {
+ this.updateuserid = updateuserid;
+ }
+
+ public Long getUpdateuserid() {
+ return updateuserid;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("tpid", getTpid())
+ .append("themeconent", getThemeconent())
+ .append("remark", getRemark())
+ .append("createuserid", getCreateuserid())
+ .append("创建时间", get创建时间())
+ .append("updateuserid", getUpdateuserid())
+ .append("updateTime", getUpdateTime())
+ .toString();
+ }
+}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByThemeTermplanMapper.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByThemeTermplanMapper.java
new file mode 100644
index 000000000..a1a41429c
--- /dev/null
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByThemeTermplanMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.project.benyi.mapper;
+
+import java.util.List;
+
+import com.ruoyi.project.benyi.domain.ByThemeTermplan;
+
+/**
+ * 主题整合学期计划Mapper接口
+ *
+ * @author tsbz
+ * @date 2020-08-24
+ */
+public interface ByThemeTermplanMapper {
+ /**
+ * 查询主题整合学期计划
+ *
+ * @param id 主题整合学期计划ID
+ * @return 主题整合学期计划
+ */
+ public ByThemeTermplan selectByThemeTermplanById(Long id);
+
+ /**
+ * 查询主题整合学期计划列表
+ *
+ * @param byThemeTermplan 主题整合学期计划
+ * @return 主题整合学期计划集合
+ */
+ public List selectByThemeTermplanList(ByThemeTermplan byThemeTermplan);
+
+ /**
+ * 新增主题整合学期计划
+ *
+ * @param byThemeTermplan 主题整合学期计划
+ * @return 结果
+ */
+ public int insertByThemeTermplan(ByThemeTermplan byThemeTermplan);
+
+ /**
+ * 修改主题整合学期计划
+ *
+ * @param byThemeTermplan 主题整合学期计划
+ * @return 结果
+ */
+ public int updateByThemeTermplan(ByThemeTermplan byThemeTermplan);
+
+ /**
+ * 删除主题整合学期计划
+ *
+ * @param id 主题整合学期计划ID
+ * @return 结果
+ */
+ public int deleteByThemeTermplanById(Long id);
+
+ /**
+ * 批量删除主题整合学期计划
+ *
+ * @param ids 需要删除的数据ID
+ * @return 结果
+ */
+ public int deleteByThemeTermplanByIds(Long[] ids);
+}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByThemeTermplanitemMapper.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByThemeTermplanitemMapper.java
new file mode 100644
index 000000000..70fdd5382
--- /dev/null
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByThemeTermplanitemMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.project.benyi.mapper;
+
+import java.util.List;
+
+import com.ruoyi.project.benyi.domain.ByThemeTermplanitem;
+
+/**
+ * 主题整合学期计划明细Mapper接口
+ *
+ * @author tsbz
+ * @date 2020-08-24
+ */
+public interface ByThemeTermplanitemMapper {
+ /**
+ * 查询主题整合学期计划明细
+ *
+ * @param id 主题整合学期计划明细ID
+ * @return 主题整合学期计划明细
+ */
+ public ByThemeTermplanitem selectByThemeTermplanitemById(Long id);
+
+ /**
+ * 查询主题整合学期计划明细列表
+ *
+ * @param byThemeTermplanitem 主题整合学期计划明细
+ * @return 主题整合学期计划明细集合
+ */
+ public List selectByThemeTermplanitemList(ByThemeTermplanitem byThemeTermplanitem);
+
+ /**
+ * 新增主题整合学期计划明细
+ *
+ * @param byThemeTermplanitem 主题整合学期计划明细
+ * @return 结果
+ */
+ public int insertByThemeTermplanitem(ByThemeTermplanitem byThemeTermplanitem);
+
+ /**
+ * 修改主题整合学期计划明细
+ *
+ * @param byThemeTermplanitem 主题整合学期计划明细
+ * @return 结果
+ */
+ public int updateByThemeTermplanitem(ByThemeTermplanitem byThemeTermplanitem);
+
+ /**
+ * 删除主题整合学期计划明细
+ *
+ * @param id 主题整合学期计划明细ID
+ * @return 结果
+ */
+ public int deleteByThemeTermplanitemById(Long id);
+
+ /**
+ * 批量删除主题整合学期计划明细
+ *
+ * @param ids 需要删除的数据ID
+ * @return 结果
+ */
+ public int deleteByThemeTermplanitemByIds(Long[] ids);
+}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByThemeTermplanService.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByThemeTermplanService.java
new file mode 100644
index 000000000..2f4e06635
--- /dev/null
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByThemeTermplanService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.project.benyi.service;
+
+import java.util.List;
+
+import com.ruoyi.project.benyi.domain.ByThemeTermplan;
+
+/**
+ * 主题整合学期计划Service接口
+ *
+ * @author tsbz
+ * @date 2020-08-24
+ */
+public interface IByThemeTermplanService {
+ /**
+ * 查询主题整合学期计划
+ *
+ * @param id 主题整合学期计划ID
+ * @return 主题整合学期计划
+ */
+ public ByThemeTermplan selectByThemeTermplanById(Long id);
+
+ /**
+ * 查询主题整合学期计划列表
+ *
+ * @param byThemeTermplan 主题整合学期计划
+ * @return 主题整合学期计划集合
+ */
+ public List selectByThemeTermplanList(ByThemeTermplan byThemeTermplan);
+
+ /**
+ * 新增主题整合学期计划
+ *
+ * @param byThemeTermplan 主题整合学期计划
+ * @return 结果
+ */
+ public int insertByThemeTermplan(ByThemeTermplan byThemeTermplan);
+
+ /**
+ * 修改主题整合学期计划
+ *
+ * @param byThemeTermplan 主题整合学期计划
+ * @return 结果
+ */
+ public int updateByThemeTermplan(ByThemeTermplan byThemeTermplan);
+
+ /**
+ * 批量删除主题整合学期计划
+ *
+ * @param ids 需要删除的主题整合学期计划ID
+ * @return 结果
+ */
+ public int deleteByThemeTermplanByIds(Long[] ids);
+
+ /**
+ * 删除主题整合学期计划信息
+ *
+ * @param id 主题整合学期计划ID
+ * @return 结果
+ */
+ public int deleteByThemeTermplanById(Long id);
+}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByThemeTermplanitemService.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByThemeTermplanitemService.java
new file mode 100644
index 000000000..38b653460
--- /dev/null
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByThemeTermplanitemService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.project.benyi.service;
+
+import java.util.List;
+
+import com.ruoyi.project.benyi.domain.ByThemeTermplanitem;
+
+/**
+ * 主题整合学期计划明细Service接口
+ *
+ * @author tsbz
+ * @date 2020-08-24
+ */
+public interface IByThemeTermplanitemService {
+ /**
+ * 查询主题整合学期计划明细
+ *
+ * @param id 主题整合学期计划明细ID
+ * @return 主题整合学期计划明细
+ */
+ public ByThemeTermplanitem selectByThemeTermplanitemById(Long id);
+
+ /**
+ * 查询主题整合学期计划明细列表
+ *
+ * @param byThemeTermplanitem 主题整合学期计划明细
+ * @return 主题整合学期计划明细集合
+ */
+ public List selectByThemeTermplanitemList(ByThemeTermplanitem byThemeTermplanitem);
+
+ /**
+ * 新增主题整合学期计划明细
+ *
+ * @param byThemeTermplanitem 主题整合学期计划明细
+ * @return 结果
+ */
+ public int insertByThemeTermplanitem(ByThemeTermplanitem byThemeTermplanitem);
+
+ /**
+ * 修改主题整合学期计划明细
+ *
+ * @param byThemeTermplanitem 主题整合学期计划明细
+ * @return 结果
+ */
+ public int updateByThemeTermplanitem(ByThemeTermplanitem byThemeTermplanitem);
+
+ /**
+ * 批量删除主题整合学期计划明细
+ *
+ * @param ids 需要删除的主题整合学期计划明细ID
+ * @return 结果
+ */
+ public int deleteByThemeTermplanitemByIds(Long[] ids);
+
+ /**
+ * 删除主题整合学期计划明细信息
+ *
+ * @param id 主题整合学期计划明细ID
+ * @return 结果
+ */
+ public int deleteByThemeTermplanitemById(Long id);
+}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByThemeTermplanServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByThemeTermplanServiceImpl.java
new file mode 100644
index 000000000..f73d70acd
--- /dev/null
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByThemeTermplanServiceImpl.java
@@ -0,0 +1,89 @@
+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.ByThemeTermplanMapper;
+import com.ruoyi.project.benyi.domain.ByThemeTermplan;
+import com.ruoyi.project.benyi.service.IByThemeTermplanService;
+
+/**
+ * 主题整合学期计划Service业务层处理
+ *
+ * @author tsbz
+ * @date 2020-08-24
+ */
+@Service
+public class ByThemeTermplanServiceImpl implements IByThemeTermplanService {
+ @Autowired
+ private ByThemeTermplanMapper byThemeTermplanMapper;
+
+ /**
+ * 查询主题整合学期计划
+ *
+ * @param id 主题整合学期计划ID
+ * @return 主题整合学期计划
+ */
+ @Override
+ public ByThemeTermplan selectByThemeTermplanById(Long id) {
+ return byThemeTermplanMapper.selectByThemeTermplanById(id);
+ }
+
+ /**
+ * 查询主题整合学期计划列表
+ *
+ * @param byThemeTermplan 主题整合学期计划
+ * @return 主题整合学期计划
+ */
+ @Override
+ public List selectByThemeTermplanList(ByThemeTermplan byThemeTermplan) {
+ return byThemeTermplanMapper.selectByThemeTermplanList(byThemeTermplan);
+ }
+
+ /**
+ * 新增主题整合学期计划
+ *
+ * @param byThemeTermplan 主题整合学期计划
+ * @return 结果
+ */
+ @Override
+ public int insertByThemeTermplan(ByThemeTermplan byThemeTermplan) {
+ byThemeTermplan.setCreateTime(DateUtils.getNowDate());
+ return byThemeTermplanMapper.insertByThemeTermplan(byThemeTermplan);
+ }
+
+ /**
+ * 修改主题整合学期计划
+ *
+ * @param byThemeTermplan 主题整合学期计划
+ * @return 结果
+ */
+ @Override
+ public int updateByThemeTermplan(ByThemeTermplan byThemeTermplan) {
+ return byThemeTermplanMapper.updateByThemeTermplan(byThemeTermplan);
+ }
+
+ /**
+ * 批量删除主题整合学期计划
+ *
+ * @param ids 需要删除的主题整合学期计划ID
+ * @return 结果
+ */
+ @Override
+ public int deleteByThemeTermplanByIds(Long[] ids) {
+ return byThemeTermplanMapper.deleteByThemeTermplanByIds(ids);
+ }
+
+ /**
+ * 删除主题整合学期计划信息
+ *
+ * @param id 主题整合学期计划ID
+ * @return 结果
+ */
+ @Override
+ public int deleteByThemeTermplanById(Long id) {
+ return byThemeTermplanMapper.deleteByThemeTermplanById(id);
+ }
+}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByThemeTermplanitemServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByThemeTermplanitemServiceImpl.java
new file mode 100644
index 000000000..496e0ebe3
--- /dev/null
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByThemeTermplanitemServiceImpl.java
@@ -0,0 +1,89 @@
+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.ByThemeTermplanitemMapper;
+import com.ruoyi.project.benyi.domain.ByThemeTermplanitem;
+import com.ruoyi.project.benyi.service.IByThemeTermplanitemService;
+
+/**
+ * 主题整合学期计划明细Service业务层处理
+ *
+ * @author tsbz
+ * @date 2020-08-24
+ */
+@Service
+public class ByThemeTermplanitemServiceImpl implements IByThemeTermplanitemService {
+ @Autowired
+ private ByThemeTermplanitemMapper byThemeTermplanitemMapper;
+
+ /**
+ * 查询主题整合学期计划明细
+ *
+ * @param id 主题整合学期计划明细ID
+ * @return 主题整合学期计划明细
+ */
+ @Override
+ public ByThemeTermplanitem selectByThemeTermplanitemById(Long id) {
+ return byThemeTermplanitemMapper.selectByThemeTermplanitemById(id);
+ }
+
+ /**
+ * 查询主题整合学期计划明细列表
+ *
+ * @param byThemeTermplanitem 主题整合学期计划明细
+ * @return 主题整合学期计划明细
+ */
+ @Override
+ public List selectByThemeTermplanitemList(ByThemeTermplanitem byThemeTermplanitem) {
+ return byThemeTermplanitemMapper.selectByThemeTermplanitemList(byThemeTermplanitem);
+ }
+
+ /**
+ * 新增主题整合学期计划明细
+ *
+ * @param byThemeTermplanitem 主题整合学期计划明细
+ * @return 结果
+ */
+ @Override
+ public int insertByThemeTermplanitem(ByThemeTermplanitem byThemeTermplanitem) {
+ return byThemeTermplanitemMapper.insertByThemeTermplanitem(byThemeTermplanitem);
+ }
+
+ /**
+ * 修改主题整合学期计划明细
+ *
+ * @param byThemeTermplanitem 主题整合学期计划明细
+ * @return 结果
+ */
+ @Override
+ public int updateByThemeTermplanitem(ByThemeTermplanitem byThemeTermplanitem) {
+ byThemeTermplanitem.setUpdateTime(DateUtils.getNowDate());
+ return byThemeTermplanitemMapper.updateByThemeTermplanitem(byThemeTermplanitem);
+ }
+
+ /**
+ * 批量删除主题整合学期计划明细
+ *
+ * @param ids 需要删除的主题整合学期计划明细ID
+ * @return 结果
+ */
+ @Override
+ public int deleteByThemeTermplanitemByIds(Long[] ids) {
+ return byThemeTermplanitemMapper.deleteByThemeTermplanitemByIds(ids);
+ }
+
+ /**
+ * 删除主题整合学期计划明细信息
+ *
+ * @param id 主题整合学期计划明细ID
+ * @return 结果
+ */
+ @Override
+ public int deleteByThemeTermplanitemById(Long id) {
+ return byThemeTermplanitemMapper.deleteByThemeTermplanitemById(id);
+ }
+}
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByThemeTermplanMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByThemeTermplanMapper.xml
new file mode 100644
index 000000000..605953336
--- /dev/null
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByThemeTermplanMapper.xml
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select id, schoolid, classid, name, startmonth, endmonth, xnxq, remark, createuserid, create_time, status, spr, sptime from by_theme_termplan
+
+
+
+
+
+ and schoolid = #{schoolid}
+ and classid = #{classid}
+ and name like concat('%', #{name}, '%')
+ and startmonth = #{startmonth}
+ and endmonth = #{endmonth}
+ and xnxq = #{xnxq}
+ and createuserid = #{createuserid}
+ and status = #{status}
+ and spr = #{spr}
+ and sptime = #{sptime}
+
+
+
+
+
+ where id = #{id}
+
+
+
+ insert into by_theme_termplan
+
+ id,
+ schoolid,
+ classid,
+ name,
+ startmonth,
+ endmonth,
+ xnxq,
+ remark,
+ createuserid,
+ create_time,
+ status,
+ spr,
+ sptime,
+
+
+ #{id},
+ #{schoolid},
+ #{classid},
+ #{name},
+ #{startmonth},
+ #{endmonth},
+ #{xnxq},
+ #{remark},
+ #{createuserid},
+ #{createTime},
+ #{status},
+ #{spr},
+ #{sptime},
+
+
+
+
+ update by_theme_termplan
+
+ schoolid = #{schoolid},
+ classid = #{classid},
+ name = #{name},
+ startmonth = #{startmonth},
+ endmonth = #{endmonth},
+ xnxq = #{xnxq},
+ remark = #{remark},
+ createuserid = #{createuserid},
+ create_time = #{createTime},
+ status = #{status},
+ spr = #{spr},
+ sptime = #{sptime},
+
+ where id = #{id}
+
+
+
+ delete from by_theme_termplan where id = #{id}
+
+
+
+ delete from by_theme_termplan where id in
+
+ #{id}
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByThemeTermplanitemMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByThemeTermplanitemMapper.xml
new file mode 100644
index 000000000..759a599ee
--- /dev/null
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByThemeTermplanitemMapper.xml
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select id, tpid, themeconent, remark, createuserid, 创建时间, updateuserid, update_time from by_theme_termplanitem
+
+
+
+
+
+ and tpid = #{tpid}
+ and themeconent = #{themeconent}
+ and createuserid = #{createuserid}
+ and 创建时间 = #{创建时间}
+ and updateuserid = #{updateuserid}
+
+
+
+
+
+ where id = #{id}
+
+
+
+ insert into by_theme_termplanitem
+
+ tpid,
+ themeconent,
+ remark,
+ createuserid,
+ 创建时间,
+ updateuserid,
+ update_time,
+
+
+ #{tpid},
+ #{themeconent},
+ #{remark},
+ #{createuserid},
+ #{创建时间},
+ #{updateuserid},
+ #{updateTime},
+
+
+
+
+ update by_theme_termplanitem
+
+ tpid = #{tpid},
+ themeconent = #{themeconent},
+ remark = #{remark},
+ createuserid = #{createuserid},
+ 创建时间 = #{创建时间},
+ updateuserid = #{updateuserid},
+ update_time = #{updateTime},
+
+ where id = #{id}
+
+
+
+ delete from by_theme_termplanitem where id = #{id}
+
+
+
+ delete from by_theme_termplanitem where id in
+
+ #{id}
+
+
+
+
\ No newline at end of file