diff --git a/ruoyi-ui/src/api/benyi/schoolcalendarclass.js b/ruoyi-ui/src/api/benyi/schoolcalendarclass.js new file mode 100644 index 000000000..cedc717e8 --- /dev/null +++ b/ruoyi-ui/src/api/benyi/schoolcalendarclass.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询园历管理(班级)列表 +export function listSchoolcalendarclass(query) { + return request({ + url: '/benyi/schoolcalendarclass/list', + method: 'get', + params: query + }) +} + +// 查询园历管理(班级)详细 +export function getSchoolcalendarclass(id) { + return request({ + url: '/benyi/schoolcalendarclass/' + id, + method: 'get' + }) +} + +// 新增园历管理(班级) +export function addSchoolcalendarclass(data) { + return request({ + url: '/benyi/schoolcalendarclass', + method: 'post', + data: data + }) +} + +// 修改园历管理(班级) +export function updateSchoolcalendarclass(data) { + return request({ + url: '/benyi/schoolcalendarclass', + method: 'put', + data: data + }) +} + +// 删除园历管理(班级) +export function delSchoolcalendarclass(id) { + return request({ + url: '/benyi/schoolcalendarclass/' + id, + method: 'delete' + }) +} + +// 导出园历管理(班级) +export function exportSchoolcalendarclass(query) { + return request({ + url: '/benyi/schoolcalendarclass/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/views/benyi/schoolcalendarclass/index.vue b/ruoyi-ui/src/views/benyi/schoolcalendarclass/index.vue new file mode 100644 index 000000000..1b42439ef --- /dev/null +++ b/ruoyi-ui/src/views/benyi/schoolcalendarclass/index.vue @@ -0,0 +1,345 @@ + + + \ No newline at end of file diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/BySchoolcalendarClassController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/BySchoolcalendarClassController.java new file mode 100644 index 000000000..99393bcb5 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/BySchoolcalendarClassController.java @@ -0,0 +1,126 @@ +package com.ruoyi.project.benyi.controller; + +import java.util.Date; +import java.util.List; + +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.project.common.SchoolCommon; +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.BySchoolcalendarClass; +import com.ruoyi.project.benyi.service.IBySchoolcalendarClassService; +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-06 + */ +@RestController +@RequestMapping("/benyi/schoolcalendarclass") +public class BySchoolcalendarClassController extends BaseController +{ + @Autowired + private IBySchoolcalendarClassService bySchoolcalendarClassService; + + //导入学校公用类 + @Autowired + private SchoolCommon schoolCommon; + + /** + * 查询园历管理(班级)列表 + */ + @PreAuthorize("@ss.hasPermi('benyi:schoolcalendarclass:list')") + @GetMapping("/list") + public TableDataInfo list(BySchoolcalendarClass bySchoolcalendarClass) + { + startPage(); + List list = bySchoolcalendarClassService.selectBySchoolcalendarClassList(bySchoolcalendarClass); + return getDataTable(list); + } + + /** + * 导出园历管理(班级)列表 + */ + @PreAuthorize("@ss.hasPermi('benyi:schoolcalendarclass:export')") + @Log(title = "园历管理(班级)", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(BySchoolcalendarClass bySchoolcalendarClass) + { + List list = bySchoolcalendarClassService.selectBySchoolcalendarClassList(bySchoolcalendarClass); + ExcelUtil util = new ExcelUtil(BySchoolcalendarClass.class); + return util.exportExcel(list, "schoolcalendarclass"); + } + + /** + * 获取园历管理(班级)详细信息 + */ + @PreAuthorize("@ss.hasPermi('benyi:schoolcalendarclass:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(bySchoolcalendarClassService.selectBySchoolcalendarClassById(id)); + } + + /** + * 新增园历管理(班级) + */ + @PreAuthorize("@ss.hasPermi('benyi:schoolcalendarclass:add')") + @Log(title = "园历管理(班级)", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BySchoolcalendarClass bySchoolcalendarClass) + { + String strClassId = schoolCommon.getClassId(); + if(!schoolCommon.isStringEmpty(strClassId)) { + //设置创建时间为当前时间 + bySchoolcalendarClass.setCreatetime(new Date()); + //设置学年信息 从学校公共类调取方法 传入活动时间进行判断 + bySchoolcalendarClass.setXnxq(schoolCommon.getCurrentXnXq(bySchoolcalendarClass.getActivitytime())); + //设置创建人id + bySchoolcalendarClass.setCreateuserid(SecurityUtils.getLoginUser().getUser().getUserId()); + //设置部门id + bySchoolcalendarClass.setDeptid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId()); + bySchoolcalendarClass.setClassid(strClassId); + return toAjax(bySchoolcalendarClassService.insertBySchoolcalendarClass(bySchoolcalendarClass)); + }else { + return AjaxResult.error("当前用户下没有班级，无法创建园历"); + } + + } + + /** + * 修改园历管理(班级) + */ + @PreAuthorize("@ss.hasPermi('benyi:schoolcalendarclass:edit')") + @Log(title = "园历管理(班级)", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BySchoolcalendarClass bySchoolcalendarClass) + { + return toAjax(bySchoolcalendarClassService.updateBySchoolcalendarClass(bySchoolcalendarClass)); + } + + /** + * 删除园历管理(班级) + */ + @PreAuthorize("@ss.hasPermi('benyi:schoolcalendarclass:remove')") + @Log(title = "园历管理(班级)", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(bySchoolcalendarClassService.deleteBySchoolcalendarClassByIds(ids)); + } +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/BySchoolcalendarController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/BySchoolcalendarController.java index e270d064c..37212acb6 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/BySchoolcalendarController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/BySchoolcalendarController.java @@ -172,6 +172,7 @@ public class BySchoolcalendarController extends BaseController { bySchoolcalendar.setXnxq(strXnxq); bySchoolcalendar.setCreateuserid(SecurityUtils.getLoginUser().getUser().getUserId()); bySchoolcalendar.setDeptid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId()); + return toAjax(bySchoolcalendarService.insertBySchoolcalendar(bySchoolcalendar)); } else { return AjaxResult.error("当前用户非幼儿园，无法创建园历"); 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 new file mode 100644 index 000000000..4c54be156 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcalendarClass.java @@ -0,0 +1,155 @@ +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_schoolcalendar_class + * + * @author tsbz + * @date 2020-05-06 + */ +public class BySchoolcalendarClass 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 classid; + + /** 学年学期 */ + @Excel(name = "学年学期") + private String xnxq; + + /** 所属学校 */ + @Excel(name = "所属学校") + private Long deptid; + + /** 活动时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date activitytime; + + /** 创建人 */ + @Excel(name = "创建人") + private Long createuserid; + + /** 创建时间 */ + @Excel(name = "创建时间") + @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 setClassid(String classid) + { + this.classid = classid; + } + + public String getClassid() + { + return classid; + } + public void setXnxq(String xnxq) + { + this.xnxq = xnxq; + } + + public String getXnxq() + { + return xnxq; + } + public void setDeptid(Long deptid) + { + this.deptid = deptid; + } + + public Long getDeptid() + { + return deptid; + } + public void setActivitytime(Date activitytime) + { + this.activitytime = activitytime; + } + + public Date getActivitytime() + { + return activitytime; + } + public void setCreateuserid(Long createuserid) + { + this.createuserid = createuserid; + } + + public Long getCreateuserid() + { + return createuserid; + } + + + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("name", getName()) + .append("type", getType()) + .append("classid", getClassid()) + .append("xnxq", getXnxq()) + .append("deptid", getDeptid()) + .append("activitytime", getActivitytime()) + .append("createuserid", getCreateuserid()) + .append("createtime", getCreatetime()) + .toString(); + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/BySchoolcalendarClassMapper.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/BySchoolcalendarClassMapper.java new file mode 100644 index 000000000..57015f958 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/BySchoolcalendarClassMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.project.benyi.mapper; + +import java.util.List; +import com.ruoyi.project.benyi.domain.BySchoolcalendarClass; + +/** + * 园历管理(班级)Mapper接口 + * + * @author tsbz + * @date 2020-05-06 + */ +public interface BySchoolcalendarClassMapper +{ + /** + * 查询园历管理(班级) + * + * @param id 园历管理(班级)ID + * @return 园历管理(班级) + */ + public BySchoolcalendarClass selectBySchoolcalendarClassById(Long id); + + /** + * 查询园历管理(班级)列表 + * + * @param bySchoolcalendarClass 园历管理(班级) + * @return 园历管理(班级)集合 + */ + public List selectBySchoolcalendarClassList(BySchoolcalendarClass bySchoolcalendarClass); + + /** + * 新增园历管理(班级) + * + * @param bySchoolcalendarClass 园历管理(班级) + * @return 结果 + */ + public int insertBySchoolcalendarClass(BySchoolcalendarClass bySchoolcalendarClass); + + /** + * 修改园历管理(班级) + * + * @param bySchoolcalendarClass 园历管理(班级) + * @return 结果 + */ + public int updateBySchoolcalendarClass(BySchoolcalendarClass bySchoolcalendarClass); + + /** + * 删除园历管理(班级) + * + * @param id 园历管理(班级)ID + * @return 结果 + */ + public int deleteBySchoolcalendarClassById(Long id); + + /** + * 批量删除园历管理(班级) + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteBySchoolcalendarClassByIds(Long[] ids); +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IBySchoolcalendarClassService.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IBySchoolcalendarClassService.java new file mode 100644 index 000000000..2318a7121 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IBySchoolcalendarClassService.java @@ -0,0 +1,61 @@ +package com.ruoyi.project.benyi.service; + +import java.util.List; +import com.ruoyi.project.benyi.domain.BySchoolcalendarClass; + +/** + * 园历管理(班级)Service接口 + * + * @author tsbz + * @date 2020-05-06 + */ +public interface IBySchoolcalendarClassService +{ + /** + * 查询园历管理(班级) + * + * @param id 园历管理(班级)ID + * @return 园历管理(班级) + */ + public BySchoolcalendarClass selectBySchoolcalendarClassById(Long id); + + /** + * 查询园历管理(班级)列表 + * + * @param bySchoolcalendarClass 园历管理(班级) + * @return 园历管理(班级)集合 + */ + public List selectBySchoolcalendarClassList(BySchoolcalendarClass bySchoolcalendarClass); + + /** + * 新增园历管理(班级) + * + * @param bySchoolcalendarClass 园历管理(班级) + * @return 结果 + */ + public int insertBySchoolcalendarClass(BySchoolcalendarClass bySchoolcalendarClass); + + /** + * 修改园历管理(班级) + * + * @param bySchoolcalendarClass 园历管理(班级) + * @return 结果 + */ + public int updateBySchoolcalendarClass(BySchoolcalendarClass bySchoolcalendarClass); + + /** + * 批量删除园历管理(班级) + * + * @param ids 需要删除的园历管理(班级)ID + * @return 结果 + */ + public int deleteBySchoolcalendarClassByIds(Long[] ids); + + /** + * 删除园历管理(班级)信息 + * + * @param id 园历管理(班级)ID + * @return 结果 + */ + public int deleteBySchoolcalendarClassById(Long id); +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/BySchoolcalendarClassServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/BySchoolcalendarClassServiceImpl.java new file mode 100644 index 000000000..2fc965892 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/BySchoolcalendarClassServiceImpl.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.BySchoolcalendarClassMapper; +import com.ruoyi.project.benyi.domain.BySchoolcalendarClass; +import com.ruoyi.project.benyi.service.IBySchoolcalendarClassService; + +/** + * 园历管理(班级)Service业务层处理 + * + * @author tsbz + * @date 2020-05-06 + */ +@Service +public class BySchoolcalendarClassServiceImpl implements IBySchoolcalendarClassService +{ + @Autowired + private BySchoolcalendarClassMapper bySchoolcalendarClassMapper; + + /** + * 查询园历管理(班级) + * + * @param id 园历管理(班级)ID + * @return 园历管理(班级) + */ + @Override + public BySchoolcalendarClass selectBySchoolcalendarClassById(Long id) + { + return bySchoolcalendarClassMapper.selectBySchoolcalendarClassById(id); + } + + /** + * 查询园历管理(班级)列表 + * + * @param bySchoolcalendarClass 园历管理(班级) + * @return 园历管理(班级) + */ + @Override + public List selectBySchoolcalendarClassList(BySchoolcalendarClass bySchoolcalendarClass) + { + return bySchoolcalendarClassMapper.selectBySchoolcalendarClassList(bySchoolcalendarClass); + } + + /** + * 新增园历管理(班级) + * + * @param bySchoolcalendarClass 园历管理(班级) + * @return 结果 + */ + @Override + public int insertBySchoolcalendarClass(BySchoolcalendarClass bySchoolcalendarClass) + { + return bySchoolcalendarClassMapper.insertBySchoolcalendarClass(bySchoolcalendarClass); + } + + /** + * 修改园历管理(班级) + * + * @param bySchoolcalendarClass 园历管理(班级) + * @return 结果 + */ + @Override + public int updateBySchoolcalendarClass(BySchoolcalendarClass bySchoolcalendarClass) + { + return bySchoolcalendarClassMapper.updateBySchoolcalendarClass(bySchoolcalendarClass); + } + + /** + * 批量删除园历管理(班级) + * + * @param ids 需要删除的园历管理(班级)ID + * @return 结果 + */ + @Override + public int deleteBySchoolcalendarClassByIds(Long[] ids) + { + return bySchoolcalendarClassMapper.deleteBySchoolcalendarClassByIds(ids); + } + + /** + * 删除园历管理(班级)信息 + * + * @param id 园历管理(班级)ID + * @return 结果 + */ + @Override + public int deleteBySchoolcalendarClassById(Long id) + { + return bySchoolcalendarClassMapper.deleteBySchoolcalendarClassById(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 b56188400..9cc5606a0 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/common/SchoolCommon.java +++ b/ruoyi/src/main/java/com/ruoyi/project/common/SchoolCommon.java @@ -2,10 +2,15 @@ package com.ruoyi.project.common; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.framework.security.LoginUser; +import com.ruoyi.framework.web.domain.server.Sys; +import com.ruoyi.project.system.domain.ByClass; import com.ruoyi.project.system.domain.BySchool; import com.ruoyi.project.system.domain.SysDept; +import com.ruoyi.project.system.domain.SysUser; +import com.ruoyi.project.system.service.IByClassService; import com.ruoyi.project.system.service.IBySchoolService; import com.ruoyi.project.system.service.ISysDeptService; +import com.ruoyi.project.system.service.ISysUserService; import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RestController; @@ -20,7 +25,11 @@ public class SchoolCommon { @Autowired private ISysDeptService deptService; @Autowired + private ISysUserService userService; + @Autowired private IBySchoolService schoolService; + @Autowired + private IByClassService byClassService; /** * 部门id转学校id @@ -58,6 +67,15 @@ public class SchoolCommon { return sysDept; } + public SysUser getUser() { + LoginUser loginUser = SecurityUtils.getLoginUser(); + Long userId = loginUser.getUser().getUserId(); + System.out.println("用户id======:" + userId); + System.out.println("sys_user.user_id======:" + loginUser.getUser().getUserId()); + SysUser sysUser = userService.selectUserById(userId); + return sysUser; + } + /** * 判断当前用户是否为学校 **/ @@ -77,6 +95,20 @@ public class SchoolCommon { return false; } + public String getClassId() { + SysUser sysUser = getUser(); + ByClass byClass = new ByClass(); + byClass.setZbjs(sysUser.getUserId()); + byClass.setPbjs(sysUser.getUserId()); + byClass.setZljs(sysUser.getUserId()); + ByClass byClass1 = byClassService.selectByClassByUserId(byClass); + if(byClass1 != null) { + return byClass1.getBjbh(); + } else { + return ""; + } + } + public String getCurrentXnXq() { Calendar date = Calendar.getInstance(); Integer iYear = date.get(Calendar.YEAR); diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/ByClassMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/ByClassMapper.java index d897f7678..948bdec64 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/ByClassMapper.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/ByClassMapper.java @@ -27,6 +27,9 @@ public interface ByClassMapper */ public List selectByClassList(ByClass byClass); + //通过userID查询class + public ByClass selectByClassByUserId(ByClass byClass); + /** * 新增班级信息 * diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/IByClassService.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/IByClassService.java index 7c94ec000..4ca824af0 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/IByClassService.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/IByClassService.java @@ -19,6 +19,9 @@ public interface IByClassService */ public ByClass selectByClassById(String bjbh); + //查询通过userid查询班级信息 + public ByClass selectByClassByUserId(ByClass byClass); + /** * 查询班级信息列表 * diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/ByClassServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/ByClassServiceImpl.java index e450795af..86f764e20 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/ByClassServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/ByClassServiceImpl.java @@ -33,6 +33,11 @@ public class ByClassServiceImpl implements IByClassService return byClassMapper.selectByClassById(bjbh); } + @Override + public ByClass selectByClassByUserId(ByClass byClass) { + return byClassMapper.selectByClassByUserId(byClass); + } + /** * 查询班级信息列表 * diff --git a/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarClassMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarClassMapper.xml new file mode 100644 index 000000000..65aa652cd --- /dev/null +++ b/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarClassMapper.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + select id, name, type, classid, xnxq, deptId, activitytime, createuserid, createtime from by_schoolcalendar_class + + + + + + + + insert into by_schoolcalendar_class + + id, + name, + type, + classid, + xnxq, + deptId, + activitytime, + createuserid, + createtime, + + + #{id}, + #{name}, + #{type}, + #{classid}, + #{xnxq}, + #{deptid}, + #{activitytime}, + #{createuserid}, + #{createtime}, + + + + + update by_schoolcalendar_class + + name = #{name}, + type = #{type}, + classid = #{classid}, + xnxq = #{xnxq}, + deptId = #{deptid}, + activitytime = #{activitytime}, + createuserid = #{createuserid}, + createtime = #{createtime}, + + where id = #{id} + + + + delete from by_schoolcalendar_class where id = #{id} + + + + delete from by_schoolcalendar_class where id in + + #{id} + + + + \ No newline at end of file diff --git a/ruoyi/src/main/resources/mybatis/system/ByClassMapper.xml b/ruoyi/src/main/resources/mybatis/system/ByClassMapper.xml index d373c3de4..ec9688403 100644 --- a/ruoyi/src/main/resources/mybatis/system/ByClassMapper.xml +++ b/ruoyi/src/main/resources/mybatis/system/ByClassMapper.xml @@ -25,7 +25,7 @@ select bjbh, dept_id, bjtype, bhxh, xn, bjmc, bjrych, jbny, - zbjs,(select nick_name from sys_user where sys_user.user_id=zbjs) zbjsxm, + zbjs, (select nick_name from sys_user where sys_user.user_id=zbjs) zbjsxm, pbjs, (select nick_name from sys_user where sys_user.user_id=pbjs) pbjsxm, zljs, (select nick_name from sys_user where sys_user.user_id=zljs) zljsxm, isdel, createtime from by_class d @@ -60,6 +60,17 @@ where bjbh = #{bjbh} + + insert into by_class diff --git a/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml index 69adf67ef..ac6d53051 100644 --- a/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml +++ b/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml @@ -35,7 +35,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + +