fix: 系统功能升级,账户增加status字段,修改相关功能。
This commit is contained in:
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="ratePlus" column="rate_plus" />
|
||||
<result property="bankName" column="bank_name" />
|
||||
<result property="bankCode" column="bank_code" />
|
||||
|
||||
<result property="status" column="status" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectPosMachineVo">
|
||||
@@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
a.merchant_type,
|
||||
a.merchant_code,
|
||||
a.activation_date,
|
||||
a.status,
|
||||
bc."name" as bank_name,
|
||||
bc.code as bank_code
|
||||
from
|
||||
@@ -63,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
a.del_flag='0'
|
||||
<if test="name != null and name != ''"> and a.name like '%'|| #{name}||'%'</if>
|
||||
<if test="type != null and type != ''"> and a.type = #{type}</if>
|
||||
<if test="status != null and status != ''"> and a.status = #{status}</if>
|
||||
<if test="merchantName != null and merchantName != ''"> and a.merchant_name like '%'|| #{merchantName}||'%'</if>
|
||||
</where>
|
||||
<!-- 数据范围过滤 -->
|
||||
@@ -97,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="merchantType != null">merchant_type,</if>
|
||||
<if test="merchantCode != null">merchant_code,</if>
|
||||
<if test="activationDate != null">activation_date,</if>
|
||||
<if test="status != null">status,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">#{id},</if>
|
||||
@@ -118,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="merchantType != null">#{merchantType},</if>
|
||||
<if test="merchantCode != null">#{merchantCode},</if>
|
||||
<if test="activationDate != null">#{activationDate},</if>
|
||||
<if test="status != null">#{status},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
@@ -142,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="merchantType != null">merchant_type = #{merchantType},</if>
|
||||
<if test="merchantCode != null">merchant_code = #{merchantCode},</if>
|
||||
<if test="activationDate != null">activation_date = #{activationDate},</if>
|
||||
<if test="status != null">status = #{status},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
Reference in New Issue
Block a user