Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

20200728-入园体验计划表

Browse Source
This commit is contained in:
paidaxing444
2020-07-30 18:50:38 +08:00
parent 8be1711e9e
commit e33289bab6
18 changed files with 1115 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
View File

@ -104,6 +104,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
.antMatchers("/druid/**").anonymous()
.antMatchers("/benyi/experience/add").anonymous()//半日入园体验申请
.antMatchers("/benyi/experience/getInfo**").anonymous()//半日入园体验明细
.antMatchers("/benyi/halfdayplan/getInfo/**").anonymous()//半日入园内容
// 除上面外的所有请求全部需要鉴权认证
.anyRequest().authenticated()
.and()

143
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByHalfdayplanController.java Normal file
View File

@ -0,0 +1,143 @@
package com.ruoyi.project.benyi.controller;
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.ByHalfdayplan;
import com.ruoyi.project.benyi.service.IByHalfdayplanService;
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-07-29
*/
@RestController
@RequestMapping("/benyi/halfdayplan")
public class ByHalfdayplanController extends BaseController {
@Autowired
private IByHalfdayplanService byHalfdayplanService;
@Autowired
private SchoolCommon schoolCommon;
/**
* 查询入园半日体验计划列表
*/
@PreAuthorize("@ss.hasPermi('benyi:halfdayplan:list')")
@GetMapping("/list")
public TableDataInfo list(ByHalfdayplan byHalfdayplan) {
byHalfdayplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
startPage();
List<ByHalfdayplan> list = byHalfdayplanService.selectByHalfdayplanList(byHalfdayplan);
return getDataTable(list);
}
/**
* 导出入园半日体验计划列表
*/
@PreAuthorize("@ss.hasPermi('benyi:halfdayplan:export')")
@Log(title = "入园半日体验计划", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ByHalfdayplan byHalfdayplan) {
List<ByHalfdayplan> list = byHalfdayplanService.selectByHalfdayplanList(byHalfdayplan);
ExcelUtil<ByHalfdayplan> util = new ExcelUtil<ByHalfdayplan>(ByHalfdayplan.class);
return util.exportExcel(list, "halfdayplan");
}
/**
* 获取入园半日体验计划详细信息
*/
@PreAuthorize("@ss.hasPermi('benyi:halfdayplan:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id) {
return AjaxResult.success(byHalfdayplanService.selectByHalfdayplanById(id));
}
//@PreAuthorize("@ss.hasPermi('benyi:halfdayplan:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getTyInfo(@PathVariable("id") String id) {
return AjaxResult.success(byHalfdayplanService.selectByHalfdayplanById(id));
}
/**
* 新增入园半日体验计划
*/
@PreAuthorize("@ss.hasPermi('benyi:halfdayplan:add')")
@Log(title = "入园半日体验计划", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ByHalfdayplan byHalfdayplan) {
byHalfdayplan.setId(schoolCommon.getUuid());
//首先判断当前账户是否为幼儿园账号
if (schoolCommon.isSchool()) {
byHalfdayplan.setType("2");
byHalfdayplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
} else {
byHalfdayplan.setType("1");
}
return toAjax(byHalfdayplanService.insertByHalfdayplan(byHalfdayplan));
}
/**
* 修改入园半日体验计划
*/
@PreAuthorize("@ss.hasPermi('benyi:halfdayplan:edit')")
@Log(title = "入园半日体验计划", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ByHalfdayplan byHalfdayplan) {
return toAjax(byHalfdayplanService.updateByHalfdayplan(byHalfdayplan));
}
/**
* 复制入园通知书
*/
@PreAuthorize("@ss.hasPermi('benyi:halfdayplan:edit')")
@Log(title = "入园半日体验计划", businessType = BusinessType.INSERT)
@PostMapping("/copy/{id}")
public AjaxResult copy(@PathVariable String id) {
System.out.println("id===" + id);
ByHalfdayplan byHalfdayplan = byHalfdayplanService.selectByHalfdayplanById(id);
ByHalfdayplan byHalfdayplanCopy = new ByHalfdayplan();
byHalfdayplanCopy.setId(schoolCommon.getUuid());
byHalfdayplanCopy.setType("2");
byHalfdayplanCopy.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
byHalfdayplanCopy.setContent(byHalfdayplan.getContent());
byHalfdayplanCopy.setTitle(byHalfdayplan.getTitle());
return toAjax(byHalfdayplanService.insertByHalfdayplan(byHalfdayplanCopy));
}
/**
* 删除入园半日体验计划
*/
@PreAuthorize("@ss.hasPermi('benyi:halfdayplan:remove')")
@Log(title = "入园半日体验计划", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) {
//判断id是否为系统定义
for (int i = 0; i < ids.length; i++) {
String id = ids[i];
ByHalfdayplan byHalfdayplan = byHalfdayplanService.selectByHalfdayplanById(id);
if (byHalfdayplan.getType() == "1") {
return AjaxResult.error("包含系统半日体验计划，无法删除");
}
}
return toAjax(byHalfdayplanService.deleteByHalfdayplanByIds(ids));
}
}

2
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByRecruitstudentsNoticeController.java
View File

@ -98,7 +98,7 @@ public class ByRecruitstudentsNoticeController extends BaseController {
}
/**
* 删除入园通知书
* 复制入园通知书
*/
@PreAuthorize("@ss.hasPermi('benyi:recruitstudentsnotice:edit')")
@Log(title = "入园通知书", businessType = BusinessType.INSERT)

28
ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByExperience.java
View File

@ -119,6 +119,14 @@ public class ByExperience extends BaseEntity {
@Excel(name = "入园时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date rysj;
/**
* 体验内容id
*/
@Excel(name = "体验内容id")
private String tynrid;
private String tynrcontent;
public void setId(Long id) {
this.id = id;
}
@ -247,6 +255,22 @@ public class ByExperience extends BaseEntity {
return rysj;
}
public void setTynrid(String tynrid) {
this.tynrid = tynrid;
}
public String getTynrid() {
return tynrid;
}
public void setTynrcontent(String tynrcontent) {
this.tynrcontent = tynrcontent;
}
public String getTynrcontent() {
return tynrcontent;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@ -267,6 +291,8 @@ public class ByExperience extends BaseEntity {
.append("tyjg", getTyjg())
.append("rysj", getRysj())
.append("createTime", getCreateTime())
.append("tynrid", getTynrid())
.append("tynrcontent", getTynrcontent())
.toString();
}
}
}

112
ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByHalfdayplan.java Normal file
View File

@ -0,0 +1,112 @@
package com.ruoyi.project.benyi.domain;
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_halfdayplan
*
* @author tsbz
* @date 2020-07-29
*/
public class ByHalfdayplan extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 编号
*/
private String id;
/**
* 学校id
*/
@Excel(name = "学校id")
private Long schoolid;
/**
* 班级编号
*/
@Excel(name = "班级编号")
private String classid;
/**
* 标题
*/
@Excel(name = "标题")
private String title;
/**
* 内容
*/
@Excel(name = "内容")
private String content;
/**
* 类型
*/
@Excel(name = "类型")
private String type;
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 setTitle(String title) {
this.title = title;
}
public String getTitle() {
return title;
}
public void setContent(String content) {
this.content = content;
}
public String getContent() {
return content;
}
public void setType(String type) {
this.type = type;
}
public String getType() {
return type;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("schoolid", getSchoolid())
.append("classid", getClassid())
.append("title", getTitle())
.append("content", getContent())
.append("createTime", getCreateTime())
.append("type", getType())
.toString();
}
}

61
ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByHalfdayplanMapper.java Normal file
View File

@ -0,0 +1,61 @@
package com.ruoyi.project.benyi.mapper;
import java.util.List;
import com.ruoyi.project.benyi.domain.ByHalfdayplan;
/**
* 入园半日体验计划Mapper接口
*
* @author tsbz
* @date 2020-07-30
*/
public interface ByHalfdayplanMapper {
/**
* 查询入园半日体验计划
*
* @param id 入园半日体验计划ID
* @return 入园半日体验计划
*/
public ByHalfdayplan selectByHalfdayplanById(String id);
/**
* 查询入园半日体验计划列表
*
* @param byHalfdayplan 入园半日体验计划
* @return 入园半日体验计划集合
*/
public List<ByHalfdayplan> selectByHalfdayplanList(ByHalfdayplan byHalfdayplan);
/**
* 新增入园半日体验计划
*
* @param byHalfdayplan 入园半日体验计划
* @return 结果
*/
public int insertByHalfdayplan(ByHalfdayplan byHalfdayplan);
/**
* 修改入园半日体验计划
*
* @param byHalfdayplan 入园半日体验计划
* @return 结果
*/
public int updateByHalfdayplan(ByHalfdayplan byHalfdayplan);
/**
* 删除入园半日体验计划
*
* @param id 入园半日体验计划ID
* @return 结果
*/
public int deleteByHalfdayplanById(String id);
/**
* 批量删除入园半日体验计划
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteByHalfdayplanByIds(String[] ids);
}

61
ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByHalfdayplanService.java Normal file
View File

@ -0,0 +1,61 @@
package com.ruoyi.project.benyi.service;
import java.util.List;
import com.ruoyi.project.benyi.domain.ByHalfdayplan;
/**
* 入园半日体验计划Service接口
*
* @author tsbz
* @date 2020-07-30
*/
public interface IByHalfdayplanService {
/**
* 查询入园半日体验计划
*
* @param id 入园半日体验计划ID
* @return 入园半日体验计划
*/
public ByHalfdayplan selectByHalfdayplanById(String id);
/**
* 查询入园半日体验计划列表
*
* @param byHalfdayplan 入园半日体验计划
* @return 入园半日体验计划集合
*/
public List<ByHalfdayplan> selectByHalfdayplanList(ByHalfdayplan byHalfdayplan);
/**
* 新增入园半日体验计划
*
* @param byHalfdayplan 入园半日体验计划
* @return 结果
*/
public int insertByHalfdayplan(ByHalfdayplan byHalfdayplan);
/**
* 修改入园半日体验计划
*
* @param byHalfdayplan 入园半日体验计划
* @return 结果
*/
public int updateByHalfdayplan(ByHalfdayplan byHalfdayplan);
/**
* 批量删除入园半日体验计划
*
* @param ids 需要删除的入园半日体验计划ID
* @return 结果
*/
public int deleteByHalfdayplanByIds(String[] ids);
/**
* 删除入园半日体验计划信息
*
* @param id 入园半日体验计划ID
* @return 结果
*/
public int deleteByHalfdayplanById(String id);
}

95
ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByHalfdayplanServiceImpl.java Normal file
View File

@ -0,0 +1,95 @@
package com.ruoyi.project.benyi.service.impl;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.project.benyi.mapper.ByHalfdayplanMapper;
import com.ruoyi.project.benyi.domain.ByHalfdayplan;
import com.ruoyi.project.benyi.service.IByHalfdayplanService;
/**
* 入园半日体验计划Service业务层处理
*
* @author tsbz
* @date 2020-07-30
*/
@Service
public class ByHalfdayplanServiceImpl implements IByHalfdayplanService {
@Autowired
private ByHalfdayplanMapper byHalfdayplanMapper;
/**
* 查询入园半日体验计划
*
* @param id 入园半日体验计划ID
* @return 入园半日体验计划
*/
@Override
public ByHalfdayplan selectByHalfdayplanById(String id)
{
return byHalfdayplanMapper.selectByHalfdayplanById(id);
}
/**
* 查询入园半日体验计划列表
*
* @param byHalfdayplan 入园半日体验计划
* @return 入园半日体验计划
*/
@Override
public List<ByHalfdayplan> selectByHalfdayplanList(ByHalfdayplan byHalfdayplan)
{
return byHalfdayplanMapper.selectByHalfdayplanList(byHalfdayplan);
}
/**
* 新增入园半日体验计划
*
* @param byHalfdayplan 入园半日体验计划
* @return 结果
*/
@Override
public int insertByHalfdayplan(ByHalfdayplan byHalfdayplan)
{
byHalfdayplan.setCreateTime(DateUtils.getNowDate());
return byHalfdayplanMapper.insertByHalfdayplan(byHalfdayplan);
}
/**
* 修改入园半日体验计划
*
* @param byHalfdayplan 入园半日体验计划
* @return 结果
*/
@Override
public int updateByHalfdayplan(ByHalfdayplan byHalfdayplan)
{
return byHalfdayplanMapper.updateByHalfdayplan(byHalfdayplan);
}
/**
* 批量删除入园半日体验计划
*
* @param ids 需要删除的入园半日体验计划ID
* @return 结果
*/
@Override
public int deleteByHalfdayplanByIds(String[] ids)
{
return byHalfdayplanMapper.deleteByHalfdayplanByIds(ids);
}
/**
* 删除入园半日体验计划信息
*
* @param id 入园半日体验计划ID
* @return 结果
*/
@Override
public int deleteByHalfdayplanById(String id)
{
return byHalfdayplanMapper.deleteByHalfdayplanById(id);
}
}

6
ruoyi/src/main/java/com/ruoyi/project/common/SchoolCommon.java
View File

@ -19,6 +19,7 @@ import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@RestController
public class SchoolCommon {
@ -170,4 +171,9 @@ public class SchoolCommon {
}
return false;
}
// 生成UUID
public String getUuid(){
return UUID.randomUUID().toString().replace("-","");
}
}

8
ruoyi/src/main/resources/mybatis/benyi/ByExperienceMapper.xml
View File

@ -21,11 +21,13 @@
<result property="yzzs" column="yzzs"/>
<result property="tyjg" column="tyjg"/>
<result property="rysj" column="rysj"/>
<result property="tynrcontent" column="tynrcontent"/>
<result property="tynrid" column="tynrid"/>
<result property="createTime" column="create_time"/>
</resultMap>
<sql id="selectByExperienceVo">
select id, jzxm, yexm, csrq, lxfs, nrysj, sqtysj, swxw, schoolid, sfhf, hfrn, hfuserid, fhsj, yzzs, tyjg, rysj, create_time from by_experience
select id, jzxm, yexm, csrq, lxfs, nrysj, sqtysj, swxw, schoolid, sfhf, hfrn, hfuserid, fhsj, yzzs, tyjg, rysj, tynrid,(select title from by_halfdayplan where by_halfdayplan.id=tynrid) tynrcontent, create_time from by_experience
</sql>
<select id="selectByExperienceList" parameterType="ByExperience" resultMap="ByExperienceResult">
@ -46,6 +48,7 @@
<if test="yzzs != null and yzzs != ''">and yzzs = #{yzzs}</if>
<if test="tyjg != null and tyjg != ''">and tyjg = #{tyjg}</if>
<if test="rysj != null ">and rysj = #{rysj}</if>
<if test="tynrid != null ">and tynrid = #{tynrid}</if>
</where>
order by create_time desc
</select>
@ -74,6 +77,7 @@
<if test="tyjg != null and tyjg != ''">tyjg,</if>
<if test="rysj != null ">rysj,</if>
<if test="createTime != null ">create_time,</if>
<if test="tynrid != null ">tynrid,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="jzxm != null and jzxm != ''">#{jzxm},</if>
@ -92,6 +96,7 @@
<if test="tyjg != null and tyjg != ''">#{tyjg},</if>
<if test="rysj != null ">#{rysj},</if>
<if test="createTime != null ">#{createTime},</if>
<if test="tynrid != null ">#{tynrid},</if>
</trim>
</insert>
@ -114,6 +119,7 @@
<if test="tyjg != null and tyjg != ''">tyjg = #{tyjg},</if>
<if test="rysj != null ">rysj = #{rysj},</if>
<if test="createTime != null ">create_time = #{createTime},</if>
<if test="tynrid != null ">tynrid = #{tynrid},</if>
</trim>
where id = #{id}
</update>

84
ruoyi/src/main/resources/mybatis/benyi/ByHalfdayplanMapper.xml Normal file
View File

@ -0,0 +1,84 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.benyi.mapper.ByHalfdayplanMapper">
<resultMap type="ByHalfdayplan" id="ByHalfdayplanResult">
<result property="id" column="id"/>
<result property="schoolid" column="schoolid"/>
<result property="classid" column="classid"/>
<result property="title" column="title"/>
<result property="content" column="content"/>
<result property="createTime" column="create_time"/>
<result property="type" column="type"/>
</resultMap>
<sql id="selectByHalfdayplanVo">
select id, schoolid, classid, title, content, create_time, type from by_halfdayplan
</sql>
<select id="selectByHalfdayplanList" parameterType="ByHalfdayplan" resultMap="ByHalfdayplanResult">
<include refid="selectByHalfdayplanVo"/>
where type='1'
<if test="schoolid != null ">or schoolid = #{schoolid}</if>
<if test="classid != null and classid != ''">and classid = #{classid}</if>
<if test="title != null and title != ''">and title = #{title}</if>
<if test="content != null and content != ''">and content = #{content}</if>
<if test="type != null and type != ''">and type = #{type}</if>
order by type
</select>
<select id="selectByHalfdayplanById" parameterType="String" resultMap="ByHalfdayplanResult">
<include refid="selectByHalfdayplanVo"/>
where id = #{id}
</select>
<insert id="insertByHalfdayplan" parameterType="ByHalfdayplan" useGeneratedKeys="true" keyProperty="id">
insert into by_halfdayplan
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">id,</if>
<if test="schoolid != null ">schoolid,</if>
<if test="classid != null and classid != ''">classid,</if>
<if test="title != null and title != ''">title,</if>
<if test="content != null and content != ''">content,</if>
<if test="createTime != null ">create_time,</if>
<if test="type != null and type != ''">type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">#{id},</if>
<if test="schoolid != null ">#{schoolid},</if>
<if test="classid != null and classid != ''">#{classid},</if>
<if test="title != null and title != ''">#{title},</if>
<if test="content != null and content != ''">#{content},</if>
<if test="createTime != null ">#{createTime},</if>
<if test="type != null and type != ''">#{type},</if>
</trim>
</insert>
<update id="updateByHalfdayplan" parameterType="ByHalfdayplan">
update by_halfdayplan
<trim prefix="SET" suffixOverrides=",">
<if test="schoolid != null ">schoolid = #{schoolid},</if>
<if test="classid != null and classid != ''">classid = #{classid},</if>
<if test="title != null and title != ''">title = #{title},</if>
<if test="content != null and content != ''">content = #{content},</if>
<if test="createTime != null ">create_time = #{createTime},</if>
<if test="type != null and type != ''">type = #{type},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteByHalfdayplanById" parameterType="String">
delete from by_halfdayplan where id = #{id}
</delete>
<delete id="deleteByHalfdayplanByIds" parameterType="String">
delete from by_halfdayplan where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>