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

班级园历管理优化，新增备注，园历展示最后一天显示

Browse Source
This commit is contained in:
zhanglipeng
2021-08-02 11:14:49 +08:00
parent ad9ef818a7
commit 13f5bcfe89
8 changed files with 83 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,7 +154,7 @@ public class ByCalendarController extends BaseController {
}
//定义返回列表
List<ByCalendarShow> listvi = new ArrayList<>();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
//加载本一园历
List<ByCalendar> list = byCalendarService.selectByCalendarList(byCalendar);
if (list.size() > 0) {

1
ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcalendar.java
View File

@ -184,6 +184,7 @@ public class BySchoolcalendar extends BaseEntity {
.append("stylecolor", getStylecolor())
.append("createuserid", getCreateuserid())
.append("createtime", getCreatetime())
.append("remark", getRemark())
.toString();
}
}

1
ruoyi/src/main/java/com/ruoyi/project/benyi/domain/BySchoolcalendarClass.java
View File

@ -174,6 +174,7 @@ public class BySchoolcalendarClass extends BaseEntity
.append("stylecolor", getStylecolor())
.append("createuserid", getCreateuserid())
.append("createtime", getCreatetime())
.append("remark", getRemark())
.append("byClass", getByClass())
.toString();
}

13
ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarClassMapper.xml
View File

@ -16,6 +16,7 @@
<result property="stylecolor" column="stylecolor"/>
<result property="createuserid" column="createuserid"/>
<result property="createtime" column="createtime"/>
<result property="remark" column="remark" />
<association property="byClass" column="bjbh" javaType="ByClass" resultMap="ByClassResult"/>
</resultMap>
@ -39,7 +40,7 @@
</resultMap>
<sql id="selectBySchoolcalendarClassVo">
select s.id, s.name, s.type, s.classid, s.xnxq, s.deptId, s.activitytime, s.activityendtime, s.stylecolor, s.createuserid, s.createtime,
select s.id, s.name, s.type, s.classid, s.xnxq, s.deptId, s.activitytime, s.activityendtime, s.stylecolor, s.createuserid, s.createtime, s.remark,
c.bjmc
from by_schoolcalendar_class s, by_class c
</sql>
@ -59,7 +60,14 @@
<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>
<if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
AND date_format(activitytime,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')
</if>
<if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
AND date_format(activitytime,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
</if>
order by activitytime desc
</select>
<select id="selectBySchoolcalendarClassById" parameterType="Long" resultMap="BySchoolcalendarClassResult">
@ -81,6 +89,7 @@
<if test="stylecolor != null and stylecolor != ''">stylecolor,</if>
<if test="createuserid != null ">createuserid,</if>
<if test="createtime != null ">createtime,</if>
<if test="remark != null and remark != ''">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null ">#{id},</if>
@ -94,6 +103,7 @@
<if test="stylecolor != null and stylecolor != ''">#{stylecolor},</if>
<if test="createuserid != null ">#{createuserid},</if>
<if test="createtime != null ">#{createtime},</if>
<if test="remark != null and remark != ''">#{remark},</if>
</trim>
</insert>
@ -110,6 +120,7 @@
<if test="stylecolor != null and stylecolor != ''">stylecolor = #{stylecolor},</if>
<if test="createuserid != null ">createuserid = #{createuserid},</if>
<if test="createtime != null ">createtime = #{createtime},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
</trim>
where id = #{id}
</update>

14
ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarMapper.xml
View File

@ -12,14 +12,15 @@
<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="activityendtime" column="activityendtime"/>
<result property="stylecolor" column="stylecolor"/>
<result property="createuserid" column="createuserid"/>
<result property="createtime" column="createtime"/>
<result property="remark" column="remark"/>
</resultMap>
<sql id="selectBySchoolcalendarVo">
select id, name, type, scope, xnxq, dept_id, activitytime, activityendtime, stylecolor, createuserid, createtime from by_schoolcalendar d
select id, name, type, scope, xnxq, dept_id, activitytime, activityendtime, stylecolor, createuserid, createtime, remark from by_schoolcalendar d
</sql>
<select id="selectBySchoolcalendarList" parameterType="BySchoolcalendar" resultMap="BySchoolcalendarResult">
@ -31,8 +32,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="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') &gt;= date_format(#{beginTime},'%y%m%d')
@ -64,6 +65,7 @@
<if test="stylecolor != null and stylecolor != ''">stylecolor,</if>
<if test="createuserid != null ">createuserid,</if>
<if test="createtime != null ">createtime,</if>
<if test="remark != null and remark != ''">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="name != null and name != ''">#{name},</if>
@ -76,6 +78,7 @@
<if test="stylecolor != null and stylecolor != ''">#{stylecolor},</if>
<if test="createuserid != null ">#{createuserid},</if>
<if test="createtime != null ">#{createtime},</if>
<if test="remark != null and remark != ''">#{remark},</if>
</trim>
</insert>
@ -92,6 +95,7 @@
<if test="stylecolor != null and stylecolor != ''">stylecolor = #{stylecolor},</if>
<if test="createuserid != null ">createuserid = #{createuserid},</if>
<if test="createtime != null ">createtime = #{createtime},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
</trim>
where id = #{id}
</update>