20200510-zlp-1
新增本一端园历 园历新增字段 结束时间和活动样式
This commit is contained in:
paidaxing444
89
ruoyi/src/main/resources/mybatis/benyi/ByCalendarMapper.xml
Normal file
89
ruoyi/src/main/resources/mybatis/benyi/ByCalendarMapper.xml
Normal file
@ -0,0 +1,89 @@
|
||||
<?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.ByCalendarMapper">
|
||||
|
||||
<resultMap type="ByCalendar" id="ByCalendarResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="name" column="name" />
|
||||
<result property="type" column="type" />
|
||||
<result property="activitytime" column="activitytime" />
|
||||
<result property="activityendtime" column="activityendtime" />
|
||||
<result property="stylecolor" column="stylecolor" />
|
||||
<result property="createuserid" column="createuserid" />
|
||||
<result property="createtime" column="createtime" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectByCalendarVo">
|
||||
select id, name, type, activitytime, activityendtime, stylecolor, createuserid, createtime from by_calendar
|
||||
</sql>
|
||||
|
||||
<select id="selectByCalendarList" parameterType="ByCalendar" resultMap="ByCalendarResult">
|
||||
<include refid="selectByCalendarVo"/>
|
||||
<where>
|
||||
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
|
||||
<if test="type != null and type != ''"> and type = #{type}</if>
|
||||
<if test="activitytime != null "> and activitytime = #{activitytime}</if>
|
||||
<if test="activityendtime != null "> and activityendtime = #{activityendtime}</if>
|
||||
<if test="stylecolor != null and stylecolor != ''"> and stylecolor = #{stylecolor}</if>
|
||||
<if test="createuserid != null "> and createuserid = #{createuserid}</if>
|
||||
<if test="createtime != null "> and createtime = #{createtime}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectByCalendarById" parameterType="Long" resultMap="ByCalendarResult">
|
||||
<include refid="selectByCalendarVo"/>
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertByCalendar" parameterType="ByCalendar">
|
||||
insert into by_calendar
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null ">id,</if>
|
||||
<if test="name != null and name != ''">name,</if>
|
||||
<if test="type != null and type != ''">type,</if>
|
||||
<if test="activitytime != null ">activitytime,</if>
|
||||
<if test="activityendtime != null ">activityendtime,</if>
|
||||
<if test="stylecolor != null and stylecolor != ''">stylecolor,</if>
|
||||
<if test="createuserid != null ">createuserid,</if>
|
||||
<if test="createtime != null ">createtime,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null ">#{id},</if>
|
||||
<if test="name != null and name != ''">#{name},</if>
|
||||
<if test="type != null and type != ''">#{type},</if>
|
||||
<if test="activitytime != null ">#{activitytime},</if>
|
||||
<if test="activityendtime != null ">#{activityendtime},</if>
|
||||
<if test="stylecolor != null and stylecolor != ''">#{stylecolor},</if>
|
||||
<if test="createuserid != null ">#{createuserid},</if>
|
||||
<if test="createtime != null ">#{createtime},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateByCalendar" parameterType="ByCalendar">
|
||||
update by_calendar
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="name != null and name != ''">name = #{name},</if>
|
||||
<if test="type != null and type != ''">type = #{type},</if>
|
||||
<if test="activitytime != null ">activitytime = #{activitytime},</if>
|
||||
<if test="activityendtime != null ">activityendtime = #{activityendtime},</if>
|
||||
<if test="stylecolor != null and stylecolor != ''">stylecolor = #{stylecolor},</if>
|
||||
<if test="createuserid != null ">createuserid = #{createuserid},</if>
|
||||
<if test="createtime != null ">createtime = #{createtime},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteByCalendarById" parameterType="Long">
|
||||
delete from by_calendar where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteByCalendarByIds" parameterType="String">
|
||||
delete from by_calendar where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
@ -14,46 +14,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="activitytime" column="activitytime" />
|
||||
<result property="createuserid" column="createuserid" />
|
||||
<result property="createtime" column="createtime" />
|
||||
<association property="byClass" column="bjbh" javaType="ByClass" resultMap="ByClassResult" />
|
||||
</resultMap>
|
||||
|
||||
<resultMap type="ByClass" id="ByClassResult">
|
||||
<result property="bjbh" column="bjbh"/>
|
||||
<result property="deptId" column="dept_id"/>
|
||||
<result property="bjtype" column="bjtype"/>
|
||||
<result property="bhxh" column="bhxh"/>
|
||||
<result property="xn" column="xn"/>
|
||||
<result property="bjmc" column="bjmc"/>
|
||||
<result property="bjrych" column="bjrych"/>
|
||||
<result property="jbny" column="jbny"/>
|
||||
<result property="zbjs" column="zbjs"/>
|
||||
<result property="zbjsxm" column="zbjsxm"/>
|
||||
<result property="pbjs" column="pbjs"/>
|
||||
<result property="pbjsxm" column="pbjsxm"/>
|
||||
<result property="zljs" column="zljs"/>
|
||||
<result property="zljsxm" column="zljsxm"/>
|
||||
<result property="isdel" column="isdel"/>
|
||||
<result property="createtime" column="createtime"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectBySchoolcalendarClassVo">
|
||||
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
|
||||
</sql>
|
||||
|
||||
<select id="selectBySchoolcalendarClassList" parameterType="BySchoolcalendarClass" resultMap="BySchoolcalendarClassResult">
|
||||
select sc.id, sc.name, sc.type, sc.classid, sc.xnxq, sc.deptId, sc.activitytime, sc.createuserid, sc.createtime,
|
||||
c.bjbh, c.bjmc
|
||||
from by_schoolcalendar_class sc, by_class c
|
||||
<where>
|
||||
<if test="name != null and name != ''"> and sc.name like concat('%', #{name}, '%')</if>
|
||||
<if test="type != null and type != ''"> and sc.type = #{type}</if>
|
||||
<if test="classid != null and classid != ''"> and sc.classid = #{classid}</if>
|
||||
<if test="xnxq != null and xnxq != ''"> and sc.xnxq = #{xnxq}</if>
|
||||
<if test="deptid != null "> and sc.deptId = #{deptid}</if>
|
||||
<if test="activitytime != null "> and sc.activitytime = #{activitytime}</if>
|
||||
<if test="createuserid != null "> and sc.createuserid = #{createuserid}</if>
|
||||
<if test="createtime != null "> and sc.createtime = #{createtime}</if>
|
||||
<include refid="selectBySchoolcalendarClassVo"/>
|
||||
<where>
|
||||
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
|
||||
<if test="type != null and type != ''"> and type = #{type}</if>
|
||||
<if test="classid != null and classid != ''"> and classid = #{classid}</if>
|
||||
<if test="xnxq != null and xnxq != ''"> and xnxq = #{xnxq}</if>
|
||||
<if test="deptid != null "> and deptId = #{deptid}</if>
|
||||
<if test="activitytime != null "> and activitytime = #{activitytime}</if>
|
||||
<if test="createuserid != null "> and createuserid = #{createuserid}</if>
|
||||
<if test="createtime != null "> and createtime = #{createtime}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
|
||||
@ -12,12 +12,14 @@
|
||||
<result property="xnxq" column="xnxq"/>
|
||||
<result property="deptid" column="dept_id"/>
|
||||
<result property="activitytime" column="activitytime"/>
|
||||
<result property="activityendtime" column="activityendtime" />
|
||||
<result property="stylecolor" column="stylecolor" />
|
||||
<result property="createuserid" column="createuserid"/>
|
||||
<result property="createtime" column="createtime"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectBySchoolcalendarVo">
|
||||
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
|
||||
</sql>
|
||||
|
||||
<select id="selectBySchoolcalendarList" parameterType="BySchoolcalendar" resultMap="BySchoolcalendarResult">
|
||||
@ -29,6 +31,8 @@
|
||||
<if test="xnxq != null and xnxq != ''">and xnxq like concat('%', #{xnxq}, '%')</if>
|
||||
<if test="deptid != null ">and dept_id = #{deptid}</if>
|
||||
<if test="activitytime != null ">and activitytime = #{activitytime}</if>
|
||||
<if test="activityendtime != null "> and activityendtime = #{activityendtime}</if>
|
||||
<if test="stylecolor != null and stylecolor != ''"> and stylecolor = #{stylecolor}</if>
|
||||
<if test="createuserid != null ">and createuserid = #{createuserid}</if>
|
||||
<if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
|
||||
AND date_format(activitytime,'%y%m%d') >= date_format(#{beginTime},'%y%m%d')
|
||||
@ -56,6 +60,8 @@
|
||||
<if test="xnxq != null and xnxq != ''">xnxq,</if>
|
||||
<if test="deptid != null ">dept_id,</if>
|
||||
<if test="activitytime != null ">activitytime,</if>
|
||||
<if test="activityendtime != null ">activityendtime,</if>
|
||||
<if test="stylecolor != null and stylecolor != ''">stylecolor,</if>
|
||||
<if test="createuserid != null ">createuserid,</if>
|
||||
<if test="createtime != null ">createtime,</if>
|
||||
</trim>
|
||||
@ -66,6 +72,8 @@
|
||||
<if test="xnxq != null and xnxq != ''">#{xnxq},</if>
|
||||
<if test="deptid != null ">#{deptid},</if>
|
||||
<if test="activitytime != null ">#{activitytime},</if>
|
||||
<if test="activityendtime != null ">#{activityendtime},</if>
|
||||
<if test="stylecolor != null and stylecolor != ''">#{stylecolor},</if>
|
||||
<if test="createuserid != null ">#{createuserid},</if>
|
||||
<if test="createtime != null ">#{createtime},</if>
|
||||
</trim>
|
||||
@ -80,6 +88,8 @@
|
||||
<if test="xnxq != null and xnxq != ''">xnxq = #{xnxq},</if>
|
||||
<if test="deptid != null ">dept_id = #{deptid},</if>
|
||||
<if test="activitytime != null ">activitytime = #{activitytime},</if>
|
||||
<if test="activityendtime != null ">activityendtime = #{activityendtime},</if>
|
||||
<if test="stylecolor != null and stylecolor != ''">stylecolor = #{stylecolor},</if>
|
||||
<if test="createuserid != null ">createuserid = #{createuserid},</if>
|
||||
<if test="createtime != null ">createtime = #{createtime},</if>
|
||||
</trim>
|
||||
|
||||
Reference in New Issue
Block a user