Skip to content
GitLab
Commit d73781d8 authored by 乾坤平台's avatar 乾坤平台 Committed by 季圣华
Browse files

!39 添加删除标记 

Merge pull request !39 from 乾坤平台/master
parents aa7dca67 7dc1cdaa
Hide whitespace changes
Inline Side-by-side
src/main/resources/mapper_xml/FunctionsMapper.xml
View file @ d73781d8
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<result column="Enabled" jdbcType="BIT" property="enabled" /> <result column="Enabled" jdbcType="BIT" property="enabled" />
<result column="Type" jdbcType="VARCHAR" property="type" /> <result column="Type" jdbcType="VARCHAR" property="type" />
<result column="PushBtn" jdbcType="VARCHAR" property="pushbtn" /> <result column="PushBtn" jdbcType="VARCHAR" property="pushbtn" />
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -88,7 +89,7 @@ ...@@ -88,7 +89,7 @@
WARNING - @mbggenerated WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
Id, Number, Name, PNumber, URL, State, Sort, Enabled, Type, PushBtn Id, Number, Name, PNumber, URL, State, Sort, Enabled, Type, PushBtn, delete_Flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.FunctionsExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.FunctionsExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -143,10 +144,12 @@ ...@@ -143,10 +144,12 @@
--> -->
insert into jsh_functions (Id, Number, Name, insert into jsh_functions (Id, Number, Name,
PNumber, URL, State, Sort, PNumber, URL, State, Sort,
Enabled, Type, PushBtn) Enabled, Type, PushBtn,
delete_Flag)
values (#{id,jdbcType=BIGINT}, #{number,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{number,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
#{pnumber,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, #{state,jdbcType=BIT}, #{sort,jdbcType=VARCHAR}, #{pnumber,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, #{state,jdbcType=BIT}, #{sort,jdbcType=VARCHAR},
#{enabled,jdbcType=BIT}, #{type,jdbcType=VARCHAR}, #{pushbtn,jdbcType=VARCHAR}) #{enabled,jdbcType=BIT}, #{type,jdbcType=VARCHAR}, #{pushbtn,jdbcType=VARCHAR},
#{deleteFlag,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Functions"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Functions">
<!-- <!--
...@@ -185,6 +188,9 @@ ...@@ -185,6 +188,9 @@
<if test="pushbtn != null"> <if test="pushbtn != null">
PushBtn, PushBtn,
</if> </if>
<if test="deleteFlag != null">
delete_Flag,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -217,6 +223,9 @@ ...@@ -217,6 +223,9 @@
<if test="pushbtn != null"> <if test="pushbtn != null">
#{pushbtn,jdbcType=VARCHAR}, #{pushbtn,jdbcType=VARCHAR},
</if> </if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.FunctionsExample" resultType="java.lang.Integer"> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.FunctionsExample" resultType="java.lang.Integer">
...@@ -266,6 +275,9 @@ ...@@ -266,6 +275,9 @@
<if test="record.pushbtn != null"> <if test="record.pushbtn != null">
PushBtn = #{record.pushbtn,jdbcType=VARCHAR}, PushBtn = #{record.pushbtn,jdbcType=VARCHAR},
</if> </if>
<if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -286,7 +298,8 @@ ...@@ -286,7 +298,8 @@
Sort = #{record.sort,jdbcType=VARCHAR}, Sort = #{record.sort,jdbcType=VARCHAR},
Enabled = #{record.enabled,jdbcType=BIT}, Enabled = #{record.enabled,jdbcType=BIT},
Type = #{record.type,jdbcType=VARCHAR}, Type = #{record.type,jdbcType=VARCHAR},
PushBtn = #{record.pushbtn,jdbcType=VARCHAR} PushBtn = #{record.pushbtn,jdbcType=VARCHAR},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -325,6 +338,9 @@ ...@@ -325,6 +338,9 @@
<if test="pushbtn != null"> <if test="pushbtn != null">
PushBtn = #{pushbtn,jdbcType=VARCHAR}, PushBtn = #{pushbtn,jdbcType=VARCHAR},
</if> </if>
<if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
</set> </set>
where Id = #{id,jdbcType=BIGINT} where Id = #{id,jdbcType=BIGINT}
</update> </update>
...@@ -342,7 +358,8 @@ ...@@ -342,7 +358,8 @@
Sort = #{sort,jdbcType=VARCHAR}, Sort = #{sort,jdbcType=VARCHAR},
Enabled = #{enabled,jdbcType=BIT}, Enabled = #{enabled,jdbcType=BIT},
Type = #{type,jdbcType=VARCHAR}, Type = #{type,jdbcType=VARCHAR},
PushBtn = #{pushbtn,jdbcType=VARCHAR} PushBtn = #{pushbtn,jdbcType=VARCHAR},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
where Id = #{id,jdbcType=BIGINT} where Id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper_xml/InOutItemMapper.xml
View file @ d73781d8
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<result column="Type" jdbcType="VARCHAR" property="type" /> <result column="Type" jdbcType="VARCHAR" property="type" />
<result column="Remark" jdbcType="VARCHAR" property="remark" /> <result column="Remark" jdbcType="VARCHAR" property="remark" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -83,7 +84,7 @@ ...@@ -83,7 +84,7 @@
WARNING - @mbggenerated WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
Id, Name, Type, Remark, tenant_id Id, Name, Type, Remark, tenant_id, delete_Flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.InOutItemExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.InOutItemExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -137,9 +138,11 @@ ...@@ -137,9 +138,11 @@
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
insert into jsh_inoutitem (Id, Name, Type, insert into jsh_inoutitem (Id, Name, Type,
Remark, tenant_id) Remark, tenant_id, delete_Flag
)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
#{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}) #{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
)
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.InOutItem"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.InOutItem">
<!-- <!--
...@@ -163,6 +166,9 @@ ...@@ -163,6 +166,9 @@
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id, tenant_id,
</if> </if>
<if test="deleteFlag != null">
delete_Flag,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -180,6 +186,9 @@ ...@@ -180,6 +186,9 @@
<if test="tenantId != null"> <if test="tenantId != null">
#{tenantId,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT},
</if> </if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.InOutItemExample" resultType="java.lang.Integer"> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.InOutItemExample" resultType="java.lang.Integer">
...@@ -214,6 +223,9 @@ ...@@ -214,6 +223,9 @@
<if test="record.tenantId != null"> <if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if> </if>
<if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -229,7 +241,8 @@ ...@@ -229,7 +241,8 @@
Name = #{record.name,jdbcType=VARCHAR}, Name = #{record.name,jdbcType=VARCHAR},
Type = #{record.type,jdbcType=VARCHAR}, Type = #{record.type,jdbcType=VARCHAR},
Remark = #{record.remark,jdbcType=VARCHAR}, Remark = #{record.remark,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT} tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -253,6 +266,9 @@ ...@@ -253,6 +266,9 @@
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
</if> </if>
<if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
</set> </set>
where Id = #{id,jdbcType=BIGINT} where Id = #{id,jdbcType=BIGINT}
</update> </update>
...@@ -265,7 +281,8 @@ ...@@ -265,7 +281,8 @@
set Name = #{name,jdbcType=VARCHAR}, set Name = #{name,jdbcType=VARCHAR},
Type = #{type,jdbcType=VARCHAR}, Type = #{type,jdbcType=VARCHAR},
Remark = #{remark,jdbcType=VARCHAR}, Remark = #{remark,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT} tenant_id = #{tenantId,jdbcType=BIGINT},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
where Id = #{id,jdbcType=BIGINT} where Id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper_xml/LogMapperEx.xml
View file @ d73781d8
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<select id="selectByConditionLog" parameterType="com.jsh.erp.datasource.entities.LogExample" resultMap="ResultExMap"> <select id="selectByConditionLog" parameterType="com.jsh.erp.datasource.entities.LogExample" resultMap="ResultExMap">
select l.*,u.username userName select l.*,u.username userName
FROM jsh_log l left join jsh_user u FROM jsh_log l
on l.userID = u.id left join jsh_user u on l.userID = u.id and ifnull(u.status,'0') not in('1','2')
where 1=1 where 1=1
<if test="operation != null"> <if test="operation != null">
and l.operation like '%${operation}%' and l.operation like '%${operation}%'
......
src/main/resources/mapper_xml/MaterialCategoryMapperEx.xml
View file @ d73781d8
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
select * select *
FROM jsh_materialcategory FROM jsh_materialcategory
where 1=1 where 1=1
and ifnull(status,'0') !='2'
<if test="name != null"> <if test="name != null">
and name like '%${name}%' and name like '%${name}%'
</if> </if>
...@@ -21,6 +22,7 @@ ...@@ -21,6 +22,7 @@
COUNT(id) COUNT(id)
FROM jsh_materialcategory FROM jsh_materialcategory
WHERE 1=1 WHERE 1=1
and ifnull(status,'0') !='2'
<if test="name != null"> <if test="name != null">
and name like '%${name}%' and name like '%${name}%'
</if> </if>
...@@ -56,7 +58,7 @@ ...@@ -56,7 +58,7 @@
<if test="currentId != null"> <if test="currentId != null">
and id !=#{currentId} and id !=#{currentId}
</if> </if>
and status !='2' and ifnull(status,'0') !='2'
order by sort asc order by sort asc
</select> </select>
...@@ -65,7 +67,7 @@ ...@@ -65,7 +67,7 @@
<include refid="Base_Column_List"/>,#{currentId} as currentId <include refid="Base_Column_List"/>,#{currentId} as currentId
FROM jsh_materialcategory FROM jsh_materialcategory
WHERE ParentId = -1 WHERE ParentId = -1
and status !='2' and ifnull(status,'0') !='2'
<if test="currentId != null"> <if test="currentId != null">
and id !=#{currentId} and id !=#{currentId}
</if> </if>
...@@ -103,7 +105,7 @@ ...@@ -103,7 +105,7 @@
FROM jsh_materialcategory FROM jsh_materialcategory
where 1=1 where 1=1
and serial_no=#{serialNo} and serial_no=#{serialNo}
and status !='2' and ifnull(status,'0') !='2'
</select> </select>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper_xml/MaterialMapper.xml
View file @ d73781d8
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
<result column="OtherField3" jdbcType="VARCHAR" property="otherfield3" /> <result column="OtherField3" jdbcType="VARCHAR" property="otherfield3" />
<result column="enableSerialNumber" jdbcType="VARCHAR" property="enableserialnumber" /> <result column="enableSerialNumber" jdbcType="VARCHAR" property="enableserialnumber" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -106,7 +107,7 @@ ...@@ -106,7 +107,7 @@
Id, CategoryId, Name, Mfrs, Packing, SafetyStock, Model, Standard, Color, Unit, Remark, Id, CategoryId, Name, Mfrs, Packing, SafetyStock, Model, Standard, Color, Unit, Remark,
RetailPrice, LowPrice, PresetPriceOne, PresetPriceTwo, UnitId, FirstOutUnit, FirstInUnit, RetailPrice, LowPrice, PresetPriceOne, PresetPriceTwo, UnitId, FirstOutUnit, FirstInUnit,
PriceStrategy, Enabled, OtherField1, OtherField2, OtherField3, enableSerialNumber, PriceStrategy, Enabled, OtherField1, OtherField2, OtherField3, enableSerialNumber,
tenant_id tenant_id, delete_Flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -167,7 +168,7 @@ ...@@ -167,7 +168,7 @@
UnitId, FirstOutUnit, FirstInUnit, UnitId, FirstOutUnit, FirstInUnit,
PriceStrategy, Enabled, OtherField1, PriceStrategy, Enabled, OtherField1,
OtherField2, OtherField3, enableSerialNumber, OtherField2, OtherField3, enableSerialNumber,
tenant_id) tenant_id, delete_Flag)
values (#{id,jdbcType=BIGINT}, #{categoryid,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{categoryid,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR},
#{mfrs,jdbcType=VARCHAR}, #{packing,jdbcType=DECIMAL}, #{safetystock,jdbcType=DECIMAL}, #{mfrs,jdbcType=VARCHAR}, #{packing,jdbcType=DECIMAL}, #{safetystock,jdbcType=DECIMAL},
#{model,jdbcType=VARCHAR}, #{standard,jdbcType=VARCHAR}, #{color,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, #{standard,jdbcType=VARCHAR}, #{color,jdbcType=VARCHAR},
...@@ -176,7 +177,7 @@ ...@@ -176,7 +177,7 @@
#{unitid,jdbcType=BIGINT}, #{firstoutunit,jdbcType=VARCHAR}, #{firstinunit,jdbcType=VARCHAR}, #{unitid,jdbcType=BIGINT}, #{firstoutunit,jdbcType=VARCHAR}, #{firstinunit,jdbcType=VARCHAR},
#{pricestrategy,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, #{otherfield1,jdbcType=VARCHAR}, #{pricestrategy,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, #{otherfield1,jdbcType=VARCHAR},
#{otherfield2,jdbcType=VARCHAR}, #{otherfield3,jdbcType=VARCHAR}, #{enableserialnumber,jdbcType=VARCHAR}, #{otherfield2,jdbcType=VARCHAR}, #{otherfield3,jdbcType=VARCHAR}, #{enableserialnumber,jdbcType=VARCHAR},
#{tenantId,jdbcType=BIGINT}) #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Material"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Material">
<!-- <!--
...@@ -260,6 +261,9 @@ ...@@ -260,6 +261,9 @@
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id, tenant_id,
</if> </if>
<if test="deleteFlag != null">
delete_Flag,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -337,6 +341,9 @@ ...@@ -337,6 +341,9 @@
<if test="tenantId != null"> <if test="tenantId != null">
#{tenantId,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT},
</if> </if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultType="java.lang.Integer"> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultType="java.lang.Integer">
...@@ -431,6 +438,9 @@ ...@@ -431,6 +438,9 @@
<if test="record.tenantId != null"> <if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if> </if>
<if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -466,7 +476,8 @@ ...@@ -466,7 +476,8 @@
OtherField2 = #{record.otherfield2,jdbcType=VARCHAR}, OtherField2 = #{record.otherfield2,jdbcType=VARCHAR},
OtherField3 = #{record.otherfield3,jdbcType=VARCHAR}, OtherField3 = #{record.otherfield3,jdbcType=VARCHAR},
enableSerialNumber = #{record.enableserialnumber,jdbcType=VARCHAR}, enableSerialNumber = #{record.enableserialnumber,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT} tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -550,6 +561,9 @@ ...@@ -550,6 +561,9 @@
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
</if> </if>
<if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
</set> </set>
where Id = #{id,jdbcType=BIGINT} where Id = #{id,jdbcType=BIGINT}
</update> </update>
...@@ -582,7 +596,8 @@ ...@@ -582,7 +596,8 @@
OtherField2 = #{otherfield2,jdbcType=VARCHAR}, OtherField2 = #{otherfield2,jdbcType=VARCHAR},
OtherField3 = #{otherfield3,jdbcType=VARCHAR}, OtherField3 = #{otherfield3,jdbcType=VARCHAR},
enableSerialNumber = #{enableserialnumber,jdbcType=VARCHAR}, enableSerialNumber = #{enableserialnumber,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT} tenant_id = #{tenantId,jdbcType=BIGINT},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
where Id = #{id,jdbcType=BIGINT} where Id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper_xml/MaterialPropertyMapper.xml
View file @ d73781d8
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<result column="enabled" jdbcType="BIT" property="enabled" /> <result column="enabled" jdbcType="BIT" property="enabled" />
<result column="sort" jdbcType="VARCHAR" property="sort" /> <result column="sort" jdbcType="VARCHAR" property="sort" />
<result column="anotherName" jdbcType="VARCHAR" property="anothername" /> <result column="anotherName" jdbcType="VARCHAR" property="anothername" />
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -83,7 +84,7 @@ ...@@ -83,7 +84,7 @@
WARNING - @mbggenerated WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
id, nativeName, enabled, sort, anotherName id, nativeName, enabled, sort, anotherName, delete_Flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.MaterialPropertyExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.MaterialPropertyExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -137,9 +138,11 @@ ...@@ -137,9 +138,11 @@
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
insert into jsh_materialproperty (id, nativeName, enabled, insert into jsh_materialproperty (id, nativeName, enabled,
sort, anotherName) sort, anotherName, delete_Flag
)
values (#{id,jdbcType=BIGINT}, #{nativename,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, values (#{id,jdbcType=BIGINT}, #{nativename,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT},
#{sort,jdbcType=VARCHAR}, #{anothername,jdbcType=VARCHAR}) #{sort,jdbcType=VARCHAR}, #{anothername,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=VARCHAR}
)
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.MaterialProperty"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.MaterialProperty">
<!-- <!--
...@@ -163,6 +166,9 @@ ...@@ -163,6 +166,9 @@
<if test="anothername != null"> <if test="anothername != null">
anotherName, anotherName,
</if> </if>
<if test="deleteFlag != null">
delete_Flag,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -180,6 +186,9 @@ ...@@ -180,6 +186,9 @@
<if test="anothername != null"> <if test="anothername != null">
#{anothername,jdbcType=VARCHAR}, #{anothername,jdbcType=VARCHAR},
</if> </if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.MaterialPropertyExample" resultType="java.lang.Integer"> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.MaterialPropertyExample" resultType="java.lang.Integer">
...@@ -214,6 +223,9 @@ ...@@ -214,6 +223,9 @@
<if test="record.anothername != null"> <if test="record.anothername != null">
anotherName = #{record.anothername,jdbcType=VARCHAR}, anotherName = #{record.anothername,jdbcType=VARCHAR},
</if> </if>
<if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -229,7 +241,8 @@ ...@@ -229,7 +241,8 @@
nativeName = #{record.nativename,jdbcType=VARCHAR}, nativeName = #{record.nativename,jdbcType=VARCHAR},
enabled = #{record.enabled,jdbcType=BIT}, enabled = #{record.enabled,jdbcType=BIT},
sort = #{record.sort,jdbcType=VARCHAR}, sort = #{record.sort,jdbcType=VARCHAR},
anotherName = #{record.anothername,jdbcType=VARCHAR} anotherName = #{record.anothername,jdbcType=VARCHAR},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -253,6 +266,9 @@ ...@@ -253,6 +266,9 @@
<if test="anothername != null"> <if test="anothername != null">
anotherName = #{anothername,jdbcType=VARCHAR}, anotherName = #{anothername,jdbcType=VARCHAR},
</if> </if>
<if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
</set> </set>
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
...@@ -265,7 +281,8 @@ ...@@ -265,7 +281,8 @@
set nativeName = #{nativename,jdbcType=VARCHAR}, set nativeName = #{nativename,jdbcType=VARCHAR},
enabled = #{enabled,jdbcType=BIT}, enabled = #{enabled,jdbcType=BIT},
sort = #{sort,jdbcType=VARCHAR}, sort = #{sort,jdbcType=VARCHAR},
anotherName = #{anothername,jdbcType=VARCHAR} anotherName = #{anothername,jdbcType=VARCHAR},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper_xml/OrganizationMapperEx.xml
View file @ d73781d8
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<if test="currentId != null"> <if test="currentId != null">
and id !=#{currentId} and id !=#{currentId}
</if> </if>
and org_stcd !='5' and ifnull(org_stcd,'0') !='5'
order by sort asc order by sort asc
</select> </select>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<if test="currentId != null"> <if test="currentId != null">
and id !=#{currentId} and id !=#{currentId}
</if> </if>
and org_stcd !='5' and ifnull(org_stcd,'0') !='5'
order by sort asc order by sort asc
</select> </select>
<insert id="addOrganization" parameterType="com.jsh.erp.datasource.entities.Organization" <insert id="addOrganization" parameterType="com.jsh.erp.datasource.entities.Organization"
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
select * from jsh_organization select * from jsh_organization
where where
1=1 1=1
and org_stcd!='5' and ifnull(org_stcd,'0') !='5'
and org_parent_no='-1' and org_parent_no='-1'
and org_abr='根机构' and org_abr='根机构'
and id in ( and id in (
......
src/main/resources/mapper_xml/PersonMapper.xml
View file @ d73781d8
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<result column="Type" jdbcType="VARCHAR" property="type" /> <result column="Type" jdbcType="VARCHAR" property="type" />
<result column="Name" jdbcType="VARCHAR" property="name" /> <result column="Name" jdbcType="VARCHAR" property="name" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -82,7 +83,7 @@ ...@@ -82,7 +83,7 @@
WARNING - @mbggenerated WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
Id, Type, Name, tenant_id Id, Type, Name, tenant_id, delete_Flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.PersonExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.PersonExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -136,9 +137,9 @@ ...@@ -136,9 +137,9 @@
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
insert into jsh_person (Id, Type, Name, insert into jsh_person (Id, Type, Name,
tenant_id) tenant_id, delete_Flag)
values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
#{tenantId,jdbcType=BIGINT}) #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Person"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Person">
<!-- <!--
...@@ -159,6 +160,9 @@ ...@@ -159,6 +160,9 @@
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id, tenant_id,
</if> </if>
<if test="deleteFlag != null">
delete_Flag,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -173,6 +177,9 @@ ...@@ -173,6 +177,9 @@
<if test="tenantId != null"> <if test="tenantId != null">
#{tenantId,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT},
</if> </if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.PersonExample" resultType="java.lang.Integer"> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.PersonExample" resultType="java.lang.Integer">
...@@ -204,6 +211,9 @@ ...@@ -204,6 +211,9 @@
<if test="record.tenantId != null"> <if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if> </if>
<if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -218,7 +228,8 @@ ...@@ -218,7 +228,8 @@
set Id = #{record.id,jdbcType=BIGINT}, set Id = #{record.id,jdbcType=BIGINT},
Type = #{record.type,jdbcType=VARCHAR}, Type = #{record.type,jdbcType=VARCHAR},
Name = #{record.name,jdbcType=VARCHAR}, Name = #{record.name,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT} tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -239,6 +250,9 @@ ...@@ -239,6 +250,9 @@
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
</if> </if>
<if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
</set> </set>
where Id = #{id,jdbcType=BIGINT} where Id = #{id,jdbcType=BIGINT}
</update> </update>
...@@ -250,7 +264,8 @@ ...@@ -250,7 +264,8 @@
update jsh_person update jsh_person
set Type = #{type,jdbcType=VARCHAR}, set Type = #{type,jdbcType=VARCHAR},
Name = #{name,jdbcType=VARCHAR}, Name = #{name,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT} tenant_id = #{tenantId,jdbcType=BIGINT},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
where Id = #{id,jdbcType=BIGINT} where Id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper_xml/RoleMapper.xml
View file @ d73781d8
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<result column="value" jdbcType="VARCHAR" property="value" /> <result column="value" jdbcType="VARCHAR" property="value" />
<result column="description" jdbcType="VARCHAR" property="description" /> <result column="description" jdbcType="VARCHAR" property="description" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -84,7 +85,7 @@ ...@@ -84,7 +85,7 @@
WARNING - @mbggenerated WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
Id, Name, type, value, description, tenant_id Id, Name, type, value, description, tenant_id, delete_Flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.RoleExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.RoleExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -138,11 +139,11 @@ ...@@ -138,11 +139,11 @@
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
insert into jsh_role (Id, Name, type, insert into jsh_role (Id, Name, type,
value, description, tenant_id value, description, tenant_id,
) delete_Flag)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
#{value,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT} #{value,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT},
) #{deleteFlag,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Role"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Role">
<!-- <!--
...@@ -169,6 +170,9 @@ ...@@ -169,6 +170,9 @@
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id, tenant_id,
</if> </if>
<if test="deleteFlag != null">
delete_Flag,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -189,6 +193,9 @@ ...@@ -189,6 +193,9 @@
<if test="tenantId != null"> <if test="tenantId != null">
#{tenantId,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT},
</if> </if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.RoleExample" resultType="java.lang.Integer"> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.RoleExample" resultType="java.lang.Integer">
...@@ -226,6 +233,9 @@ ...@@ -226,6 +233,9 @@
<if test="record.tenantId != null"> <if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if> </if>
<if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -242,7 +252,8 @@ ...@@ -242,7 +252,8 @@
type = #{record.type,jdbcType=VARCHAR}, type = #{record.type,jdbcType=VARCHAR},
value = #{record.value,jdbcType=VARCHAR}, value = #{record.value,jdbcType=VARCHAR},
description = #{record.description,jdbcType=VARCHAR}, description = #{record.description,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT} tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -269,6 +280,9 @@ ...@@ -269,6 +280,9 @@
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
</if> </if>
<if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
</set> </set>
where Id = #{id,jdbcType=BIGINT} where Id = #{id,jdbcType=BIGINT}
</update> </update>
...@@ -282,7 +296,8 @@ ...@@ -282,7 +296,8 @@
type = #{type,jdbcType=VARCHAR}, type = #{type,jdbcType=VARCHAR},
value = #{value,jdbcType=VARCHAR}, value = #{value,jdbcType=VARCHAR},
description = #{description,jdbcType=VARCHAR}, description = #{description,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT} tenant_id = #{tenantId,jdbcType=BIGINT},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
where Id = #{id,jdbcType=BIGINT} where Id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper_xml/SerialNumberMapperEx.xml
View file @ d73781d8
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
<bind name="materialName" value="'%' + _parameter.materialName + '%'" /> <bind name="materialName" value="'%' + _parameter.materialName + '%'" />
and mat.name like #{materialName} and mat.name like #{materialName}
</if> </if>
and ifnull(ser.delete_Flag,'0') !='1'
order by ser.id desc order by ser.id desc
<if test="offset != null and rows != null"> <if test="offset != null and rows != null">
limit #{offset},#{rows} limit #{offset},#{rows}
...@@ -45,6 +46,7 @@ ...@@ -45,6 +46,7 @@
<bind name="materialName" value="'%' + _parameter.materialName + '%'" /> <bind name="materialName" value="'%' + _parameter.materialName + '%'" />
and mat.name like #{materialName} and mat.name like #{materialName}
</if> </if>
and ifnull(ser.delete_Flag,'0') !='1'
order by ser.id desc order by ser.id desc
</select> </select>
<select id="findById" resultMap="SerialNumberExBaseResultMap"> <select id="findById" resultMap="SerialNumberExBaseResultMap">
...@@ -54,10 +56,11 @@ ...@@ -54,10 +56,11 @@
ur.username as updaterName,ser.depothead_Id ur.username as updaterName,ser.depothead_Id
FROM jsh_serial_number ser FROM jsh_serial_number ser
left JOIN jsh_material mat on mat.id = ser.material_Id left JOIN jsh_material mat on mat.id = ser.material_Id
left join jsh_user cr on ser.creator=cr.id left join jsh_user cr on ser.creator=cr.id and ifnull(cr.status,'0') not in('1','2')
left join jsh_user ur on ser.updater=ur.id left join jsh_user ur on ser.updater=ur.id and ifnull(ur.status,'0') not in('1','2')
where 1=1 where 1=1
and ser.id=#{id} and ser.id=#{id}
and ifnull(ser.delete_Flag,'0') !='1'
order by ser.id desc order by ser.id desc
</select> </select>
<select id="findBySerialNumber" resultMap="SerialNumberExBaseResultMap"> <select id="findBySerialNumber" resultMap="SerialNumberExBaseResultMap">
...@@ -69,6 +72,7 @@ ...@@ -69,6 +72,7 @@
<if test="serialNumber != null"> <if test="serialNumber != null">
and ser.serial_Number=#{serialNumber} and ser.serial_Number=#{serialNumber}
</if> </if>
and ifnull(ser.delete_Flag,'0') !='1'
order by ser.id desc order by ser.id desc
</select> </select>
<insert id="addSerialNumber" parameterType="com.jsh.erp.datasource.entities.SerialNumberEx" <insert id="addSerialNumber" parameterType="com.jsh.erp.datasource.entities.SerialNumberEx"
...@@ -120,7 +124,7 @@ ...@@ -120,7 +124,7 @@
<if test="materialId != null"> <if test="materialId != null">
and ser.material_Id=#{materialId} and ser.material_Id=#{materialId}
</if> </if>
and ser.delete_Flag !='1' and ifnull(ser.delete_Flag,'0') !='1'
and ser.is_Sell !='1' and ser.is_Sell !='1'
</select> </select>
<select id="countSerialNumberByMaterialIdAndDepotheadId" resultType="java.lang.Integer"> <select id="countSerialNumberByMaterialIdAndDepotheadId" resultType="java.lang.Integer">
...@@ -135,7 +139,7 @@ ...@@ -135,7 +139,7 @@
and ser.depothead_Id=#{depotheadId} and ser.depothead_Id=#{depotheadId}
</if> </if>
and ser.is_Sell =#{isSell,jdbcType=VARCHAR} and ser.is_Sell =#{isSell,jdbcType=VARCHAR}
and ser.delete_Flag !='1' and ifnull(ser.delete_Flag,'0') !='1'
</select> </select>
<update id="sellSerialNumber"> <update id="sellSerialNumber">
update jsh_serial_number update jsh_serial_number
...@@ -156,6 +160,7 @@ ...@@ -156,6 +160,7 @@
and material_Id = #{materialId} and material_Id = #{materialId}
</if> </if>
and is_Sell != '1' and is_Sell != '1'
and ifnull(delete_Flag,'0') !='1'
<if test="count != null"> <if test="count != null">
and id in and id in
( select batchSN.id from ( select batchSN.id from
...@@ -165,6 +170,7 @@ ...@@ -165,6 +170,7 @@
and selFrom.material_Id = #{materialId} and selFrom.material_Id = #{materialId}
</if> </if>
and selFrom.is_Sell != '1' and selFrom.is_Sell != '1'
and ifnull(selFrom.delete_Flag,'0') !='1'
limit 0,#{count} limit 0,#{count}
) batchSN ) batchSN
) )
...@@ -190,6 +196,7 @@ ...@@ -190,6 +196,7 @@
and depothead_Id = #{depotheadId,jdbcType=BIGINT} and depothead_Id = #{depotheadId,jdbcType=BIGINT}
</if> </if>
and is_Sell != '0' and is_Sell != '0'
and ifnull(delete_Flag,'0') !='1'
<if test="count != null"> <if test="count != null">
and id in and id in
( select batchSN.id from ( select batchSN.id from
...@@ -202,6 +209,7 @@ ...@@ -202,6 +209,7 @@
and selFrom.depothead_Id = #{depotheadId,jdbcType=BIGINT} and selFrom.depothead_Id = #{depotheadId,jdbcType=BIGINT}
</if> </if>
and selFrom.is_Sell !='0' and selFrom.is_Sell !='0'
and ifnull(selFrom.delete_Flag,'0') !='1'
limit 0,#{count} limit 0,#{count}
) batchSN ) batchSN
) )
...@@ -219,6 +227,17 @@ ...@@ -219,6 +227,17 @@
) )
</foreach> </foreach>
</insert> </insert>
<update id="batchDeleteSerialNumberByIds">
update jsh_serial_number
set update_Time=#{updateTime},updater=#{updater},delete_Flag='1'
where 1=1
and ifnull(delete_Flag,'0') !='1'
and id in (
<foreach collection="ids" item="id" separator=",">
#{id}
</foreach>
)
</update>
......
src/main/resources/mapper_xml/SupplierMapper.xml
View file @ d73781d8
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
<result column="accountNumber" jdbcType="VARCHAR" property="accountnumber" /> <result column="accountNumber" jdbcType="VARCHAR" property="accountnumber" />
<result column="taxRate" jdbcType="DECIMAL" property="taxrate" /> <result column="taxRate" jdbcType="DECIMAL" property="taxrate" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -102,7 +103,7 @@ ...@@ -102,7 +103,7 @@
--> -->
id, supplier, contacts, phonenum, email, description, isystem, type, enabled, AdvanceIn, id, supplier, contacts, phonenum, email, description, isystem, type, enabled, AdvanceIn,
BeginNeedGet, BeginNeedPay, AllNeedGet, AllNeedPay, fax, telephone, address, taxNum, BeginNeedGet, BeginNeedPay, AllNeedGet, AllNeedPay, fax, telephone, address, taxNum,
bankName, accountNumber, taxRate, tenant_id bankName, accountNumber, taxRate, tenant_id, delete_Flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SupplierExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SupplierExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -162,7 +163,7 @@ ...@@ -162,7 +163,7 @@
AllNeedGet, AllNeedPay, fax, AllNeedGet, AllNeedPay, fax,
telephone, address, taxNum, telephone, address, taxNum,
bankName, accountNumber, taxRate, bankName, accountNumber, taxRate,
tenant_id) tenant_id, delete_Flag)
values (#{id,jdbcType=BIGINT}, #{supplier,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{supplier,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR},
#{phonenum,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{phonenum,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR},
#{isystem,jdbcType=TINYINT}, #{type,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, #{isystem,jdbcType=TINYINT}, #{type,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT},
...@@ -170,7 +171,7 @@ ...@@ -170,7 +171,7 @@
#{allneedget,jdbcType=DECIMAL}, #{allneedpay,jdbcType=DECIMAL}, #{fax,jdbcType=VARCHAR}, #{allneedget,jdbcType=DECIMAL}, #{allneedpay,jdbcType=DECIMAL}, #{fax,jdbcType=VARCHAR},
#{telephone,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, #{taxnum,jdbcType=VARCHAR}, #{telephone,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, #{taxnum,jdbcType=VARCHAR},
#{bankname,jdbcType=VARCHAR}, #{accountnumber,jdbcType=VARCHAR}, #{taxrate,jdbcType=DECIMAL}, #{bankname,jdbcType=VARCHAR}, #{accountnumber,jdbcType=VARCHAR}, #{taxrate,jdbcType=DECIMAL},
#{tenantId,jdbcType=BIGINT}) #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Supplier"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Supplier">
<!-- <!--
...@@ -245,6 +246,9 @@ ...@@ -245,6 +246,9 @@
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id, tenant_id,
</if> </if>
<if test="deleteFlag != null">
delete_Flag,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -313,6 +317,9 @@ ...@@ -313,6 +317,9 @@
<if test="tenantId != null"> <if test="tenantId != null">
#{tenantId,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT},
</if> </if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.SupplierExample" resultType="java.lang.Integer"> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.SupplierExample" resultType="java.lang.Integer">
...@@ -398,6 +405,9 @@ ...@@ -398,6 +405,9 @@
<if test="record.tenantId != null"> <if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if> </if>
<if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -430,7 +440,8 @@ ...@@ -430,7 +440,8 @@
bankName = #{record.bankname,jdbcType=VARCHAR}, bankName = #{record.bankname,jdbcType=VARCHAR},
accountNumber = #{record.accountnumber,jdbcType=VARCHAR}, accountNumber = #{record.accountnumber,jdbcType=VARCHAR},
taxRate = #{record.taxrate,jdbcType=DECIMAL}, taxRate = #{record.taxrate,jdbcType=DECIMAL},
tenant_id = #{record.tenantId,jdbcType=BIGINT} tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -505,6 +516,9 @@ ...@@ -505,6 +516,9 @@
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
</if> </if>
<if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
</set> </set>
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
...@@ -534,7 +548,8 @@ ...@@ -534,7 +548,8 @@
bankName = #{bankname,jdbcType=VARCHAR}, bankName = #{bankname,jdbcType=VARCHAR},
accountNumber = #{accountnumber,jdbcType=VARCHAR}, accountNumber = #{accountnumber,jdbcType=VARCHAR},
taxRate = #{taxrate,jdbcType=DECIMAL}, taxRate = #{taxrate,jdbcType=DECIMAL},
tenant_id = #{tenantId,jdbcType=BIGINT} tenant_id = #{tenantId,jdbcType=BIGINT},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper_xml/SystemConfigMapper.xml
View file @ d73781d8
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<result column="company_fax" jdbcType="VARCHAR" property="companyFax" /> <result column="company_fax" jdbcType="VARCHAR" property="companyFax" />
<result column="company_post_code" jdbcType="VARCHAR" property="companyPostCode" /> <result column="company_post_code" jdbcType="VARCHAR" property="companyPostCode" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -87,7 +88,7 @@ ...@@ -87,7 +88,7 @@
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
id, company_name, company_contacts, company_address, company_tel, company_fax, company_post_code, id, company_name, company_contacts, company_address, company_tel, company_fax, company_post_code,
tenant_id tenant_id, delete_Flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -142,10 +143,12 @@ ...@@ -142,10 +143,12 @@
--> -->
insert into jsh_systemconfig (id, company_name, company_contacts, insert into jsh_systemconfig (id, company_name, company_contacts,
company_address, company_tel, company_fax, company_address, company_tel, company_fax,
company_post_code, tenant_id) company_post_code, tenant_id, delete_Flag
)
values (#{id,jdbcType=BIGINT}, #{companyName,jdbcType=VARCHAR}, #{companyContacts,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{companyName,jdbcType=VARCHAR}, #{companyContacts,jdbcType=VARCHAR},
#{companyAddress,jdbcType=VARCHAR}, #{companyTel,jdbcType=VARCHAR}, #{companyFax,jdbcType=VARCHAR}, #{companyAddress,jdbcType=VARCHAR}, #{companyTel,jdbcType=VARCHAR}, #{companyFax,jdbcType=VARCHAR},
#{companyPostCode,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}) #{companyPostCode,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
)
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.SystemConfig"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
<!-- <!--
...@@ -178,6 +181,9 @@ ...@@ -178,6 +181,9 @@
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id, tenant_id,
</if> </if>
<if test="deleteFlag != null">
delete_Flag,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -204,6 +210,9 @@ ...@@ -204,6 +210,9 @@
<if test="tenantId != null"> <if test="tenantId != null">
#{tenantId,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT},
</if> </if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultType="java.lang.Integer"> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultType="java.lang.Integer">
...@@ -247,6 +256,9 @@ ...@@ -247,6 +256,9 @@
<if test="record.tenantId != null"> <if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if> </if>
<if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -265,7 +277,8 @@ ...@@ -265,7 +277,8 @@
company_tel = #{record.companyTel,jdbcType=VARCHAR}, company_tel = #{record.companyTel,jdbcType=VARCHAR},
company_fax = #{record.companyFax,jdbcType=VARCHAR}, company_fax = #{record.companyFax,jdbcType=VARCHAR},
company_post_code = #{record.companyPostCode,jdbcType=VARCHAR}, company_post_code = #{record.companyPostCode,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT} tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -298,6 +311,9 @@ ...@@ -298,6 +311,9 @@
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
</if> </if>
<if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
</set> </set>
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
...@@ -313,7 +329,8 @@ ...@@ -313,7 +329,8 @@
company_tel = #{companyTel,jdbcType=VARCHAR}, company_tel = #{companyTel,jdbcType=VARCHAR},
company_fax = #{companyFax,jdbcType=VARCHAR}, company_fax = #{companyFax,jdbcType=VARCHAR},
company_post_code = #{companyPostCode,jdbcType=VARCHAR}, company_post_code = #{companyPostCode,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT} tenant_id = #{tenantId,jdbcType=BIGINT},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper_xml/UnitMapper.xml
View file @ d73781d8
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
<result column="UName" jdbcType="VARCHAR" property="uname" /> <result column="UName" jdbcType="VARCHAR" property="uname" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -81,7 +82,7 @@ ...@@ -81,7 +82,7 @@
WARNING - @mbggenerated WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
id, UName, tenant_id id, UName, tenant_id, delete_Flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.UnitExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.UnitExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -134,10 +135,10 @@ ...@@ -134,10 +135,10 @@
WARNING - @mbggenerated WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
insert into jsh_unit (id, UName, tenant_id insert into jsh_unit (id, UName, tenant_id,
) delete_Flag)
values (#{id,jdbcType=BIGINT}, #{uname,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT} values (#{id,jdbcType=BIGINT}, #{uname,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT},
) #{deleteFlag,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Unit"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Unit">
<!-- <!--
...@@ -155,6 +156,9 @@ ...@@ -155,6 +156,9 @@
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id, tenant_id,
</if> </if>
<if test="deleteFlag != null">
delete_Flag,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -166,6 +170,9 @@ ...@@ -166,6 +170,9 @@
<if test="tenantId != null"> <if test="tenantId != null">
#{tenantId,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT},
</if> </if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.UnitExample" resultType="java.lang.Integer"> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.UnitExample" resultType="java.lang.Integer">
...@@ -194,6 +201,9 @@ ...@@ -194,6 +201,9 @@
<if test="record.tenantId != null"> <if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if> </if>
<if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -207,7 +217,8 @@ ...@@ -207,7 +217,8 @@
update jsh_unit update jsh_unit
set id = #{record.id,jdbcType=BIGINT}, set id = #{record.id,jdbcType=BIGINT},
UName = #{record.uname,jdbcType=VARCHAR}, UName = #{record.uname,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT} tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -225,6 +236,9 @@ ...@@ -225,6 +236,9 @@
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
</if> </if>
<if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
</set> </set>
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
...@@ -235,7 +249,8 @@ ...@@ -235,7 +249,8 @@
--> -->
update jsh_unit update jsh_unit
set UName = #{uname,jdbcType=VARCHAR}, set UName = #{uname,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT} tenant_id = #{tenantId,jdbcType=BIGINT},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper_xml/UserBusinessMapper.xml
View file @ d73781d8
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<result column="KeyId" jdbcType="VARCHAR" property="keyid" /> <result column="KeyId" jdbcType="VARCHAR" property="keyid" />
<result column="Value" jdbcType="VARCHAR" property="value" /> <result column="Value" jdbcType="VARCHAR" property="value" />
<result column="BtnStr" jdbcType="VARCHAR" property="btnstr" /> <result column="BtnStr" jdbcType="VARCHAR" property="btnstr" />
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -83,7 +84,7 @@ ...@@ -83,7 +84,7 @@
WARNING - @mbggenerated WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
Id, Type, KeyId, Value, BtnStr Id, Type, KeyId, Value, BtnStr, delete_Flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.UserBusinessExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.UserBusinessExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -137,9 +138,11 @@ ...@@ -137,9 +138,11 @@
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
insert into jsh_userbusiness (Id, Type, KeyId, insert into jsh_userbusiness (Id, Type, KeyId,
Value, BtnStr) Value, BtnStr, delete_Flag
)
values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{keyid,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{keyid,jdbcType=VARCHAR},
#{value,jdbcType=VARCHAR}, #{btnstr,jdbcType=VARCHAR}) #{value,jdbcType=VARCHAR}, #{btnstr,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=VARCHAR}
)
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.UserBusiness"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.UserBusiness">
<!-- <!--
...@@ -163,6 +166,9 @@ ...@@ -163,6 +166,9 @@
<if test="btnstr != null"> <if test="btnstr != null">
BtnStr, BtnStr,
</if> </if>
<if test="deleteFlag != null">
delete_Flag,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -180,6 +186,9 @@ ...@@ -180,6 +186,9 @@
<if test="btnstr != null"> <if test="btnstr != null">
#{btnstr,jdbcType=VARCHAR}, #{btnstr,jdbcType=VARCHAR},
</if> </if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.UserBusinessExample" resultType="java.lang.Integer"> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.UserBusinessExample" resultType="java.lang.Integer">
...@@ -214,6 +223,9 @@ ...@@ -214,6 +223,9 @@
<if test="record.btnstr != null"> <if test="record.btnstr != null">
BtnStr = #{record.btnstr,jdbcType=VARCHAR}, BtnStr = #{record.btnstr,jdbcType=VARCHAR},
</if> </if>
<if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -229,7 +241,8 @@ ...@@ -229,7 +241,8 @@
Type = #{record.type,jdbcType=VARCHAR}, Type = #{record.type,jdbcType=VARCHAR},
KeyId = #{record.keyid,jdbcType=VARCHAR}, KeyId = #{record.keyid,jdbcType=VARCHAR},
Value = #{record.value,jdbcType=VARCHAR}, Value = #{record.value,jdbcType=VARCHAR},
BtnStr = #{record.btnstr,jdbcType=VARCHAR} BtnStr = #{record.btnstr,jdbcType=VARCHAR},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -253,6 +266,9 @@ ...@@ -253,6 +266,9 @@
<if test="btnstr != null"> <if test="btnstr != null">
BtnStr = #{btnstr,jdbcType=VARCHAR}, BtnStr = #{btnstr,jdbcType=VARCHAR},
</if> </if>
<if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
</set> </set>
where Id = #{id,jdbcType=BIGINT} where Id = #{id,jdbcType=BIGINT}
</update> </update>
...@@ -265,7 +281,8 @@ ...@@ -265,7 +281,8 @@
set Type = #{type,jdbcType=VARCHAR}, set Type = #{type,jdbcType=VARCHAR},
KeyId = #{keyid,jdbcType=VARCHAR}, KeyId = #{keyid,jdbcType=VARCHAR},
Value = #{value,jdbcType=VARCHAR}, Value = #{value,jdbcType=VARCHAR},
BtnStr = #{btnstr,jdbcType=VARCHAR} BtnStr = #{btnstr,jdbcType=VARCHAR},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
where Id = #{id,jdbcType=BIGINT} where Id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper_xml/UserMapperEx.xml
View file @ d73781d8
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
select * select *
FROM jsh_user FROM jsh_user
where 1=1 where 1=1
and status not in('1','2') and ifnull(status,'0') not in('1','2')
<if test="userName != null"> <if test="userName != null">
and username like '%${userName}%' and username like '%${userName}%'
</if> </if>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
COUNT(id) COUNT(id)
FROM jsh_user FROM jsh_user
WHERE 1=1 WHERE 1=1
and status not in('1','2') and ifnull(status,'0') not in('1','2')
<if test="userName != null"> <if test="userName != null">
and username like '%${userName}%' and username like '%${userName}%'
</if> </if>
...@@ -40,10 +40,10 @@ ...@@ -40,10 +40,10 @@
user.description, user.remark,user.isystem,org.id as orgaId,org.org_abr,rel.user_blng_orga_dspl_seq, user.description, user.remark,user.isystem,org.id as orgaId,org.org_abr,rel.user_blng_orga_dspl_seq,
rel.id as orgaUserRelId rel.id as orgaUserRelId
FROM jsh_user user FROM jsh_user user
left join jsh_orga_user_rel rel on user.id=rel.user_id and rel.delete_flag!='1' left join jsh_orga_user_rel rel on user.id=rel.user_id and ifnull(rel.delete_flag,'0') !='1'
left join jsh_organization org on rel.orga_id=org.id left join jsh_organization org on rel.orga_id=org.id and ifnull(org.org_stcd,'0') !='5'
where 1=1 where 1=1
and user.status not in('1','2') and ifnull(user.status,'0') not in('1','2')
<if test="userName != null and userName != ''"> <if test="userName != null and userName != ''">
<bind name="userName" value="'%' + _parameter.userName + '%'" /> <bind name="userName" value="'%' + _parameter.userName + '%'" />
and user.userName like #{userName} and user.userName like #{userName}
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
user.description, user.remark,user.isystem user.description, user.remark,user.isystem
FROM jsh_user user FROM jsh_user user
where 1=1 where 1=1
and user.status not in('1','2') and ifnull(user.status,'0') not in('1','2')
<if test="userName != null and userName != ''"> <if test="userName != null and userName != ''">
and user.userName = #{userName} and user.userName = #{userName}
</if> </if>
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
org.id, org.org_abr as text,org.org_no as orgNo,org.sort as sort,null as iconCls,'0' as type org.id, org.org_abr as text,org.org_no as orgNo,org.sort as sort,null as iconCls,'0' as type
FROM jsh_organization org FROM jsh_organization org
WHERE org.org_parent_no = #{orgNo} WHERE org.org_parent_no = #{orgNo}
and org.org_stcd !='5' and ifnull(org.org_stcd,'0') !='5'
union all union all
select select
user.id,user.username as text, null as orgNo,rel.user_blng_orga_dspl_seq as sort,'icon-user' as iconCls,'1' as type user.id,user.username as text, null as orgNo,rel.user_blng_orga_dspl_seq as sort,'icon-user' as iconCls,'1' as type
...@@ -170,8 +170,8 @@ ...@@ -170,8 +170,8 @@
1=1 1=1
and user.id=rel.user_id and user.id=rel.user_id
and rel.orga_id=#{orgId} and rel.orga_id=#{orgId}
and rel.delete_flag !='1' and ifnull(rel.delete_flag,'0') !='1'
and user.status not in ('1','2') and ifnull(user.status,'0') not in('1','2')
) node ) node
order by sort asc order by sort asc
</select> </select>
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
id, org_abr as text,org_no as orgNo,'0' as type id, org_abr as text,org_no as orgNo,'0' as type
FROM jsh_organization FROM jsh_organization
WHERE org_parent_no = -1 WHERE org_parent_no = -1
and org_stcd !='5' and ifnull(org_stcd,'0') !='5'
order by sort asc order by sort asc
</select> </select>
</mapper> </mapper>
\ No newline at end of file
Supports Markdown
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