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

周计划和详细 页面优化

Browse Source
This commit is contained in:
sk1551
2020-08-28 17:25:23 +08:00
parent 33afe5382a
commit b4c60d8314
6 changed files with 215 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByPlanweek.java
View File

@@ -121,6 +121,18 @@ public class ByPlanweek extends BaseEntity {
@Excel(name = "审核意见")
private String shyj;
/**
* 周次
*/
@Excel(name = "周次")
private String weekly;
/**
* 月份
*/
@JsonFormat(pattern = "yyyy-MM")
@Excel(name = "月份", width = 30, dateFormat = "yyyy-MM")
private Date month;
public void setId(String id) {
@@ -272,6 +284,8 @@ public class ByPlanweek extends BaseEntity {
.append("shrid", getShrid())
.append("shtime", getShtime())
.append("shyj", getShyj())
.append("weekly", getWeekly())
.append("month", getMonth())
.toString();
}
@@ -282,4 +296,20 @@ public class ByPlanweek extends BaseEntity {
public void setShyj(String shyj) {
this.shyj = shyj;
}
public String getWeekly() {
return weekly;
}
public void setWeekly(String weekly) {
this.weekly = weekly;
}
public Date getMonth() {
return month;
}
public void setMonth(Date month) {
this.month = month;
}
}

15
ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByPlanweekitem.java
View File

@@ -59,6 +59,12 @@ public class ByPlanweekitem extends BaseEntity {
@Excel(name = "修改人")
private Long updateuserid;
/**
* 星期几
*/
@Excel(name = "星期几")
private String day;
public void setId(Long id) {
this.id = id;
}
@@ -127,6 +133,15 @@ public class ByPlanweekitem extends BaseEntity {
.append("createTime", getCreateTime())
.append("updateuserid", getUpdateuserid())
.append("updateTime", getUpdateTime())
.append("day", getDay())
.toString();
}
public String getDay() {
return day;
}
public void setDay(String day) {
this.day = day;
}
}

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

@@ -22,11 +22,13 @@
<result property="status" column="status"/>
<result property="shrid" column="shrid"/>
<result property="shtime" column="shtime"/>
<result property="shyj" column="shyj" />
<result property="shyj" column="shyj"/>
<result property="weekly" column="weekly"/>
<result property="month" column="month"/>
</resultMap>
<sql id="selectByPlanweekVo">
select id, schoolid, classid, name, starttime, endtime, themeofweek, jxmb_sh, jxmb_yy, jxmb_jk, jxmb_kx, jxmb_ys, createuserid, create_time, status, shrid, shtime, shyj from by_planweek
select id, schoolid, classid, name, month, starttime, endtime, themeofweek, jxmb_sh, jxmb_yy, jxmb_jk, jxmb_kx, jxmb_ys, createuserid, create_time, status, shrid, shtime, shyj, weekly from by_planweek
</sql>
<select id="selectByPlanweekList" parameterType="ByPlanweek" resultMap="ByPlanweekResult">
@@ -48,6 +50,8 @@
<if test="shrid != null ">and shrid = #{shrid}</if>
<if test="shtime != null ">and shtime = #{shtime}</if>
<if test="shyj != null and shyj != ''"> and shyj = #{shyj}</if>
<if test="weekly != null and weekly != ''"> and weekly = #{weekly}</if>
<if test="month != null ">and month = #{month}</if>
</where>
</select>
@@ -77,6 +81,8 @@
<if test="shrid != null ">shrid,</if>
<if test="shtime != null ">shtime,</if>
<if test="shyj != null and shyj != ''">shyj,</if>
<if test="weekly != null and weekly != ''">weekly,</if>
<if test="month != null ">month,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">#{id},</if>
@@ -97,6 +103,8 @@
<if test="shrid != null ">#{shrid},</if>
<if test="shtime != null ">#{shtime},</if>
<if test="shyj != null and shyj != ''">#{shyj},</if>
<if test="weekly != null and weekly != ''">#{weekly},</if>
<if test="month != null ">#{month},</if>
</trim>
</insert>
@@ -120,6 +128,8 @@
<if test="shrid != null ">shrid = #{shrid},</if>
<if test="shtime != null ">shtime = #{shtime},</if>
<if test="shyj != null and shyj != ''">shyj = #{shyj},</if>
<if test="weekly != null and weekly != ''">weekly = #{weekly},</if>
<if test="month != null ">month = #{month},</if>
</trim>
where id = #{id}
</update>

93
ruoyi/src/main/resources/mybatis/benyi/ByPlanweekitemMapper.xml
View File

@@ -5,16 +5,17 @@
<mapper namespace="com.ruoyi.project.benyi.mapper.ByPlanweekitemMapper">
<resultMap type="ByPlanweekitem" id="ByPlanweekitemResult">
<result property="id" column="id" />
<result property="wid" column="wid" />
<result property="activitytype" column="activitytype" />
<result property="content" column="content" />
<result property="activitytime" column="activitytime" />
<result property="createuserid" column="createuserid" />
<result property="createTime" column="create_time" />
<result property="updateuserid" column="updateuserid" />
<result property="updateTime" column="update_time" />
</resultMap>
<result property="id" column="id"/>
<result property="wid" column="wid"/>
<result property="activitytype" column="activitytype"/>
<result property="content" column="content"/>
<result property="activitytime" column="activitytime"/>
<result property="createuserid" column="createuserid"/>
<result property="createTime" column="create_time"/>
<result property="updateuserid" column="updateuserid"/>
<result property="updateTime" column="update_time"/>
<result property="day" column="day"/>
</resultMap>
<sql id="selectByPlanweekitemVo">
select id, wid, activitytype, content, activitytime, createuserid, create_time, updateuserid, update_time from by_planweekitem
@@ -23,13 +24,14 @@
<select id="selectByPlanweekitemList" parameterType="ByPlanweekitem" resultMap="ByPlanweekitemResult">
<include refid="selectByPlanweekitemVo"/>
<where>
<if test="wid != null and wid != ''"> and wid = #{wid}</if>
<if test="activitytype != null and activitytype != ''"> and activitytype = #{activitytype}</if>
<if test="content != null and content != ''"> and content = #{content}</if>
<if test="activitytime != null "> and activitytime = #{activitytime}</if>
<if test="createuserid != null "> and createuserid = #{createuserid}</if>
<if test="updateuserid != null "> and updateuserid = #{updateuserid}</if>
</where>
<if test="wid != null and wid != ''">and wid = #{wid}</if>
<if test="activitytype != null and activitytype != ''">and activitytype = #{activitytype}</if>
<if test="content != null and content != ''">and content = #{content}</if>
<if test="activitytime != null ">and activitytime = #{activitytime}</if>
<if test="createuserid != null ">and createuserid = #{createuserid}</if>
<if test="updateuserid != null ">and updateuserid = #{updateuserid}</if>
<if test="day != null and day != ''">and day = #{day}</if>
</where>
</select>
<select id="selectByPlanweekitemById" parameterType="Long" resultMap="ByPlanweekitemResult">
@@ -40,39 +42,42 @@
<insert id="insertByPlanweekitem" parameterType="ByPlanweekitem" useGeneratedKeys="true" keyProperty="id">
insert into by_planweekitem
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="wid != null and wid != ''">wid,</if>
<if test="activitytype != null and activitytype != ''">activitytype,</if>
<if test="content != null and content != ''">content,</if>
<if test="activitytime != null ">activitytime,</if>
<if test="createuserid != null ">createuserid,</if>
<if test="createTime != null ">create_time,</if>
<if test="updateuserid != null ">updateuserid,</if>
<if test="updateTime != null ">update_time,</if>
</trim>
<if test="wid != null and wid != ''">wid,</if>
<if test="activitytype != null and activitytype != ''">activitytype,</if>
<if test="content != null and content != ''">content,</if>
<if test="activitytime != null ">activitytime,</if>
<if test="createuserid != null ">createuserid,</if>
<if test="createTime != null ">create_time,</if>
<if test="updateuserid != null ">updateuserid,</if>
<if test="updateTime != null ">update_time,</if>
<if test="day != null and day != ''">day,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="wid != null and wid != ''">#{wid},</if>
<if test="activitytype != null and activitytype != ''">#{activitytype},</if>
<if test="content != null and content != ''">#{content},</if>
<if test="activitytime != null ">#{activitytime},</if>
<if test="createuserid != null ">#{createuserid},</if>
<if test="createTime != null ">#{createTime},</if>
<if test="updateuserid != null ">#{updateuserid},</if>
<if test="updateTime != null ">#{updateTime},</if>
</trim>
<if test="wid != null and wid != ''">#{wid},</if>
<if test="activitytype != null and activitytype != ''">#{activitytype},</if>
<if test="content != null and content != ''">#{content},</if>
<if test="activitytime != null ">#{activitytime},</if>
<if test="createuserid != null ">#{createuserid},</if>
<if test="createTime != null ">#{createTime},</if>
<if test="updateuserid != null ">#{updateuserid},</if>
<if test="updateTime != null ">#{updateTime},</if>
<if test="day != null and day != ''">#{day},</if>
</trim>
</insert>
<update id="updateByPlanweekitem" parameterType="ByPlanweekitem">
update by_planweekitem
<trim prefix="SET" suffixOverrides=",">
<if test="wid != null and wid != ''">wid = #{wid},</if>
<if test="activitytype != null and activitytype != ''">activitytype = #{activitytype},</if>
<if test="content != null and content != ''">content = #{content},</if>
<if test="activitytime != null ">activitytime = #{activitytime},</if>
<if test="createuserid != null ">createuserid = #{createuserid},</if>
<if test="createTime != null ">create_time = #{createTime},</if>
<if test="updateuserid != null ">updateuserid = #{updateuserid},</if>
<if test="updateTime != null ">update_time = #{updateTime},</if>
</trim>
<if test="wid != null and wid != ''">wid = #{wid},</if>
<if test="activitytype != null and activitytype != ''">activitytype = #{activitytype},</if>
<if test="content != null and content != ''">content = #{content},</if>
<if test="activitytime != null ">activitytime = #{activitytime},</if>
<if test="createuserid != null ">createuserid = #{createuserid},</if>
<if test="createTime != null ">create_time = #{createTime},</if>
<if test="updateuserid != null ">updateuserid = #{updateuserid},</if>
<if test="updateTime != null ">update_time = #{updateTime},</if>
<if test="day != null and day != ''">day = #{day},</if>
</trim>
where id = #{id}
</update>