From d686674ddc0814b986cd665f878f77f6aaf56f1e Mon Sep 17 00:00:00 2001 From: paidaxing444 <12qwaszx> Date: Sun, 10 May 2020 21:03:42 +0800 Subject: [PATCH] =?UTF-8?q?20200510-zlp-1=20=E6=96=B0=E5=A2=9E=E6=9C=AC?= =?UTF-8?q?=E4=B8=80=E7=AB=AF=E5=9B=AD=E5=8E=86=20=E5=9B=AD=E5=8E=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=20=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=92=8C=E6=B4=BB=E5=8A=A8=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/api/benyi/calendar.js | 53 +++ ruoyi-ui/src/views/benyi/calendar/index.vue | 353 ++++++++++++++++++ .../controller/ByCalendarController.java | 103 +++++ .../project/benyi/domain/ByCalendar.java | 137 +++++++ .../benyi/domain/BySchoolcalendar.java | 146 +++++--- .../benyi/domain/BySchoolcalendarClass.java | 12 - .../benyi/mapper/ByCalendarMapper.java | 61 +++ .../benyi/service/IByCalendarService.java | 61 +++ .../service/impl/ByCalendarServiceImpl.java | 93 +++++ .../mybatis/benyi/ByCalendarMapper.xml | 89 +++++ .../benyi/BySchoolcalendarClassMapper.xml | 45 +-- .../mybatis/benyi/BySchoolcalendarMapper.xml | 12 +- 12 files changed, 1064 insertions(+), 101 deletions(-) create mode 100644 ruoyi-ui/src/api/benyi/calendar.js create mode 100644 ruoyi-ui/src/views/benyi/calendar/index.vue create mode 100644 ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByCalendarController.java create mode 100644 ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByCalendar.java create mode 100644 ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByCalendarMapper.java create mode 100644 ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByCalendarService.java create mode 100644 ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByCalendarServiceImpl.java create mode 100644 ruoyi/src/main/resources/mybatis/benyi/ByCalendarMapper.xml diff --git a/ruoyi-ui/src/api/benyi/calendar.js b/ruoyi-ui/src/api/benyi/calendar.js new file mode 100644 index 000000000..fb512aab5 --- /dev/null +++ b/ruoyi-ui/src/api/benyi/calendar.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询园历管理(本一)列表 +export function listCalendar(query) { + return request({ + url: '/system/calendar/list', + method: 'get', + params: query + }) +} + +// 查询园历管理(本一)详细 +export function getCalendar(id) { + return request({ + url: '/system/calendar/' + id, + method: 'get' + }) +} + +// 新增园历管理(本一) +export function addCalendar(data) { + return request({ + url: '/system/calendar', + method: 'post', + data: data + }) +} + +// 修改园历管理(本一) +export function updateCalendar(data) { + return request({ + url: '/system/calendar', + method: 'put', + data: data + }) +} + +// 删除园历管理(本一) +export function delCalendar(id) { + return request({ + url: '/system/calendar/' + id, + method: 'delete' + }) +} + +// 导出园历管理(本一) +export function exportCalendar(query) { + return request({ + url: '/system/calendar/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/views/benyi/calendar/index.vue b/ruoyi-ui/src/views/benyi/calendar/index.vue new file mode 100644 index 000000000..82c1951b9 --- /dev/null +++ b/ruoyi-ui/src/views/benyi/calendar/index.vue @@ -0,0 +1,353 @@ + + + \ No newline at end of file diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByCalendarController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByCalendarController.java new file mode 100644 index 000000000..424f5b6ee --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByCalendarController.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.ByCalendar; +import com.ruoyi.project.benyi.service.IByCalendarService; +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-05-10 + */ +@RestController +@RequestMapping("/benyi/calendar") +public class ByCalendarController extends BaseController +{ + @Autowired + private IByCalendarService byCalendarService; + + /** + * 查询园历管理(本一)列表 + */ + @PreAuthorize("@ss.hasPermi('system:calendar:list')") + @GetMapping("/list") + public TableDataInfo list(ByCalendar byCalendar) + { + startPage(); + List list = byCalendarService.selectByCalendarList(byCalendar); + return getDataTable(list); + } + + /** + * 导出园历管理(本一)列表 + */ + @PreAuthorize("@ss.hasPermi('system:calendar:export')") + @Log(title = "园历管理(本一)", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(ByCalendar byCalendar) + { + List list = byCalendarService.selectByCalendarList(byCalendar); + ExcelUtil util = new ExcelUtil(ByCalendar.class); + return util.exportExcel(list, "calendar"); + } + + /** + * 获取园历管理(本一)详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:calendar:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(byCalendarService.selectByCalendarById(id)); + } + + /** + * 新增园历管理(本一) + */ + @PreAuthorize("@ss.hasPermi('system:calendar:add')") + @Log(title = "园历管理(本一)", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ByCalendar byCalendar) + { + return toAjax(byCalendarService.insertByCalendar(byCalendar)); + } + + /** + * 修改园历管理(本一) + */ + @PreAuthorize("@ss.hasPermi('system:calendar:edit')") + @Log(title = "园历管理(本一)", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ByCalendar byCalendar) + { + return toAjax(byCalendarService.updateByCalendar(byCalendar)); + } + + /** + * 删除园历管理(本一) + */ + @PreAuthorize("@ss.hasPermi('system:calendar:remove')") + @Log(title = "园历管理(本一)", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(byCalendarService.deleteByCalendarByIds(ids)); + } +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByCalendar.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByCalendar.java new file mode 100644 index 000000000..38d3ab646 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByCalendar.java @@ -0,0 +1,137 @@ +package com.ruoyi.project.benyi.domain; + +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; +import java.util.Date; + +/** + * 园历管理(本一)对象 by_calendar + * + * @author tsbz + * @date 2020-05-10 + */ +public class ByCalendar extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 标识 */ + private Long id; + + /** 名称 */ + @Excel(name = "名称") + private String name; + + /** 活动类型 */ + @Excel(name = "活动类型") + private String type; + + /** 活动时间 */ + @Excel(name = "活动时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date activitytime; + + /** 活动结束时间 */ + @Excel(name = "活动结束时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date activityendtime; + + /** 活动样式颜色 */ + @Excel(name = "活动样式颜色") + private String stylecolor; + + /** 创建人 */ + @Excel(name = "创建人") + private Long createuserid; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createtime; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setName(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + public void setType(String type) + { + this.type = type; + } + + public String getType() + { + return type; + } + public void setActivitytime(Date activitytime) + { + this.activitytime = activitytime; + } + + public Date getActivitytime() + { + return activitytime; + } + public void setActivityendtime(Date activityendtime) + { + this.activityendtime = activityendtime; + } + + public Date getActivityendtime() + { + return activityendtime; + } + public void setStylecolor(String stylecolor) + { + this.stylecolor = stylecolor; + } + + public String getStylecolor() + { + return stylecolor; + } + public void setCreateuserid(Long createuserid) + { + this.createuserid = createuserid; + } + + public Long getCreateuserid() + { + return createuserid; + } + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public Date getCreatetime() { + return createtime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("name", getName()) + .append("type", getType()) + .append("activitytime", getActivitytime()) + .append("activityendtime", getActivityendtime()) + .append("stylecolor", getStylecolor()) + .append("createuserid", getCreateuserid()) + .append("createtime", getCreatetime()) + .toString(); + } +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcalendar.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcalendar.java index 2ee6f58f0..5b3ce50ed 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcalendar.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcalendar.java @@ -5,46 +5,74 @@ 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; + import java.util.Date; /** * 园历管理对象 by_schoolcalendar - * + * * @author tsbz * @date 2020-04-20 */ -public class BySchoolcalendar extends BaseEntity -{ +public class BySchoolcalendar extends BaseEntity { private static final long serialVersionUID = 1L; - /** 标识 */ + /** + * 标识 + */ private Long id; - /** 名称 */ + /** + * 名称 + */ @Excel(name = "名称") private String name; - /** 活动类型 */ + /** + * 活动类型 + */ @Excel(name = "活动类型") private String type; - /** 适用范围：大班、中班、小班、全园 */ + /** + * 适用范围：大班、中班、小班、全园 + */ @Excel(name = "适用范围：大班、中班、小班、全园") private String scope; - /** 学年学期 */ + /** + * 学年学期 + */ @Excel(name = "学年学期") private String xnxq; - /** 所属学校 */ + /** + * 所属学校 + */ @Excel(name = "所属学校") private Long deptid; - /** 活动时间 */ + /** + * 活动时间 + */ @JsonFormat(pattern = "yyyy-MM-dd") private Date activitytime; - /** 创建人 */ + /** + * 活动结束时间 + */ + @Excel(name = "活动结束时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date activityendtime; + + /** + * 活动样式颜色 + */ + @Excel(name = "活动样式颜色") + private String stylecolor; + + /** + * 创建人 + */ @Excel(name = "创建人") private Long createuserid; @@ -54,78 +82,86 @@ public class BySchoolcalendar extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createtime; - public void setId(Long id) - { + public void setId(Long id) { this.id = id; } - public Long getId() - { + public Long getId() { return id; } - public void setName(String name) - { + + public void setName(String name) { this.name = name; } - public String getName() - { + public String getName() { return name; } - public void setType(String type) - { + + public void setType(String type) { this.type = type; } - public String getType() - { + public String getType() { return type; } - public void setScope(String scope) - { + + public void setScope(String scope) { this.scope = scope; } - public String getScope() - { + public String getScope() { return scope; } - public void setXnxq(String xnxq) - { + + public void setXnxq(String xnxq) { this.xnxq = xnxq; } - public String getXnxq() - { + public String getXnxq() { return xnxq; } - public void setDeptid(Long deptid) - { + + public void setDeptid(Long deptid) { this.deptid = deptid; } - public Long getDeptid() - { + public Long getDeptid() { return deptid; } - public void setActivitytime(Date activitytime) - { + + public void setActivitytime(Date activitytime) { this.activitytime = activitytime; } - public Date getActivitytime() - { + public Date getActivitytime() { return activitytime; } - public void setCreateuserid(Long createuserid) - { + + public void setActivityendtime(Date activityendtime) { + this.activityendtime = activityendtime; + } + + public Date getActivityendtime() { + return activityendtime; + } + + public void setStylecolor(String stylecolor) { + this.stylecolor = stylecolor; + } + + public String getStylecolor() { + return stylecolor; + } + + public void setCreateuserid(Long createuserid) { this.createuserid = createuserid; } - public Long getCreateuserid() - { + public Long getCreateuserid() { return createuserid; } + public void setCreatetime(Date createtime) { this.createtime = createtime; } @@ -136,16 +172,18 @@ public class BySchoolcalendar extends BaseEntity @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("name", getName()) - .append("type", getType()) - .append("scope", getScope()) - .append("xnxq", getXnxq()) - .append("deptid", getDeptid()) - .append("activitytime", getActivitytime()) - .append("createuserid", getCreateuserid()) - .append("createtime", getCreatetime()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("name", getName()) + .append("type", getType()) + .append("scope", getScope()) + .append("xnxq", getXnxq()) + .append("deptid", getDeptid()) + .append("activitytime", getActivitytime()) + .append("activityendtime", getActivityendtime()) + .append("stylecolor", getStylecolor()) + .append("createuserid", getCreateuserid()) + .append("createtime", getCreatetime()) + .toString(); } } diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcalendarClass.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcalendarClass.java index b790e8769..4c54be156 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcalendarClass.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcalendarClass.java @@ -1,7 +1,6 @@ package com.ruoyi.project.benyi.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.project.system.domain.ByClass; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.framework.aspectj.lang.annotation.Excel; @@ -54,8 +53,6 @@ public class BySchoolcalendarClass extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createtime; - private ByClass byClass; - public void setId(Long id) @@ -145,7 +142,6 @@ public class BySchoolcalendarClass extends BaseEntity .append("activitytime", getActivitytime()) .append("createuserid", getCreateuserid()) .append("createtime", getCreatetime()) - .append("byClass", getByClass()) .toString(); } @@ -156,12 +152,4 @@ public class BySchoolcalendarClass extends BaseEntity public void setCreatetime(Date createtime) { this.createtime = createtime; } - - public ByClass getByClass() { - return byClass; - } - - public void setByClass(ByClass byClass) { - this.byClass = byClass; - } } diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByCalendarMapper.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByCalendarMapper.java new file mode 100644 index 000000000..ccd456d27 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByCalendarMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.project.benyi.mapper; + +import java.util.List; +import com.ruoyi.project.benyi.domain.ByCalendar; + +/** + * 园历管理(本一)Mapper接口 + * + * @author tsbz + * @date 2020-05-10 + */ +public interface ByCalendarMapper +{ + /** + * 查询园历管理(本一) + * + * @param id 园历管理(本一)ID + * @return 园历管理(本一) + */ + public ByCalendar selectByCalendarById(Long id); + + /** + * 查询园历管理(本一)列表 + * + * @param byCalendar 园历管理(本一) + * @return 园历管理(本一)集合 + */ + public List selectByCalendarList(ByCalendar byCalendar); + + /** + * 新增园历管理(本一) + * + * @param byCalendar 园历管理(本一) + * @return 结果 + */ + public int insertByCalendar(ByCalendar byCalendar); + + /** + * 修改园历管理(本一) + * + * @param byCalendar 园历管理(本一) + * @return 结果 + */ + public int updateByCalendar(ByCalendar byCalendar); + + /** + * 删除园历管理(本一) + * + * @param id 园历管理(本一)ID + * @return 结果 + */ + public int deleteByCalendarById(Long id); + + /** + * 批量删除园历管理(本一) + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteByCalendarByIds(Long[] ids); +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByCalendarService.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByCalendarService.java new file mode 100644 index 000000000..ba12fcde6 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByCalendarService.java @@ -0,0 +1,61 @@ +package com.ruoyi.project.benyi.service; + +import java.util.List; +import com.ruoyi.project.benyi.domain.ByCalendar; + +/** + * 园历管理(本一)Service接口 + * + * @author tsbz + * @date 2020-05-10 + */ +public interface IByCalendarService +{ + /** + * 查询园历管理(本一) + * + * @param id 园历管理(本一)ID + * @return 园历管理(本一) + */ + public ByCalendar selectByCalendarById(Long id); + + /** + * 查询园历管理(本一)列表 + * + * @param byCalendar 园历管理(本一) + * @return 园历管理(本一)集合 + */ + public List selectByCalendarList(ByCalendar byCalendar); + + /** + * 新增园历管理(本一) + * + * @param byCalendar 园历管理(本一) + * @return 结果 + */ + public int insertByCalendar(ByCalendar byCalendar); + + /** + * 修改园历管理(本一) + * + * @param byCalendar 园历管理(本一) + * @return 结果 + */ + public int updateByCalendar(ByCalendar byCalendar); + + /** + * 批量删除园历管理(本一) + * + * @param ids 需要删除的园历管理(本一)ID + * @return 结果 + */ + public int deleteByCalendarByIds(Long[] ids); + + /** + * 删除园历管理(本一)信息 + * + * @param id 园历管理(本一)ID + * @return 结果 + */ + public int deleteByCalendarById(Long id); +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByCalendarServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByCalendarServiceImpl.java new file mode 100644 index 000000000..c2789cfeb --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByCalendarServiceImpl.java @@ -0,0 +1,93 @@ +package com.ruoyi.project.benyi.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.project.benyi.mapper.ByCalendarMapper; +import com.ruoyi.project.benyi.domain.ByCalendar; +import com.ruoyi.project.benyi.service.IByCalendarService; + +/** + * 园历管理(本一)Service业务层处理 + * + * @author tsbz + * @date 2020-05-10 + */ +@Service +public class ByCalendarServiceImpl implements IByCalendarService +{ + @Autowired + private ByCalendarMapper byCalendarMapper; + + /** + * 查询园历管理(本一) + * + * @param id 园历管理(本一)ID + * @return 园历管理(本一) + */ + @Override + public ByCalendar selectByCalendarById(Long id) + { + return byCalendarMapper.selectByCalendarById(id); + } + + /** + * 查询园历管理(本一)列表 + * + * @param byCalendar 园历管理(本一) + * @return 园历管理(本一) + */ + @Override + public List selectByCalendarList(ByCalendar byCalendar) + { + return byCalendarMapper.selectByCalendarList(byCalendar); + } + + /** + * 新增园历管理(本一) + * + * @param byCalendar 园历管理(本一) + * @return 结果 + */ + @Override + public int insertByCalendar(ByCalendar byCalendar) + { + return byCalendarMapper.insertByCalendar(byCalendar); + } + + /** + * 修改园历管理(本一) + * + * @param byCalendar 园历管理(本一) + * @return 结果 + */ + @Override + public int updateByCalendar(ByCalendar byCalendar) + { + return byCalendarMapper.updateByCalendar(byCalendar); + } + + /** + * 批量删除园历管理(本一) + * + * @param ids 需要删除的园历管理(本一)ID + * @return 结果 + */ + @Override + public int deleteByCalendarByIds(Long[] ids) + { + return byCalendarMapper.deleteByCalendarByIds(ids); + } + + /** + * 删除园历管理(本一)信息 + * + * @param id 园历管理(本一)ID + * @return 结果 + */ + @Override + public int deleteByCalendarById(Long id) + { + return byCalendarMapper.deleteByCalendarById(id); + } +} diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByCalendarMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByCalendarMapper.xml new file mode 100644 index 000000000..39012435b --- /dev/null +++ b/ruoyi/src/main/resources/mybatis/benyi/ByCalendarMapper.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + select id, name, type, activitytime, activityendtime, stylecolor, createuserid, createtime from by_calendar + + + + + + + + insert into by_calendar + + id, + name, + type, + activitytime, + activityendtime, + stylecolor, + createuserid, + createtime, + + + #{id}, + #{name}, + #{type}, + #{activitytime}, + #{activityendtime}, + #{stylecolor}, + #{createuserid}, + #{createtime}, + + + + + update by_calendar + + name = #{name}, + type = #{type}, + activitytime = #{activitytime}, + activityendtime = #{activityendtime}, + stylecolor = #{stylecolor}, + createuserid = #{createuserid}, + createtime = #{createtime}, + + where id = #{id} + + + + delete from by_calendar where id = #{id} + + + + delete from by_calendar where id in + + #{id} + + + + \ No newline at end of file diff --git a/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarClassMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarClassMapper.xml index 8e174c4c9..65aa652cd 100644 --- a/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarClassMapper.xml +++ b/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarClassMapper.xml @@ -14,46 +14,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - - - - - - - - - - - - - - - - select id, name, type, classid, xnxq, deptId, activitytime, createuserid, createtime - from by_schoolcalendar_class + select id, name, type, classid, xnxq, deptId, activitytime, createuserid, createtime from by_schoolcalendar_class diff --git a/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarMapper.xml index 841855599..12f2691e1 100644 --- a/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarMapper.xml +++ b/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarMapper.xml @@ -12,12 +12,14 @@ + + - select id, name, type, scope, xnxq, dept_id, activitytime, createuserid, createtime from by_schoolcalendar d + select id, name, type, scope, xnxq, dept_id, activitytime, activityendtime, stylecolor, createuserid, createtime from by_schoolcalendar d