Commit 8599e5e3 by jiang'yun

修改

parent 1c34b73c
...@@ -2,6 +2,7 @@ package com.ruoyi.project.zjsgfa.domain; ...@@ -2,6 +2,7 @@ package com.ruoyi.project.zjsgfa.domain;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel; import com.ruoyi.framework.aspectj.lang.annotation.Excel;
...@@ -13,6 +14,7 @@ import com.ruoyi.framework.web.domain.BaseEntity; ...@@ -13,6 +14,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi * @author ruoyi
* @date 2025-07-24 * @date 2025-07-24
*/ */
@Data
public class JcxxHse extends BaseEntity public class JcxxHse extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -20,6 +22,8 @@ public class JcxxHse extends BaseEntity ...@@ -20,6 +22,8 @@ public class JcxxHse extends BaseEntity
/** 主键 */ /** 主键 */
private Long id; private Long id;
private String qk;
/** HSE管理要求 */ /** HSE管理要求 */
@Excel(name = "HSE管理要求") @Excel(name = "HSE管理要求")
private String hse; private String hse;
......
...@@ -2,6 +2,7 @@ package com.ruoyi.project.zjsgfa.domain; ...@@ -2,6 +2,7 @@ package com.ruoyi.project.zjsgfa.domain;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel; import com.ruoyi.framework.aspectj.lang.annotation.Excel;
...@@ -13,12 +14,14 @@ import com.ruoyi.framework.web.domain.BaseEntity; ...@@ -13,12 +14,14 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi * @author ruoyi
* @date 2025-07-24 * @date 2025-07-24
*/ */
@Data
public class JcxxJkzp extends BaseEntity public class JcxxJkzp extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键 */ /** 主键 */
private Long id; private Long id;
private String qk;
/** 钻井口装置 */ /** 钻井口装置 */
@Excel(name = "钻井口装置") @Excel(name = "钻井口装置")
......
...@@ -11,15 +11,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -11,15 +11,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createdTime" column="created_time" /> <result property="createdTime" column="created_time" />
<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" />
</resultMap> </resultMap>
<sql id="selectJcxxHseVo"> <sql id="selectJcxxHseVo">
select id, hse, created_by, created_time, update_by, update_time from jcxx_hse select id, qk, 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="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>
...@@ -39,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -39,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createdTime != null">created_time,</if> <if test="createdTime != null">created_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="qk != null">qk,</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>
...@@ -46,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -46,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createdTime != null">#{createdTime},</if> <if test="createdTime != null">#{createdTime},</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="qk != null">#{qk},</if>
</trim> </trim>
</insert> </insert>
...@@ -57,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -57,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createdTime != null">created_time = #{createdTime},</if> <if test="createdTime != null">created_time = #{createdTime},</if>
<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>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
......
...@@ -14,15 +14,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -14,15 +14,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createdTime" column="created_time" /> <result property="createdTime" column="created_time" />
<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" />
</resultMap> </resultMap>
<sql id="selectJcxxJkzpVo"> <sql id="selectJcxxJkzpVo">
select id, zjkzz, jlgh, syyq, clcb, created_by, created_time, update_by, update_time from jcxx_jkzp select id, qk, 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="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>
...@@ -48,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -48,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createdTime != null">created_time,</if> <if test="createdTime != null">created_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="qk != null">qk,</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>
...@@ -58,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -58,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createdTime != null">#{createdTime},</if> <if test="createdTime != null">#{createdTime},</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="qk != null">#{qk},</if>
</trim> </trim>
</insert> </insert>
...@@ -72,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -72,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createdTime != null">created_time = #{createdTime},</if> <if test="createdTime != null">created_time = #{createdTime},</if>
<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>
</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