Commit c7f8100f authored by EDY's avatar EDY

bug

parent 02e828b9
...@@ -74,6 +74,10 @@ public class BaseCustomInfo extends BaseEntity ...@@ -74,6 +74,10 @@ public class BaseCustomInfo extends BaseEntity
@Excel(name = "负责人") @Excel(name = "负责人")
private String fzr; private String fzr;
/** 备注 */
@Excel(name = "备注")
private String bz;
/** 是否删除 1 删除 0 正常 */ /** 是否删除 1 删除 0 正常 */
@Excel(name = "是否删除 1 删除 0 正常") @Excel(name = "是否删除 1 删除 0 正常")
private Long deleteFlag; private Long deleteFlag;
...@@ -256,4 +260,12 @@ public class BaseCustomInfo extends BaseEntity ...@@ -256,4 +260,12 @@ public class BaseCustomInfo extends BaseEntity
public void setGsId(Long gsId) { public void setGsId(Long gsId) {
this.gsId = gsId; this.gsId = gsId;
} }
public String getBz() {
return bz;
}
public void setBz(String bz) {
this.bz = bz;
}
} }
...@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="khzt" column="khzt" /> <result property="khzt" column="khzt" />
<result property="gs" column="gs" /> <result property="gs" column="gs" />
<result property="fzr" column="fzr" /> <result property="fzr" column="fzr" />
<result property="bz" column="bz" />
<result property="deleteFlag" column="delete_flag" /> <result property="deleteFlag" column="delete_flag" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
...@@ -27,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -27,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectBaseCustomInfoVo"> <sql id="selectBaseCustomInfoVo">
select id, khxm, khgs, khly, cplb, sjh, wx, khdz, khxq, khhy, yxdj, khzt, gs, fzr, delete_flag, create_time, create_by, update_time, update_by from base_custom_info select id, khxm, khgs, khly, cplb, sjh, wx, khdz, khxq, khhy, yxdj, khzt, gs, fzr,bz, delete_flag, create_time, create_by, update_time, update_by from base_custom_info
</sql> </sql>
<select id="selectBaseCustomInfoList" parameterType="BaseCustomInfo" resultMap="BaseCustomInfoResult"> <select id="selectBaseCustomInfoList" parameterType="BaseCustomInfo" resultMap="BaseCustomInfoResult">
...@@ -51,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -51,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="khzt != null "> and khzt = #{khzt}</if> <if test="khzt != null "> and khzt = #{khzt}</if>
<if test="gs != null "> and gs = #{gs}</if> <if test="gs != null "> and gs = #{gs}</if>
<if test="fzr != null and fzr != ''"> and fzr = #{fzr}</if> <if test="fzr != null and fzr != ''"> and fzr = #{fzr}</if>
<if test="bz != null and bz != ''"> and bz = #{bz}</if>
<if test="deleteFlag != null "> and delete_flag = #{deleteFlag}</if> <if test="deleteFlag != null "> and delete_flag = #{deleteFlag}</if>
</where> </where>
</select> </select>
...@@ -76,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -76,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="khzt != null">khzt,</if> <if test="khzt != null">khzt,</if>
<if test="gs != null">gs,</if> <if test="gs != null">gs,</if>
<if test="fzr != null">fzr,</if> <if test="fzr != null">fzr,</if>
<if test="bz != null">bz,</if>
<if test="deleteFlag != null">delete_flag,</if> <if test="deleteFlag != null">delete_flag,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
...@@ -96,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -96,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="khzt != null">#{khzt},</if> <if test="khzt != null">#{khzt},</if>
<if test="gs != null">#{gs},</if> <if test="gs != null">#{gs},</if>
<if test="fzr != null">#{fzr},</if> <if test="fzr != null">#{fzr},</if>
<if test="bz != null">#{bz},</if>
<if test="deleteFlag != null">#{deleteFlag},</if> <if test="deleteFlag != null">#{deleteFlag},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
...@@ -120,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -120,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="khzt != null">khzt = #{khzt},</if> <if test="khzt != null">khzt = #{khzt},</if>
<if test="gs != null">gs = #{gs},</if> <if test="gs != null">gs = #{gs},</if>
<if test="fzr != null">fzr = #{fzr},</if> <if test="fzr != null">fzr = #{fzr},</if>
<if test="bz != null">bz = #{bz},</if>
<if test="deleteFlag != null">delete_flag = #{deleteFlag},</if> <if test="deleteFlag != null">delete_flag = #{deleteFlag},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
......
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