卡片用户昵称
This commit is contained in:
parent
ed916c4d76
commit
c53ef6bbbe
|
|
@ -32,6 +32,10 @@ public class AccCardHis extends BaseEntity {
|
|||
@ApiModelProperty(value = "人员id")
|
||||
private Long userId;
|
||||
|
||||
/** 人员姓名 */
|
||||
@ApiModelProperty(value = "人员姓名")
|
||||
private String nickName;
|
||||
|
||||
/** 卡号 */
|
||||
@Excel(name = "卡号")
|
||||
@ApiModelProperty(value = "卡号")
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="id" column="id" />
|
||||
<result property="accId" column="acc_id" />
|
||||
<result property="userId" column="user_id" />
|
||||
<result property="nickName" column="nick_name" />
|
||||
<result property="cardNum" column="card_num" />
|
||||
<result property="serialNum" column="serial_num" />
|
||||
<result property="cardType" column="card_type" />
|
||||
|
|
@ -25,30 +26,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</resultMap>
|
||||
|
||||
<sql id="selectAccCardHisVo">
|
||||
select id, acc_id, user_id, card_num, serial_num, card_type, record_type, deposit, product_cost, pay_type, pay_channel, remark, card_face_num, revision, create_by, create_time, update_by, update_time from acc_card_his
|
||||
select ach.id, ach.acc_id, ach.user_id, ach.card_num, ach.serial_num, ach.card_type, ach.record_type, ach.deposit,
|
||||
ach.product_cost, ach.pay_type, ach.pay_channel, ach.remark, ach.card_face_num, ach.revision, ach.create_by,
|
||||
ach.create_time, ach.update_by, ach.update_time, su.nick_name
|
||||
from acc_card_his ach
|
||||
left join sys_user su on su.user_id = ach.user_id
|
||||
</sql>
|
||||
|
||||
<select id="selectAccCardHisList" parameterType="com.bonus.canteen.core.account.domain.AccCardHis" resultMap="AccCardHisResult">
|
||||
<include refid="selectAccCardHisVo"/>
|
||||
<where>
|
||||
<if test="accId != null "> and acc_id = #{accId}</if>
|
||||
<if test="userId != null "> and user_id = #{userId}</if>
|
||||
<if test="cardNum != null and cardNum != ''"> and card_num = #{cardNum}</if>
|
||||
<if test="serialNum != null and serialNum != ''"> and serial_num = #{serialNum}</if>
|
||||
<if test="cardType != null "> and card_type = #{cardType}</if>
|
||||
<if test="recordType != null "> and record_type = #{recordType}</if>
|
||||
<if test="deposit != null "> and deposit = #{deposit}</if>
|
||||
<if test="productCost != null "> and product_cost = #{productCost}</if>
|
||||
<if test="payType != null "> and pay_type = #{payType}</if>
|
||||
<if test="payChannel != null "> and pay_channel = #{payChannel}</if>
|
||||
<if test="cardFaceNum != null and cardFaceNum != ''"> and card_face_num = #{cardFaceNum}</if>
|
||||
<if test="revision != null "> and revision = #{revision}</if>
|
||||
<if test="accId != null "> and ach.acc_id = #{accId}</if>
|
||||
<if test="userId != null "> and ach.user_id = #{userId}</if>
|
||||
<if test="cardNum != null and cardNum != ''"> and ach.card_num = #{cardNum}</if>
|
||||
<if test="serialNum != null and serialNum != ''"> and ach.serial_num = #{serialNum}</if>
|
||||
<if test="cardType != null "> and ach.card_type = #{cardType}</if>
|
||||
<if test="recordType != null "> and ach.record_type = #{recordType}</if>
|
||||
<if test="deposit != null "> and ach.deposit = #{deposit}</if>
|
||||
<if test="productCost != null "> and ach.product_cost = #{productCost}</if>
|
||||
<if test="payType != null "> and ach.pay_type = #{payType}</if>
|
||||
<if test="payChannel != null "> and ach.pay_channel = #{payChannel}</if>
|
||||
<if test="cardFaceNum != null and cardFaceNum != ''"> and ach.card_face_num = #{cardFaceNum}</if>
|
||||
<if test="revision != null "> and ach.revision = #{revision}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectAccCardHisById" parameterType="Long" resultMap="AccCardHisResult">
|
||||
<include refid="selectAccCardHisVo"/>
|
||||
where id = #{id}
|
||||
where ach.id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertAccCardHis" parameterType="com.bonus.canteen.core.account.domain.AccCardHis" useGeneratedKeys="true" keyProperty="id">
|
||||
|
|
|
|||
Loading…
Reference in New Issue