diff --git a/ruoyi-ui/src/api/benyi/thememonthplanitem.js b/ruoyi-ui/src/api/benyi/thememonthplanitem.js index c7f444402..9a76e9eeb 100644 --- a/ruoyi-ui/src/api/benyi/thememonthplanitem.js +++ b/ruoyi-ui/src/api/benyi/thememonthplanitem.js @@ -1,7 +1,7 @@ import request from '@/utils/request' // 查询主题整合周计划列表 -export function listWeekplan(query) { +export function listMonthplanitem(query) { return request({ url: '/benyi/thememonthplanitem/list', method: 'get', @@ -10,7 +10,7 @@ export function listWeekplan(query) { } // 查询主题整合周计划详细 -export function getWeekplan(id) { +export function getMonthplanitem(id) { return request({ url: '/benyi/thememonthplanitem/' + id, method: 'get' @@ -18,7 +18,7 @@ export function getWeekplan(id) { } // 新增主题整合周计划 -export function addWeekplan(data) { +export function addMonthplanitem(data) { return request({ url: '/benyi/thememonthplanitem', method: 'post', @@ -27,7 +27,7 @@ export function addWeekplan(data) { } // 修改主题整合周计划 -export function updateWeekplan(data) { +export function updateMonthplanitem(data) { return request({ url: '/benyi/thememonthplanitem', method: 'put', @@ -36,7 +36,7 @@ export function updateWeekplan(data) { } // 删除主题整合周计划 -export function delWeekplan(id) { +export function delMonthplanitem(id) { return request({ url: '/benyi/thememonthplanitem/' + id, method: 'delete' @@ -44,7 +44,7 @@ export function delWeekplan(id) { } // 导出主题整合周计划 -export function exportWeekplan(query) { +export function exportMonthplanitem(query) { return request({ url: '/benyi/thememonthplanitem/export', method: 'get', diff --git a/ruoyi-ui/src/api/benyi/themeweekplan.js b/ruoyi-ui/src/api/benyi/themeweekplan.js new file mode 100644 index 000000000..af728efec --- /dev/null +++ b/ruoyi-ui/src/api/benyi/themeweekplan.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询主题整合周计划（根据月计划明细）列表 +export function listWeekplan(query) { + return request({ + url: '/benyi/themeweekplan/list', + method: 'get', + params: query + }) +} + +// 查询主题整合周计划（根据月计划明细）详细 +export function getWeekplan(id) { + return request({ + url: '/benyi/themeweekplan/' + id, + method: 'get' + }) +} + +// 新增主题整合周计划（根据月计划明细） +export function addWeekplan(data) { + return request({ + url: '/benyi/themeweekplan', + method: 'post', + data: data + }) +} + +// 修改主题整合周计划（根据月计划明细） +export function updateWeekplan(data) { + return request({ + url: '/benyi/themeweekplan', + method: 'put', + data: data + }) +} + +// 删除主题整合周计划（根据月计划明细） +export function delWeekplan(id) { + return request({ + url: '/benyi/themeweekplan/' + id, + method: 'delete' + }) +} + +// 导出主题整合周计划（根据月计划明细） +export function exportWeekplan(query) { + return request({ + url: '/benyi/themeweekplan/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/api/benyi/themeweekplanitem.js b/ruoyi-ui/src/api/benyi/themeweekplanitem.js new file mode 100644 index 000000000..1bf675582 --- /dev/null +++ b/ruoyi-ui/src/api/benyi/themeweekplanitem.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询主题整合周计划明细列表 +export function listWeekplanitem(query) { + return request({ + url: '/benyi/themeweekplanitem/list', + method: 'get', + params: query + }) +} + +// 查询主题整合周计划明细详细 +export function getWeekplanitem(id) { + return request({ + url: '/benyi/themeweekplanitem/' + id, + method: 'get' + }) +} + +// 新增主题整合周计划明细 +export function addWeekplanitem(data) { + return request({ + url: '/benyi/themeweekplanitem', + method: 'post', + data: data + }) +} + +// 修改主题整合周计划明细 +export function updateWeekplanitem(data) { + return request({ + url: '/benyi/themeweekplanitem', + method: 'put', + data: data + }) +} + +// 删除主题整合周计划明细 +export function delWeekplanitem(id) { + return request({ + url: '/benyi/themeweekplanitem/' + id, + method: 'delete' + }) +} + +// 导出主题整合周计划明细 +export function exportWeekplanitem(query) { + return request({ + url: '/benyi/themeweekplanitem/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/views/benyi/thememonthplan/data.vue b/ruoyi-ui/src/views/benyi/thememonthplan/data.vue index 6aad5c0a8..949469ff2 100644 --- a/ruoyi-ui/src/views/benyi/thememonthplan/data.vue +++ b/ruoyi-ui/src/views/benyi/thememonthplan/data.vue @@ -179,11 +179,11 @@ \ No newline at end of file diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java index 855d634a0..5b362cebd 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java @@ -51,7 +51,7 @@ public class ByThemeMonthplanController extends BaseController { @Autowired private IByThemeTermplanitemService byThemeTermplanitemService; @Autowired - private IByThemeMonthplanitemService byThemeWeekplanService; + private IByThemeMonthplanitemService byThemeonthplanitemService; /** * 查询主题整合月计划列表 @@ -100,7 +100,7 @@ public class ByThemeMonthplanController extends BaseController { ByThemeTermplan byThemeTermplan = new ByThemeTermplan(); byThemeTermplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId()); byThemeTermplan.setClassid(classId); - byThemeTermplan.setStatus("1"); + byThemeTermplan.setStatus("2"); byThemeTermplan.setXnxq(byThemeMonthplan.getXnxq()); List list = byThemeTermplanService.selectByThemeTermplanList(byThemeTermplan); String strThemeIds = ""; @@ -112,7 +112,7 @@ public class ByThemeMonthplanController extends BaseController { byThemeTermplanitem.setMonth(byThemeMonthplan.getMonth()); List listItem = byThemeTermplanitemService.selectByThemeTermplanitemList(byThemeTermplanitem); if (listItem != null && listItem.size() > 0) { - for (int j = 0; j < list.size(); j++) { + for (int j = 0; j < listItem.size(); j++) { String themeIds = listItem.get(j).getThemeconent(); if (!schoolCommon.isStringEmpty(themeIds)) { strThemeIds = strThemeIds + themeIds; @@ -163,7 +163,7 @@ public class ByThemeMonthplanController extends BaseController { for (int i = 0; i < ids.length; i++) { ByThemeMonthplanitem byThemeMonthplanitem = new ByThemeMonthplanitem(); byThemeMonthplanitem.setMpid(ids[i]); - List list = byThemeWeekplanService.selectByThemeMonthplanitemList(byThemeMonthplanitem); + List list = byThemeonthplanitemService.selectByThemeMonthplanitemList(byThemeMonthplanitem); if (list != null && list.size() > 0) { return AjaxResult.error("选中的计划下存在子计划，无法删除"); } 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 index 6b9d012b1..989d93ee5 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeTermplanController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeTermplanController.java @@ -104,11 +104,13 @@ public class ByThemeTermplanController extends BaseController { byThemeTermplanitem = new ByThemeTermplanitem(); byThemeTermplanitem.setTpid(uuid); byThemeTermplanitem.setCreateuserid(SecurityUtils.getLoginUser().getUser().getUserId()); - //月份加1 - Calendar calendar = Calendar.getInstance(); - calendar.setTime(byThemeTermplan.getStartmonth()); - calendar.add(Calendar.MONTH, i); - byThemeTermplanitem.setMonth(calendar.getTime()); +// //月份加1 +// Calendar calendar = Calendar.getInstance(); +// calendar.setTime(byThemeTermplan.getStartmonth()); +// calendar.add(Calendar.MONTH, i); + + byThemeTermplanitem.setMonth(schoolCommon.DateAddMonths(i, byThemeTermplan.getStartmonth())); + //创建时间 byThemeTermplanitem.setCreateTime(new Date()); diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeWeekplanController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeWeekplanController.java new file mode 100644 index 000000000..c11df982f --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeWeekplanController.java @@ -0,0 +1,192 @@ +package com.ruoyi.project.benyi.controller; + +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.project.benyi.domain.ByThemeMonthplan; +import com.ruoyi.project.benyi.domain.ByThemeMonthplanitem; +import com.ruoyi.project.benyi.domain.ByThemeWeekplanitem; +import com.ruoyi.project.benyi.service.IByThemeMonthplanService; +import com.ruoyi.project.benyi.service.IByThemeMonthplanitemService; +import com.ruoyi.project.benyi.service.IByThemeWeekplanitemService; +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.ByThemeWeekplan; +import com.ruoyi.project.benyi.service.IByThemeWeekplanService; +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-26 + */ +@RestController +@RequestMapping("/benyi/themeweekplan") +public class ByThemeWeekplanController extends BaseController { + @Autowired + private IByThemeWeekplanService byThemeWeekplanService; + @Autowired + private SchoolCommon schoolCommon; + @Autowired + private IByClassService byClassService; + @Autowired + private IByThemeMonthplanService byThemeMonthplanService; + @Autowired + private IByThemeMonthplanitemService byThemeonthplanitemService; + @Autowired + private IByThemeWeekplanitemService byThemeWeekplanitemService; + + /** + * 查询主题整合周计划（根据月计划明细）列表 + */ + @PreAuthorize("@ss.hasPermi('benyi:themeweekplan:list')") + @GetMapping("/list") + public TableDataInfo list(ByThemeWeekplan byThemeWeekplan) { + startPage(); + List list = byThemeWeekplanService.selectByThemeWeekplanList(byThemeWeekplan); + return getDataTable(list); + } + + /** + * 导出主题整合周计划（根据月计划明细）列表 + */ + @PreAuthorize("@ss.hasPermi('benyi:themeweekplan:export')") + @Log(title = "主题整合周计划（根据月计划明细）", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(ByThemeWeekplan byThemeWeekplan) { + List list = byThemeWeekplanService.selectByThemeWeekplanList(byThemeWeekplan); + ExcelUtil util = new ExcelUtil(ByThemeWeekplan.class); + return util.exportExcel(list, "weekplan"); + } + + /** + * 获取主题整合周计划（根据月计划明细）详细信息 + */ + @PreAuthorize("@ss.hasPermi('benyi:themeweekplan:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) { + return AjaxResult.success(byThemeWeekplanService.selectByThemeWeekplanById(id)); + } + + /** + * 新增主题整合周计划（根据月计划明细） + */ + @PreAuthorize("@ss.hasPermi('benyi:themeweekplan:add')") + @Log(title = "主题整合周计划（根据月计划明细）", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ByThemeWeekplan byThemeWeekplan) { + String classId = schoolCommon.getClassId(); + //首先判断当前账户是否为幼儿园账号 + if (schoolCommon.isSchool() && !schoolCommon.isStringEmpty(classId)) { + + //判断当前班级是否创建月计划 + ByThemeMonthplan byThemeMonthplan = new ByThemeMonthplan(); + byThemeMonthplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId()); + byThemeMonthplan.setClassid(classId); + byThemeMonthplan.setXnxq(byThemeWeekplan.getXnxq()); + byThemeMonthplan.setMonth(byThemeWeekplan.getMonth()); + byThemeMonthplan.setStatus("2"); + List list = byThemeMonthplanService.selectByThemeMonthplanList(byThemeMonthplan); + int iCount = 0; + if (list != null && list.size() > 0) { + //循环月计划，查找周详情 + for (int i = 0; i < list.size(); i++) { + String mpid = list.get(i).getId(); + ByThemeMonthplanitem byThemeMonthplanitem = new ByThemeMonthplanitem(); + byThemeMonthplanitem.setMpid(mpid); + byThemeMonthplanitem.setZc(byThemeWeekplan.getZc()); + + List listItem = byThemeonthplanitemService.selectByThemeMonthplanitemList(byThemeMonthplanitem); + for (int j = 0; j < listItem.size(); j++) { + iCount = iCount + (j + 1); + } + } + } else { + return AjaxResult.error("当前班级未制定月计划或月计划未审批，无法创建周计划"); + } + + if (iCount <= 0) { + return AjaxResult.error("当前班级未设置月份明细计划，无法创建周计划"); + } + + String uuid = schoolCommon.getUuid(); + byThemeWeekplan.setId(uuid); + byThemeWeekplan.setName(byClassService.selectByClassById(classId).getBjmc() + "-主题整合周计划" + "(第" + byThemeWeekplan.getZc() + "周)"); + byThemeWeekplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId()); + byThemeWeekplan.setClassid(classId); + byThemeWeekplan.setCreateuserid(SecurityUtils.getLoginUser().getUser().getUserId()); + + if (list != null && list.size() > 0) { + //循环月计划，查找周详情 + for (int i = 0; i < list.size(); i++) { + String mpid = list.get(i).getId(); + ByThemeMonthplanitem byThemeMonthplanitem = new ByThemeMonthplanitem(); + byThemeMonthplanitem.setMpid(mpid); + byThemeMonthplanitem.setZc(byThemeWeekplan.getZc()); + + List listItem = byThemeonthplanitemService.selectByThemeMonthplanitemList(byThemeMonthplanitem); + for (int j = 0; j < listItem.size(); j++) { + SimpleDateFormat format = new java.text.SimpleDateFormat("yyyy-MM-dd"); + Date dtStart = listItem.get(j).getStarttime(); + Date dtEnd = listItem.get(j).getEndtime(); + long day = (dtEnd.getTime() - dtStart.getTime()) / (24 * 60 * 60 * 1000) + 1; + System.out.println("day=" + day); + ByThemeWeekplanitem byThemeWeekplanitem = null; + for (int g = 0; g < day; g++) { + byThemeWeekplanitem = new ByThemeWeekplanitem(); + byThemeWeekplanitem.setDaytime(schoolCommon.DateAddDays(g, listItem.get(j).getStarttime())); + byThemeWeekplanitem.setZhou(Long.valueOf(schoolCommon.dateToWeek(byThemeWeekplanitem.getDaytime()))); + byThemeWeekplanitem.setCreateuserid(SecurityUtils.getLoginUser().getUser().getUserId()); + byThemeWeekplanitem.setWpid(uuid); + byThemeWeekplanitemService.insertByThemeWeekplanitem(byThemeWeekplanitem); + } + + } + } + } + + return toAjax(byThemeWeekplanService.insertByThemeWeekplan(byThemeWeekplan)); + } else { + return AjaxResult.error("当前用户非幼儿园教师，无法创建周计划"); + } + } + + /** + * 修改主题整合周计划（根据月计划明细） + */ + @PreAuthorize("@ss.hasPermi('benyi:themeweekplan:edit')") + @Log(title = "主题整合周计划（根据月计划明细）", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ByThemeWeekplan byThemeWeekplan) { + return toAjax(byThemeWeekplanService.updateByThemeWeekplan(byThemeWeekplan)); + } + + /** + * 删除主题整合周计划（根据月计划明细） + */ + @PreAuthorize("@ss.hasPermi('benyi:themeweekplan:remove')") + @Log(title = "主题整合周计划（根据月计划明细）", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) { + return toAjax(byThemeWeekplanService.deleteByThemeWeekplanByIds(ids)); + } +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeWeekplanitemController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeWeekplanitemController.java new file mode 100644 index 000000000..42f023a1b --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeWeekplanitemController.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.ByThemeWeekplanitem; +import com.ruoyi.project.benyi.service.IByThemeWeekplanitemService; +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-26 + */ +@RestController +@RequestMapping("/benyi/themeweekplanitem") +public class ByThemeWeekplanitemController extends BaseController { + @Autowired + private IByThemeWeekplanitemService byThemeWeekplanitemService; + + /** + * 查询主题整合周计划明细列表 + */ + @PreAuthorize("@ss.hasPermi('benyi:themeweekplan:list')") + @GetMapping("/list") + public TableDataInfo list(ByThemeWeekplanitem byThemeWeekplanitem) { + startPage(); + List list = byThemeWeekplanitemService.selectByThemeWeekplanitemList(byThemeWeekplanitem); + return getDataTable(list); + } + + /** + * 导出主题整合周计划明细列表 + */ + @PreAuthorize("@ss.hasPermi('benyi:themeweekplan:export')") + @Log(title = "主题整合周计划明细", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(ByThemeWeekplanitem byThemeWeekplanitem) { + List list = byThemeWeekplanitemService.selectByThemeWeekplanitemList(byThemeWeekplanitem); + ExcelUtil util = new ExcelUtil(ByThemeWeekplanitem.class); + return util.exportExcel(list, "weekplanitem"); + } + + /** + * 获取主题整合周计划明细详细信息 + */ + @PreAuthorize("@ss.hasPermi('benyi:themeweekplan:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(byThemeWeekplanitemService.selectByThemeWeekplanitemById(id)); + } + + /** + * 新增主题整合周计划明细 + */ + @PreAuthorize("@ss.hasPermi('benyi:themeweekplan:add')") + @Log(title = "主题整合周计划明细", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ByThemeWeekplanitem byThemeWeekplanitem) { + return toAjax(byThemeWeekplanitemService.insertByThemeWeekplanitem(byThemeWeekplanitem)); + } + + /** + * 修改主题整合周计划明细 + */ + @PreAuthorize("@ss.hasPermi('benyi:themeweekplan:edit')") + @Log(title = "主题整合周计划明细", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ByThemeWeekplanitem byThemeWeekplanitem) { + return toAjax(byThemeWeekplanitemService.updateByThemeWeekplanitem(byThemeWeekplanitem)); + } + + /** + * 删除主题整合周计划明细 + */ + @PreAuthorize("@ss.hasPermi('benyi:themeweekplan:remove')") + @Log(title = "主题整合周计划明细", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(byThemeWeekplanitemService.deleteByThemeWeekplanitemByIds(ids)); + } +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByThemeWeekplan.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByThemeWeekplan.java new file mode 100644 index 000000000..145a3f4d3 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByThemeWeekplan.java @@ -0,0 +1,208 @@ +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_weekplan + * + * @author tsbz + * @date 2020-08-26 + */ +public class ByThemeWeekplan extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 编号 + */ + private String id; + + /** + * 名称 + */ + @Excel(name = "名称") + private String name; + + /** + * 学校id + */ + @Excel(name = "学校id") + private Long schoolid; + + /** + * 班级编号 + */ + @Excel(name = "班级编号") + private String classid; + + /** + * 所属月份 + */ + @JsonFormat(pattern = "yyyy-MM") + @Excel(name = "所属月份", width = 30, dateFormat = "yyyy-MM") + private Date month; + + /** + * 所属周 + */ + @Excel(name = "所属周") + private Long zc; + + /** + * 状态 + */ + @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; + + /** + * 审核意见 + */ + @Excel(name = "审核意见") + private String shyj; + + /** + * 创建人 + */ + @Excel(name = "创建人") + private Long createuserid; + + /** + * 学年学期 + */ + @Excel(name = "学年学期") + private String xnxq; + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + + public void setName(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + 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 setMonth(Date month) { + this.month = month; + } + + public Date getMonth() { + return month; + } + + public void setZc(Long zc) { + this.zc = zc; + } + + public Long getZc() { + return zc; + } + + 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; + } + + public void setShyj(String shyj) { + this.shyj = shyj; + } + + public String getShyj() { + return shyj; + } + + public void setCreateuserid(Long createuserid) { + this.createuserid = createuserid; + } + + public Long getCreateuserid() { + return createuserid; + } + + public void setXnxq(String xnxq) { + this.xnxq = xnxq; + } + + public String getXnxq() { + return xnxq; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("name", getName()) + .append("schoolid", getSchoolid()) + .append("classid", getClassid()) + .append("month", getMonth()) + .append("zc", getZc()) + .append("remark", getRemark()) + .append("status", getStatus()) + .append("spr", getSpr()) + .append("sptime", getSptime()) + .append("shyj", getShyj()) + .append("createuserid", getCreateuserid()) + .append("createTime", getCreateTime()) + .append("xnxq", getXnxq()) + .toString(); + } +} \ No newline at end of file diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByThemeWeekplanitem.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByThemeWeekplanitem.java new file mode 100644 index 000000000..04bbe50d9 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByThemeWeekplanitem.java @@ -0,0 +1,162 @@ +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_weekplanitem + * + * @author tsbz + * @date 2020-08-26 + */ +public class ByThemeWeekplanitem extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 编号 + */ + private Long id; + + /** + * 日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date daytime; + + /** + * 周 + */ + @Excel(name = "周") + private Long zhou; + + /** + * 活动 + */ + @Excel(name = "活动") + private String activityid; + + /** + * 分组性质 + */ + @Excel(name = "分组性质") + private String fzxz; + + /** + * 家长支持 + */ + @Excel(name = "家长支持") + private String jzzc; + + /** + * 创建人 + */ + @Excel(name = "创建人") + private Long createuserid; + + /** + * 修改人 + */ + @Excel(name = "修改人") + private Long updateuserid; + + /** + * 所属周计划 + */ + @Excel(name = "所属周计划") + private String wpid; + + public void setId(Long id) { + this.id = id; + } + + public Long getId() { + return id; + } + + public void setDaytime(Date daytime) { + this.daytime = daytime; + } + + public Date getDaytime() { + return daytime; + } + + public void setZhou(Long zhou) { + this.zhou = zhou; + } + + public Long getZhou() { + return zhou; + } + + public void setActivityid(String activityid) { + this.activityid = activityid; + } + + public String getActivityid() { + return activityid; + } + + public void setFzxz(String fzxz) { + this.fzxz = fzxz; + } + + public String getFzxz() { + return fzxz; + } + + public void setJzzc(String jzzc) { + this.jzzc = jzzc; + } + + public String getJzzc() { + return jzzc; + } + + public void setCreateuserid(Long createuserid) { + this.createuserid = createuserid; + } + + public Long getCreateuserid() { + return createuserid; + } + + public void setUpdateuserid(Long updateuserid) { + this.updateuserid = updateuserid; + } + + public Long getUpdateuserid() { + return updateuserid; + } + + public void setWpid(String wpid) { + this.wpid = wpid; + } + + public String getWpid() { + return wpid; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("daytime", getDaytime()) + .append("zhou", getZhou()) + .append("activityid", getActivityid()) + .append("fzxz", getFzxz()) + .append("jzzc", getJzzc()) + .append("createuserid", getCreateuserid()) + .append("createTime", getCreateTime()) + .append("updateuserid", getUpdateuserid()) + .append("updateTime", getUpdateTime()) + .append("wpid", getWpid()) + .toString(); + } +} \ No newline at end of file diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByThemeWeekplanMapper.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByThemeWeekplanMapper.java new file mode 100644 index 000000000..baa744921 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByThemeWeekplanMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.project.benyi.mapper; + +import java.util.List; + +import com.ruoyi.project.benyi.domain.ByThemeWeekplan; + +/** + * 主题整合周计划（根据月计划明细）Mapper接口 + * + * @author tsbz + * @date 2020-08-26 + */ +public interface ByThemeWeekplanMapper { + /** + * 查询主题整合周计划（根据月计划明细） + * + * @param id 主题整合周计划（根据月计划明细）ID + * @return 主题整合周计划（根据月计划明细） + */ + public ByThemeWeekplan selectByThemeWeekplanById(String id); + + /** + * 查询主题整合周计划（根据月计划明细）列表 + * + * @param byThemeWeekplan 主题整合周计划（根据月计划明细） + * @return 主题整合周计划（根据月计划明细）集合 + */ + public List selectByThemeWeekplanList(ByThemeWeekplan byThemeWeekplan); + + /** + * 新增主题整合周计划（根据月计划明细） + * + * @param byThemeWeekplan 主题整合周计划（根据月计划明细） + * @return 结果 + */ + public int insertByThemeWeekplan(ByThemeWeekplan byThemeWeekplan); + + /** + * 修改主题整合周计划（根据月计划明细） + * + * @param byThemeWeekplan 主题整合周计划（根据月计划明细） + * @return 结果 + */ + public int updateByThemeWeekplan(ByThemeWeekplan byThemeWeekplan); + + /** + * 删除主题整合周计划（根据月计划明细） + * + * @param id 主题整合周计划（根据月计划明细）ID + * @return 结果 + */ + public int deleteByThemeWeekplanById(String id); + + /** + * 批量删除主题整合周计划（根据月计划明细） + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteByThemeWeekplanByIds(String[] ids); +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByThemeWeekplanitemMapper.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByThemeWeekplanitemMapper.java new file mode 100644 index 000000000..5d93b13f4 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByThemeWeekplanitemMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.project.benyi.mapper; + +import java.util.List; + +import com.ruoyi.project.benyi.domain.ByThemeWeekplanitem; + +/** + * 主题整合周计划明细Mapper接口 + * + * @author tsbz + * @date 2020-08-26 + */ +public interface ByThemeWeekplanitemMapper { + /** + * 查询主题整合周计划明细 + * + * @param id 主题整合周计划明细ID + * @return 主题整合周计划明细 + */ + public ByThemeWeekplanitem selectByThemeWeekplanitemById(Long id); + + /** + * 查询主题整合周计划明细列表 + * + * @param byThemeWeekplanitem 主题整合周计划明细 + * @return 主题整合周计划明细集合 + */ + public List selectByThemeWeekplanitemList(ByThemeWeekplanitem byThemeWeekplanitem); + + /** + * 新增主题整合周计划明细 + * + * @param byThemeWeekplanitem 主题整合周计划明细 + * @return 结果 + */ + public int insertByThemeWeekplanitem(ByThemeWeekplanitem byThemeWeekplanitem); + + /** + * 修改主题整合周计划明细 + * + * @param byThemeWeekplanitem 主题整合周计划明细 + * @return 结果 + */ + public int updateByThemeWeekplanitem(ByThemeWeekplanitem byThemeWeekplanitem); + + /** + * 删除主题整合周计划明细 + * + * @param id 主题整合周计划明细ID + * @return 结果 + */ + public int deleteByThemeWeekplanitemById(Long id); + + /** + * 批量删除主题整合周计划明细 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteByThemeWeekplanitemByIds(Long[] ids); +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByThemeWeekplanService.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByThemeWeekplanService.java new file mode 100644 index 000000000..5cdbba2d0 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByThemeWeekplanService.java @@ -0,0 +1,61 @@ +package com.ruoyi.project.benyi.service; + +import java.util.List; + +import com.ruoyi.project.benyi.domain.ByThemeWeekplan; + +/** + * 主题整合周计划（根据月计划明细）Service接口 + * + * @author tsbz + * @date 2020-08-26 + */ +public interface IByThemeWeekplanService { + /** + * 查询主题整合周计划（根据月计划明细） + * + * @param id 主题整合周计划（根据月计划明细）ID + * @return 主题整合周计划（根据月计划明细） + */ + public ByThemeWeekplan selectByThemeWeekplanById(String id); + + /** + * 查询主题整合周计划（根据月计划明细）列表 + * + * @param byThemeWeekplan 主题整合周计划（根据月计划明细） + * @return 主题整合周计划（根据月计划明细）集合 + */ + public List selectByThemeWeekplanList(ByThemeWeekplan byThemeWeekplan); + + /** + * 新增主题整合周计划（根据月计划明细） + * + * @param byThemeWeekplan 主题整合周计划（根据月计划明细） + * @return 结果 + */ + public int insertByThemeWeekplan(ByThemeWeekplan byThemeWeekplan); + + /** + * 修改主题整合周计划（根据月计划明细） + * + * @param byThemeWeekplan 主题整合周计划（根据月计划明细） + * @return 结果 + */ + public int updateByThemeWeekplan(ByThemeWeekplan byThemeWeekplan); + + /** + * 批量删除主题整合周计划（根据月计划明细） + * + * @param ids 需要删除的主题整合周计划（根据月计划明细）ID + * @return 结果 + */ + public int deleteByThemeWeekplanByIds(String[] ids); + + /** + * 删除主题整合周计划（根据月计划明细）信息 + * + * @param id 主题整合周计划（根据月计划明细）ID + * @return 结果 + */ + public int deleteByThemeWeekplanById(String id); +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByThemeWeekplanitemService.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByThemeWeekplanitemService.java new file mode 100644 index 000000000..5aba4a0b4 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByThemeWeekplanitemService.java @@ -0,0 +1,61 @@ +package com.ruoyi.project.benyi.service; + +import java.util.List; + +import com.ruoyi.project.benyi.domain.ByThemeWeekplanitem; + +/** + * 主题整合周计划明细Service接口 + * + * @author tsbz + * @date 2020-08-26 + */ +public interface IByThemeWeekplanitemService { + /** + * 查询主题整合周计划明细 + * + * @param id 主题整合周计划明细ID + * @return 主题整合周计划明细 + */ + public ByThemeWeekplanitem selectByThemeWeekplanitemById(Long id); + + /** + * 查询主题整合周计划明细列表 + * + * @param byThemeWeekplanitem 主题整合周计划明细 + * @return 主题整合周计划明细集合 + */ + public List selectByThemeWeekplanitemList(ByThemeWeekplanitem byThemeWeekplanitem); + + /** + * 新增主题整合周计划明细 + * + * @param byThemeWeekplanitem 主题整合周计划明细 + * @return 结果 + */ + public int insertByThemeWeekplanitem(ByThemeWeekplanitem byThemeWeekplanitem); + + /** + * 修改主题整合周计划明细 + * + * @param byThemeWeekplanitem 主题整合周计划明细 + * @return 结果 + */ + public int updateByThemeWeekplanitem(ByThemeWeekplanitem byThemeWeekplanitem); + + /** + * 批量删除主题整合周计划明细 + * + * @param ids 需要删除的主题整合周计划明细ID + * @return 结果 + */ + public int deleteByThemeWeekplanitemByIds(Long[] ids); + + /** + * 删除主题整合周计划明细信息 + * + * @param id 主题整合周计划明细ID + * @return 结果 + */ + public int deleteByThemeWeekplanitemById(Long id); +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByThemeWeekplanServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByThemeWeekplanServiceImpl.java new file mode 100644 index 000000000..129a1620b --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByThemeWeekplanServiceImpl.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.ByThemeWeekplanMapper; +import com.ruoyi.project.benyi.domain.ByThemeWeekplan; +import com.ruoyi.project.benyi.service.IByThemeWeekplanService; + +/** + * 主题整合周计划（根据月计划明细）Service业务层处理 + * + * @author tsbz + * @date 2020-08-26 + */ +@Service +public class ByThemeWeekplanServiceImpl implements IByThemeWeekplanService { + @Autowired + private ByThemeWeekplanMapper byThemeWeekplanMapper; + + /** + * 查询主题整合周计划（根据月计划明细） + * + * @param id 主题整合周计划（根据月计划明细）ID + * @return 主题整合周计划（根据月计划明细） + */ + @Override + public ByThemeWeekplan selectByThemeWeekplanById(String id) { + return byThemeWeekplanMapper.selectByThemeWeekplanById(id); + } + + /** + * 查询主题整合周计划（根据月计划明细）列表 + * + * @param byThemeWeekplan 主题整合周计划（根据月计划明细） + * @return 主题整合周计划（根据月计划明细） + */ + @Override + public List selectByThemeWeekplanList(ByThemeWeekplan byThemeWeekplan) { + return byThemeWeekplanMapper.selectByThemeWeekplanList(byThemeWeekplan); + } + + /** + * 新增主题整合周计划（根据月计划明细） + * + * @param byThemeWeekplan 主题整合周计划（根据月计划明细） + * @return 结果 + */ + @Override + public int insertByThemeWeekplan(ByThemeWeekplan byThemeWeekplan) { + byThemeWeekplan.setCreateTime(DateUtils.getNowDate()); + return byThemeWeekplanMapper.insertByThemeWeekplan(byThemeWeekplan); + } + + /** + * 修改主题整合周计划（根据月计划明细） + * + * @param byThemeWeekplan 主题整合周计划（根据月计划明细） + * @return 结果 + */ + @Override + public int updateByThemeWeekplan(ByThemeWeekplan byThemeWeekplan) { + return byThemeWeekplanMapper.updateByThemeWeekplan(byThemeWeekplan); + } + + /** + * 批量删除主题整合周计划（根据月计划明细） + * + * @param ids 需要删除的主题整合周计划（根据月计划明细）ID + * @return 结果 + */ + @Override + public int deleteByThemeWeekplanByIds(String[] ids) { + return byThemeWeekplanMapper.deleteByThemeWeekplanByIds(ids); + } + + /** + * 删除主题整合周计划（根据月计划明细）信息 + * + * @param id 主题整合周计划（根据月计划明细）ID + * @return 结果 + */ + @Override + public int deleteByThemeWeekplanById(String id) { + return byThemeWeekplanMapper.deleteByThemeWeekplanById(id); + } +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByThemeWeekplanitemServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByThemeWeekplanitemServiceImpl.java new file mode 100644 index 000000000..7462aa791 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByThemeWeekplanitemServiceImpl.java @@ -0,0 +1,90 @@ +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.ByThemeWeekplanitemMapper; +import com.ruoyi.project.benyi.domain.ByThemeWeekplanitem; +import com.ruoyi.project.benyi.service.IByThemeWeekplanitemService; + +/** + * 主题整合周计划明细Service业务层处理 + * + * @author tsbz + * @date 2020-08-26 + */ +@Service +public class ByThemeWeekplanitemServiceImpl implements IByThemeWeekplanitemService { + @Autowired + private ByThemeWeekplanitemMapper byThemeWeekplanitemMapper; + + /** + * 查询主题整合周计划明细 + * + * @param id 主题整合周计划明细ID + * @return 主题整合周计划明细 + */ + @Override + public ByThemeWeekplanitem selectByThemeWeekplanitemById(Long id) { + return byThemeWeekplanitemMapper.selectByThemeWeekplanitemById(id); + } + + /** + * 查询主题整合周计划明细列表 + * + * @param byThemeWeekplanitem 主题整合周计划明细 + * @return 主题整合周计划明细 + */ + @Override + public List selectByThemeWeekplanitemList(ByThemeWeekplanitem byThemeWeekplanitem) { + return byThemeWeekplanitemMapper.selectByThemeWeekplanitemList(byThemeWeekplanitem); + } + + /** + * 新增主题整合周计划明细 + * + * @param byThemeWeekplanitem 主题整合周计划明细 + * @return 结果 + */ + @Override + public int insertByThemeWeekplanitem(ByThemeWeekplanitem byThemeWeekplanitem) { + byThemeWeekplanitem.setCreateTime(DateUtils.getNowDate()); + return byThemeWeekplanitemMapper.insertByThemeWeekplanitem(byThemeWeekplanitem); + } + + /** + * 修改主题整合周计划明细 + * + * @param byThemeWeekplanitem 主题整合周计划明细 + * @return 结果 + */ + @Override + public int updateByThemeWeekplanitem(ByThemeWeekplanitem byThemeWeekplanitem) { + byThemeWeekplanitem.setUpdateTime(DateUtils.getNowDate()); + return byThemeWeekplanitemMapper.updateByThemeWeekplanitem(byThemeWeekplanitem); + } + + /** + * 批量删除主题整合周计划明细 + * + * @param ids 需要删除的主题整合周计划明细ID + * @return 结果 + */ + @Override + public int deleteByThemeWeekplanitemByIds(Long[] ids) { + return byThemeWeekplanitemMapper.deleteByThemeWeekplanitemByIds(ids); + } + + /** + * 删除主题整合周计划明细信息 + * + * @param id 主题整合周计划明细ID + * @return 结果 + */ + @Override + public int deleteByThemeWeekplanitemById(Long id) { + return byThemeWeekplanitemMapper.deleteByThemeWeekplanitemById(id); + } +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/common/SchoolCommon.java b/ruoyi/src/main/java/com/ruoyi/project/common/SchoolCommon.java index 127f6e29a..fbff861c1 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/common/SchoolCommon.java +++ b/ruoyi/src/main/java/com/ruoyi/project/common/SchoolCommon.java @@ -187,4 +187,41 @@ public class SchoolCommon { int month = (end.get(Calendar.YEAR) - start.get(Calendar.YEAR)) * 12; return Math.abs(month + result); } + + //日期加天数 + public Date DateAddDays(int iday, Date dt) { + //天数加1 + Calendar calendar = Calendar.getInstance(); + calendar.setTime(dt); + calendar.add(Calendar.DAY_OF_MONTH, iday); + + return calendar.getTime(); + } + + //月份加数 + public Date DateAddMonths(int iday, Date dt) { + //天数加1 + Calendar calendar = Calendar.getInstance(); + calendar.setTime(dt); + calendar.add(Calendar.MONTH, iday); + + return calendar.getTime(); + } + + /** + * 日期转星期 + * + * @param datetime + * @return + */ + public int dateToWeek(Date datetime) { + int[] weekDays = {7, 1, 2, 3, 4, 5, 6}; + Calendar cal = Calendar.getInstance(); // 获得一个日历 + cal.setTime(datetime); + int w = cal.get(Calendar.DAY_OF_WEEK) - 1; // 指示一个星期中的某天。 + if (w < 0) + w = 0; + return weekDays[w]; + } + } diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByThemeWeekplanMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByThemeWeekplanMapper.xml new file mode 100644 index 000000000..a3926afb4 --- /dev/null +++ b/ruoyi/src/main/resources/mybatis/benyi/ByThemeWeekplanMapper.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + select id, name, schoolid, classid, month, zc, remark, status, spr, sptime, shyj, createuserid, create_time, xnxq from by_theme_weekplan + + + + + + + + insert into by_theme_weekplan + + id, + name, + schoolid, + classid, + month, + zc, + remark, + status, + spr, + sptime, + shyj, + createuserid, + create_time, + xnxq, + + + #{id}, + #{name}, + #{schoolid}, + #{classid}, + #{month}, + #{zc}, + #{remark}, + #{status}, + #{spr}, + #{sptime}, + #{shyj}, + #{createuserid}, + #{createTime}, + #{xnxq}, + + + + + update by_theme_weekplan + + name = #{name}, + schoolid = #{schoolid}, + classid = #{classid}, + month = #{month}, + zc = #{zc}, + remark = #{remark}, + status = #{status}, + spr = #{spr}, + sptime = #{sptime}, + shyj = #{shyj}, + createuserid = #{createuserid}, + create_time = #{createTime}, + xnxq = #{xnxq}, + + where id = #{id} + + + + delete from by_theme_weekplan where id = #{id} + + + + delete from by_theme_weekplan where id in + + #{id} + + + + \ No newline at end of file diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByThemeWeekplanitemMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByThemeWeekplanitemMapper.xml new file mode 100644 index 000000000..246509333 --- /dev/null +++ b/ruoyi/src/main/resources/mybatis/benyi/ByThemeWeekplanitemMapper.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + select id, daytime, zhou, activityid, fzxz, jzzc, createuserid, create_time, updateuserid, update_time, wpid from by_theme_weekplanitem + + + + + + + + insert into by_theme_weekplanitem + + daytime, + zhou, + activityid, + fzxz, + jzzc, + createuserid, + create_time, + updateuserid, + update_time, + wpid, + + + #{daytime}, + #{zhou}, + #{activityid}, + #{fzxz}, + #{jzzc}, + #{createuserid}, + #{createTime}, + #{updateuserid}, + #{updateTime}, + #{wpid}, + + + + + update by_theme_weekplanitem + + daytime = #{daytime}, + zhou = #{zhou}, + activityid = #{activityid}, + fzxz = #{fzxz}, + jzzc = #{jzzc}, + createuserid = #{createuserid}, + create_time = #{createTime}, + updateuserid = #{updateuserid}, + update_time = #{updateTime}, + wpid = #{wpid}, + + where id = #{id} + + + + delete from by_theme_weekplanitem where id = #{id} + + + + delete from by_theme_weekplanitem where id in + + #{id} + + + + \ No newline at end of file