Commit b2211454 by qwmqiuwenmin

Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

parents 034b5824 e442c171
...@@ -16,9 +16,38 @@ public class MaidianDictModuleDTO implements Serializable { ...@@ -16,9 +16,38 @@ public class MaidianDictModuleDTO implements Serializable {
private String operationPerson; private String operationPerson;
private Integer hideFlag;
private String code;
private String moduleData;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public String getModuleId() { public Integer getHideFlag() {
return hideFlag;
}
public void setHideFlag(Integer hideFlag) {
this.hideFlag = hideFlag;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getModuleData() {
return moduleData;
}
public void setModuleData(String moduleData) {
this.moduleData = moduleData;
}
public String getModuleId() {
return moduleId; return moduleId;
} }
......
...@@ -15,6 +15,8 @@ public interface TabHaobanMaidianDictModuleMapper { ...@@ -15,6 +15,8 @@ public interface TabHaobanMaidianDictModuleMapper {
int updateByPrimaryKeySelective(TabHaobanMaidianDictModule record); int updateByPrimaryKeySelective(TabHaobanMaidianDictModule record);
int updateByPrimaryKeyWithBLOBs(TabHaobanMaidianDictModule record);
int updateByPrimaryKey(TabHaobanMaidianDictModule record); int updateByPrimaryKey(TabHaobanMaidianDictModule record);
List<TabHaobanMaidianDictModule> list(); List<TabHaobanMaidianDictModule> list();
......
...@@ -16,6 +16,12 @@ public class TabHaobanMaidianDictModule implements Serializable { ...@@ -16,6 +16,12 @@ public class TabHaobanMaidianDictModule implements Serializable {
private String operationPerson; private String operationPerson;
private Integer hideFlag;
private String code;
private String moduleData;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public String getModuleId() { public String getModuleId() {
...@@ -65,4 +71,28 @@ public class TabHaobanMaidianDictModule implements Serializable { ...@@ -65,4 +71,28 @@ public class TabHaobanMaidianDictModule implements Serializable {
public void setOperationPerson(String operationPerson) { public void setOperationPerson(String operationPerson) {
this.operationPerson = operationPerson == null ? null : operationPerson.trim(); this.operationPerson = operationPerson == null ? null : operationPerson.trim();
} }
public Integer getHideFlag() {
return hideFlag;
}
public void setHideFlag(Integer hideFlag) {
this.hideFlag = hideFlag;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code == null ? null : code.trim();
}
public String getModuleData() {
return moduleData;
}
public void setModuleData(String moduleData) {
this.moduleData = moduleData == null ? null : moduleData.trim();
}
} }
\ No newline at end of file
...@@ -8,13 +8,24 @@ ...@@ -8,13 +8,24 @@
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP" /> <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
<result column="status" property="status" jdbcType="INTEGER" /> <result column="status" property="status" jdbcType="INTEGER" />
<result column="operation_person" property="operationPerson" jdbcType="VARCHAR" /> <result column="operation_person" property="operationPerson" jdbcType="VARCHAR" />
<result column="hide_flag" property="hideFlag" jdbcType="INTEGER" />
<result column="code" property="code" jdbcType="VARCHAR" />
</resultMap>
<resultMap id="ResultMapWithBLOBs" type="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" extends="BaseResultMap" >
<result column="module_data" property="moduleData" jdbcType="LONGVARCHAR" />
</resultMap> </resultMap>
<sql id="Base_Column_List" > <sql id="Base_Column_List" >
module_id, module_name, create_time, update_time, status, operation_person module_id, module_name, create_time, update_time, status, operation_person, hide_flag,
code
</sql>
<sql id="Blob_Column_List" >
module_data
</sql> </sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" > <select id="selectByPrimaryKey" resultMap="ResultMapWithBLOBs" parameterType="java.lang.String" >
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
,
<include refid="Blob_Column_List" />
from tab_haoban_maidian_dict_module from tab_haoban_maidian_dict_module
where module_id = #{moduleId,jdbcType=VARCHAR} where module_id = #{moduleId,jdbcType=VARCHAR}
</select> </select>
...@@ -24,10 +35,12 @@ ...@@ -24,10 +35,12 @@
</delete> </delete>
<insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" > <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" >
insert into tab_haoban_maidian_dict_module (module_id, module_name, create_time, insert into tab_haoban_maidian_dict_module (module_id, module_name, create_time,
update_time, status, operation_person update_time, status, operation_person,
hide_flag, code, module_data
) )
values (#{moduleId,jdbcType=VARCHAR}, #{moduleName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, values (#{moduleId,jdbcType=VARCHAR}, #{moduleName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, #{operationPerson,jdbcType=VARCHAR} #{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, #{operationPerson,jdbcType=VARCHAR},
#{hideFlag,jdbcType=INTEGER}, #{code,jdbcType=VARCHAR}, #{moduleData,jdbcType=LONGVARCHAR}
) )
</insert> </insert>
<insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" > <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" >
...@@ -51,6 +64,15 @@ ...@@ -51,6 +64,15 @@
<if test="operationPerson != null" > <if test="operationPerson != null" >
operation_person, operation_person,
</if> </if>
<if test="hideFlag != null" >
hide_flag,
</if>
<if test="code != null" >
code,
</if>
<if test="moduleData != null" >
module_data,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides="," > <trim prefix="values (" suffix=")" suffixOverrides="," >
<if test="moduleId != null" > <if test="moduleId != null" >
...@@ -71,6 +93,15 @@ ...@@ -71,6 +93,15 @@
<if test="operationPerson != null" > <if test="operationPerson != null" >
#{operationPerson,jdbcType=VARCHAR}, #{operationPerson,jdbcType=VARCHAR},
</if> </if>
<if test="hideFlag != null" >
#{hideFlag,jdbcType=INTEGER},
</if>
<if test="code != null" >
#{code,jdbcType=VARCHAR},
</if>
<if test="moduleData != null" >
#{moduleData,jdbcType=LONGVARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" > <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" >
...@@ -91,20 +122,43 @@ ...@@ -91,20 +122,43 @@
<if test="operationPerson != null" > <if test="operationPerson != null" >
operation_person = #{operationPerson,jdbcType=VARCHAR}, operation_person = #{operationPerson,jdbcType=VARCHAR},
</if> </if>
<if test="hideFlag != null" >
hide_flag = #{hideFlag,jdbcType=INTEGER},
</if>
<if test="code != null" >
code = #{code,jdbcType=VARCHAR},
</if>
<if test="moduleData != null" >
module_data = #{moduleData,jdbcType=LONGVARCHAR},
</if>
</set> </set>
where module_id = #{moduleId,jdbcType=VARCHAR} where module_id = #{moduleId,jdbcType=VARCHAR}
</update> </update>
<update id="updateByPrimaryKeyWithBLOBs" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" >
update tab_haoban_maidian_dict_module
set module_name = #{moduleName,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
status = #{status,jdbcType=INTEGER},
operation_person = #{operationPerson,jdbcType=VARCHAR},
hide_flag = #{hideFlag,jdbcType=INTEGER},
code = #{code,jdbcType=VARCHAR},
module_data = #{moduleData,jdbcType=LONGVARCHAR}
where module_id = #{moduleId,jdbcType=VARCHAR}
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" > <update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" >
update tab_haoban_maidian_dict_module update tab_haoban_maidian_dict_module
set module_name = #{moduleName,jdbcType=VARCHAR}, set module_name = #{moduleName,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP},
status = #{status,jdbcType=INTEGER}, status = #{status,jdbcType=INTEGER},
operation_person = #{operationPerson,jdbcType=VARCHAR} operation_person = #{operationPerson,jdbcType=VARCHAR},
hide_flag = #{hideFlag,jdbcType=INTEGER},
code = #{code,jdbcType=VARCHAR}
where module_id = #{moduleId,jdbcType=VARCHAR} where module_id = #{moduleId,jdbcType=VARCHAR}
</update> </update>
<select id="list" resultMap="BaseResultMap" parameterType="java.lang.String" > <select id="list" resultMap="BaseResultMap" parameterType="java.lang.String" >
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from tab_haoban_maidian_dict_module from tab_haoban_maidian_dict_module
......
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