Commit 90e91349 by jiang'yun

修改

parent 8d1060dd
...@@ -3,6 +3,7 @@ package com.ruoyi.project.zjsgfa.domain; ...@@ -3,6 +3,7 @@ package com.ruoyi.project.zjsgfa.domain;
import java.math.BigDecimal; import java.math.BigDecimal;
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;
...@@ -14,6 +15,7 @@ import com.ruoyi.framework.web.domain.BaseEntity; ...@@ -14,6 +15,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi * @author ruoyi
* @date 2025-06-23 * @date 2025-06-23
*/ */
@Data
public class SjDjjc extends BaseEntity public class SjDjjc extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -65,11 +67,36 @@ public class SjDjjc extends BaseEntity ...@@ -65,11 +67,36 @@ public class SjDjjc extends BaseEntity
@Excel(name = "创建人") @Excel(name = "创建人")
private String createdBy; private String createdBy;
/** 创建时间 */ /** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date createdTime; private Date createdTime;
/** 钻井公司 */
@Excel(name = "钻井公司")
private String zjgs;
/** 钻井队 */
@Excel(name = "钻井队")
private String zjd;
/** 井底横坐标 */
@Excel(name = "井底横坐标")
private BigDecimal jdhzb;
/** 井底纵坐标 */
@Excel(name = "井底纵坐标")
private BigDecimal jdzzb;
/** 状态 */
@Excel(name = "状态")
private String zt;
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;
......
...@@ -20,10 +20,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -20,10 +20,15 @@ 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="zjgs" column="zjgs" />
<result property="zjd" column="zjd" />
<result property="jdhzb" column="jdhzb" />
<result property="jdzzb" column="jdzzb" />
<result property="zt" column="zt" />
</resultMap> </resultMap>
<sql id="selectSjDjjcVo"> <sql id="selectSjDjjcVo">
select id, jh, jb, jx, jkhzb, jkzzb, gzwz, wzcw, ztmd, wzyz, wjfa, created_by, created_time, update_by, update_time from sj_djjc select id, jh, jb, jx, jkhzb, jkzzb, gzwz, wzcw, ztmd, wzyz, wjfa, created_by, created_time, update_by, update_time, zjgs, zjd, jdhzb, jdzzb, zt from sj_djjc
</sql> </sql>
<select id="selectSjDjjcList" parameterType="SjDjjc" resultMap="SjDjjcResult"> <select id="selectSjDjjcList" parameterType="SjDjjc" resultMap="SjDjjcResult">
...@@ -41,6 +46,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -41,6 +46,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="wjfa != null and wjfa != ''"> and wjfa = #{wjfa}</if> <if test="wjfa != null and wjfa != ''"> and wjfa = #{wjfa}</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>
<if test="zjgs != null and zjgs != ''"> and zjgs = #{zjgs}</if>
<if test="zjd != null and zjd != ''"> and zjd = #{zjd}</if>
<if test="jdhzb != null "> and jdhzb = #{jdhzb}</if>
<if test="jdzzb != null "> and jdzzb = #{jdzzb}</if>
<if test="zt != null and zt != ''"> and zt = #{zt}</if>
</where> </where>
</select> </select>
...@@ -66,6 +76,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -66,6 +76,11 @@ 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="zjgs != null">zjgs,</if>
<if test="zjd != null">zjd,</if>
<if test="jdhzb != null">jdhzb,</if>
<if test="jdzzb != null">jdzzb,</if>
<if test="zt != null">zt,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="jh != null">#{jh},</if> <if test="jh != null">#{jh},</if>
...@@ -82,6 +97,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -82,6 +97,11 @@ 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="zjgs != null">#{zjgs},</if>
<if test="zjd != null">#{zjd},</if>
<if test="jdhzb != null">#{jdhzb},</if>
<if test="jdzzb != null">#{jdzzb},</if>
<if test="zt != null">#{zt},</if>
</trim> </trim>
</insert> </insert>
...@@ -102,6 +122,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -102,6 +122,11 @@ 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="zjgs != null">zjgs = #{zjgs},</if>
<if test="zjd != null">zjd = #{zjd},</if>
<if test="jdhzb != null">jdhzb = #{jdhzb},</if>
<if test="jdzzb != null">jdzzb = #{jdzzb},</if>
<if test="zt != null">zt = #{zt},</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