Commit 85457d64 by jiang'yun

修改

parent b6866692
...@@ -23,6 +23,7 @@ public class JcxxHse extends BaseEntity ...@@ -23,6 +23,7 @@ public class JcxxHse extends BaseEntity
private Long id; private Long id;
private String qk; private String qk;
private String mc;
/** HSE管理要求 */ /** HSE管理要求 */
@Excel(name = "HSE管理要求") @Excel(name = "HSE管理要求")
......
...@@ -22,6 +22,7 @@ public class JcxxJkzp extends BaseEntity ...@@ -22,6 +22,7 @@ public class JcxxJkzp extends BaseEntity
/** 主键 */ /** 主键 */
private Long id; private Long id;
private String qk; private String qk;
private String mc;
/** 钻井口装置 */ /** 钻井口装置 */
@Excel(name = "钻井口装置") @Excel(name = "钻井口装置")
......
...@@ -12,16 +12,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -12,16 +12,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time" />
<result property="qk" column="qk" /> <result property="qk" column="qk" />
<result property="mc" column="mc" />
</resultMap> </resultMap>
<sql id="selectJcxxHseVo"> <sql id="selectJcxxHseVo">
select id, qk, hse, created_by, created_time, update_by, update_time from jcxx_hse select id, qk,mc, hse, created_by, created_time, update_by, update_time from jcxx_hse
</sql> </sql>
<select id="selectJcxxHseList" parameterType="JcxxHse" resultMap="JcxxHseResult"> <select id="selectJcxxHseList" parameterType="JcxxHse" resultMap="JcxxHseResult">
<include refid="selectJcxxHseVo"/> <include refid="selectJcxxHseVo"/>
<where> <where>
<if test="qk != null and qk != ''"> and qk = #{qk}</if> <if test="qk != null and qk != ''"> and qk = #{qk}</if>
<if test="mc != null and mc != ''"> and mc like concat('%', #{mc}, '%')</if>
<if test="hse != null and hse != ''"> and hse = #{hse}</if> <if test="hse != null and hse != ''"> and hse = #{hse}</if>
<if test="createdBy != null and createdBy != ''"> and created_by = #{createdBy}</if> <if test="createdBy != null and createdBy != ''"> and created_by = #{createdBy}</if>
<if test="createdTime != null "> and created_time = #{createdTime}</if> <if test="createdTime != null "> and created_time = #{createdTime}</if>
...@@ -42,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -42,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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="qk != null">qk,</if> <if test="qk != null">qk,</if>
<if test="mc != null">mc,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="hse != null">#{hse},</if> <if test="hse != null">#{hse},</if>
...@@ -50,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -50,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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="qk != null">#{qk},</if> <if test="qk != null">#{qk},</if>
<if test="mc != null">#{mc},</if>
</trim> </trim>
</insert> </insert>
...@@ -62,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -62,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if> <if test="updateTime != null">update_time = #{updateTime},</if>
<if test="qk != null">qk = #{qk},</if> <if test="qk != null">qk = #{qk},</if>
<if test="mc != null">mc = #{mc},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
......
...@@ -15,16 +15,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -15,16 +15,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time" />
<result property="qk" column="qk" /> <result property="qk" column="qk" />
<result property="mc" column="mc" />
</resultMap> </resultMap>
<sql id="selectJcxxJkzpVo"> <sql id="selectJcxxJkzpVo">
select id, qk, zjkzz, jlgh, syyq, clcb, created_by, created_time, update_by, update_time from jcxx_jkzp select id, qk,mc, zjkzz, jlgh, syyq, clcb, created_by, created_time, update_by, update_time from jcxx_jkzp
</sql> </sql>
<select id="selectJcxxJkzpList" parameterType="JcxxJkzp" resultMap="JcxxJkzpResult"> <select id="selectJcxxJkzpList" parameterType="JcxxJkzp" resultMap="JcxxJkzpResult">
<include refid="selectJcxxJkzpVo"/> <include refid="selectJcxxJkzpVo"/>
<where> <where>
<if test="qk != null and qk != ''"> and qk = #{qk}</if> <if test="qk != null and qk != ''"> and qk = #{qk}</if>
<if test="mc != null and mc != ''"> and mc like concat('%', #{mc}, '%')</if>
<if test="zjkzz != null and zjkzz != ''"> and zjkzz = #{zjkzz}</if> <if test="zjkzz != null and zjkzz != ''"> and zjkzz = #{zjkzz}</if>
<if test="jlgh != null and jlgh != ''"> and jlgh = #{jlgh}</if> <if test="jlgh != null and jlgh != ''"> and jlgh = #{jlgh}</if>
<if test="syyq != null and syyq != ''"> and syyq = #{syyq}</if> <if test="syyq != null and syyq != ''"> and syyq = #{syyq}</if>
...@@ -51,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -51,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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="qk != null">qk,</if> <if test="qk != null">qk,</if>
<if test="mc != null">mc,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="zjkzz != null">#{zjkzz},</if> <if test="zjkzz != null">#{zjkzz},</if>
...@@ -62,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -62,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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="qk != null">#{qk},</if> <if test="qk != null">#{qk},</if>
<if test="mc != null">#{mc},</if>
</trim> </trim>
</insert> </insert>
...@@ -77,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -77,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if> <if test="updateTime != null">update_time = #{updateTime},</if>
<if test="qk != null">qk = #{qk},</if> <if test="qk != null">qk = #{qk},</if>
<if test="mc != null">mc = #{mc},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
......
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