Commit ae5e83fe authored by 鲍德's avatar 鲍德

增加过期时间

parent f6fb659d
...@@ -50,6 +50,10 @@ public class CurrentRiskUserPatrol extends BaseEntityClean ...@@ -50,6 +50,10 @@ public class CurrentRiskUserPatrol extends BaseEntityClean
@Excel(name = "结束巡查时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "结束巡查时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date endTime; private Date endTime;
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "过期时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date validityTime;
/** 排序 */ /** 排序 */
@Excel(name = "排序") @Excel(name = "排序")
private Long sortNum; private Long sortNum;
......
...@@ -22,10 +22,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -22,10 +22,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="riskPostName" column="risk_post_name" /> <result property="riskPostName" column="risk_post_name" />
<result property="nickName" column="nick_name" /> <result property="nickName" column="nick_name" />
<result property="validityTime" column="validity_time" />
</resultMap> </resultMap>
<sql id="selectCurrentRiskUserPatrolVo"> <sql id="selectCurrentRiskUserPatrolVo">
select a.id, user_id, project_id, risk_post_id, patrol_type, status, start_time, end_time, sort_num, select a.id, user_id, project_id, risk_post_id, patrol_type, status, start_time, end_time, sort_num, a.validity_time,
del_flag, create_by, create_time, update_by, update_time, remark from current_risk_user_patrol a del_flag, create_by, create_time, update_by, update_time, remark from current_risk_user_patrol a
</sql> </sql>
...@@ -43,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -43,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.del_flag, a.del_flag,
a.create_by, a.create_by,
a.create_time, a.create_time,
a.validity_time,
a.update_by, a.update_by,
a.update_time, a.update_time,
a.remark, a.remark,
...@@ -85,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -85,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if> <if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if> <if test="updateTime != null">update_time,</if>
<if test="validityTime != null">validity_time,</if>
<if test="remark != null">remark,</if> <if test="remark != null">remark,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
...@@ -101,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -101,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if> <if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if> <if test="updateTime != null">#{updateTime},</if>
<if test="validityTime != null">#{validityTime},</if>
<if test="remark != null">#{remark},</if> <if test="remark != null">#{remark},</if>
</trim> </trim>
</insert> </insert>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment