haozq
/
lj-zhgd-ht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

This commit is contained in:
jjLv 2024-08-30 18:17:25 +08:00
parent fb7a51163c
commit 1683f83994
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/ShboxVo.java
View File

@ -52,6 +52,7 @@ public class ShboxVo
/** 手环箱容量 */
@Excel(name = "手环箱容量")
private Integer shboxCapacity;
/** 已绑手环数量 */

36
bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BraceletMapper.xml
View File

@ -28,9 +28,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join tb_people tpe on tb.bid_id=tpe.id and tb.peopel_type=0
left join tb_ls_user tlu on tb.bid_id=tlu.id and tb.peopel_type=1
where tb.del_flag = 0
<if test="shPersonName != null and shPersonName!=''">
AND (tpe.name=#{shPersonName} or tlu.name=#{shPersonName})
</if>
<!-- <if test="shPersonName != null and shPersonName!=''">-->
<!-- AND (tpe.name=#{shPersonName} or tlu.name=#{shPersonName})-->
<!-- </if>-->
) a
<where>
<if test="shCode != null and shCode!=''">
@ -45,16 +45,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="shStatus != null">
AND a.shStatus = #{shStatus}
</if>
<if test="shPersonName != null and shPersonName!=''">
AND INSTR(a.shPersonName,#{shPersonName}) >0
</if>
</where>
order by a.shId ASC
</select>
<!--手环箱绑定手环列表-->
<select id="getShBindLists" resultType="com.bonus.common.entity.bracelet.vo.BraceletVo">
select * from (
select tb.id as shId,tb.sh_code as shCode,
case
WHEN tb.peopel_type=0 then tpe.name
WHEN tb.peopel_type=1 then tlu.name
WHEN tb.peopel_type=0 then tpe.name
WHEN tb.peopel_type=1 then tlu.name
ELSE ''
END AS shPersonName,
tb.peopel_type as shPersonType,tb.bid_id as shPersonId
@ -62,13 +66,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join tb_people tpe on tb.bid_id=tpe.id and tb.peopel_type=0
left join tb_ls_user tlu on tb.bid_id=tlu.id and tb.peopel_type=1
where tb.del_flag = 0 and tb.box_id = #{shboxId}
<if test="shCode != null and shCode!=''">
AND INSTR(tb.sh_code,#{shCode}) > 0
</if>
<if test="shPersonName != null and shPersonName!=''">
AND (tpe.name=#{shPersonName} or tlu.name=#{shPersonName})
</if>
order by tb.id ASC
) a
<where>
<if test="shCode != null and shCode!=''">
AND INSTR(a.shCode,#{shCode}) > 0
</if>
<if test="shPersonName != null and shPersonName!=''">
AND INSTR(a.shPersonName,#{shPersonName}) > 0
</if>
</where>
order by a.shId ASC
</select>
<!--未绑定手环列表-->
@ -350,9 +357,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!--根据手环箱id获得详细信息-->
<select id="selectBoxById" parameterType="int" resultType="com.bonus.common.entity.bracelet.vo.ShboxVo">
select tsb.id as shboxId,tsb.box_code as shboxCode,tsb.box_name as shboxName,tsb.box_capacity as shboxCapacity
select tsb.id as shboxId,tsb.box_code as shboxCode,tsb.box_name as shboxName,tsb.box_capacity as shboxCapacity,count(tb.id) as shboxBindNum
from tb_sh_box tsb
where id = #{shboxId} and del_flag = 0
left join tb_bracelet tb on tsb.id = tb.box_id and tb.del_flag = 0
where tsb.id = #{shboxId} and tsb.del_flag = 0
</select>
<!--根据手环箱id获得刷新详细信息-->