bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修改

This commit is contained in:
hayu 2025-06-17 18:14:52 +08:00
parent 47da7e4756
commit d8c7b812d8
5 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmQrBoxController.java
View File

@ -65,13 +65,13 @@ public class BmQrBoxController extends BaseController {
/**
* APP -- 查询二维码标准箱绑定列表 -- 不分页
* @param boxId 标准箱ID
* @param
*/
@ApiOperation(value = "APP -- 查询二维码标准箱绑定列表")
//@RequiresPermissions("basic:qrBox:list")
@GetMapping("/app_box_bind_list")
public AjaxResult getBoxBindList(Long boxId) {
return AjaxResult.success(getDataTable(qrBoxService.getBoxBindList(boxId)));
public AjaxResult getBoxBindList(BmQrBoxInfo bean) {
return AjaxResult.success(getDataTable(qrBoxService.getBoxBindList(bean)));
}
/**

5
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmQrBoxMapper.java
View File

@ -95,6 +95,11 @@ public interface BmQrBoxMapper {
*/
List<BmQrBoxInfo> getBoxBindList(Long boxId);
/**
* 根据二维码标准箱编码查询绑定详情
*/
List<BmQrBoxInfo> getBoxBindLists(BmQrBoxInfo bean);
/**
* 根据二维码标准箱编码查询绑定详情
* @param bmQrBoxInfo

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/BmQrBoxService.java
View File

@ -80,7 +80,7 @@ public interface BmQrBoxService {
/**
* APP - 获取绑定物资列表
*/
List<BmQrBoxInfo> getBoxBindList(Long boxId);
List<BmQrBoxInfo> getBoxBindList(BmQrBoxInfo bean);
/**
* 删除二维码标准箱管理

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java
View File

@ -472,11 +472,11 @@ public class BmQrBoxServiceImpl implements BmQrBoxService {
/**
* 获取绑定物资列表
*
* @param boxId 标准箱ID
* @param bean
*/
@Override
public List<BmQrBoxInfo> getBoxBindList(Long boxId) {
return bmQrBoxMapper.getBoxBindList(boxId);
public List<BmQrBoxInfo> getBoxBindList(BmQrBoxInfo bean) {
return bmQrBoxMapper.getBoxBindLists(bean);
}
/**

33
bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml
View File

@ -186,13 +186,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getBoxBindList" resultType="com.bonus.material.basic.domain.BmQrBoxInfo">
SELECT
qb.id as id, qb.box_id as boxId, qb.create_by as createBy, qb.create_time,
mt1.type_name as typeName,
mt.type_name as typeModelName,
mm.ma_id as maId,mm.ma_code as maCode,mm.type_id as maTypeId,
sdd.dict_label as maStatus
qb.id as id, qb.box_id as boxId, qb.create_by as createBy, qb.create_time,
mt1.type_name as typeName,
mt.type_name as typeModelName,
mm.ma_id as maId,mm.ma_code as maCode,mm.type_id as maTypeId,
sdd.dict_label as maStatus
FROM
bm_qrcode_box_bind qb
bm_qrcode_box_bind qb
LEFT JOIN ma_machine mm ON qb.ma_id = mm.ma_id
LEFT JOIN sys_dict_data sdd ON sdd.dict_type = 'ma_machine_status' and sdd.dict_value = mm.ma_status
LEFT JOIN ma_type mt ON mm.type_id = mt.type_id AND mt.del_flag = '0'
@ -202,6 +202,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="getBoxBindLists" resultType="com.bonus.material.basic.domain.BmQrBoxInfo">
SELECT
qb.id as id, qb.box_id as boxId, qb.create_by as createBy, qb.create_time,
mt1.type_name as typeName,
mt.type_name as typeModelName,
mm.ma_id as maId,mm.ma_code as maCode,mm.type_id as maTypeId,
sdd.dict_label as maStatus
FROM
bm_qrcode_box_bind qb
LEFT JOIN ma_machine mm ON qb.ma_id = mm.ma_id
LEFT JOIN sys_dict_data sdd ON sdd.dict_type = 'ma_machine_status' and sdd.dict_value = mm.ma_status
LEFT JOIN ma_type mt ON mm.type_id = mt.type_id AND mt.del_flag = '0'
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id AND mt1.del_flag = '0'
<where>
qb.box_id = #{boxId}
<if test="keyWord != null and keyWord !=''">
and mm.ma_code LIKE concat('%',#{keyWord},'%')
</if>
</where>
</select>
<select id="getBoxBindListByCode" resultType="com.bonus.material.basic.domain.BmQrBoxInfo">
SELECT qb.id as id,
qb.box_id as boxId,