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

Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material

This commit is contained in:
hongchao 2026-01-26 16:27:12 +08:00
parent a3158e6bb3 e70b9061d3
commit d3eb48c38b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
View File

@ -769,7 +769,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
if (!hasSpecialRole) { if (!hasSpecialRole) {
leaseApplyInfo.setUserId(SecurityUtils.getLoginUser().getUserid()); leaseApplyInfo.setUserId(SecurityUtils.getLoginUser().getUserid());
}*/ }*/
leaseApplyInfo.setUserId(SecurityUtils.getLoginUser().getUserid()); // leaseApplyInfo.setUserId(SecurityUtils.getLoginUser().getUserid());
//用leaseApplyInfo.getQueryType的值来区分是否是领用出库查询，如果是，时间筛选为发布时间 //用leaseApplyInfo.getQueryType的值来区分是否是领用出库查询，如果是，时间筛选为发布时间
List<LeaseApplyInfo> list = leaseApplyInfoMapper.selectLeaseApplyInfoList(leaseApplyInfo); List<LeaseApplyInfo> list = leaseApplyInfoMapper.selectLeaseApplyInfoList(leaseApplyInfo);
// 如果statusList包含3、4、5，则为领料出库查询 // 如果statusList包含3、4、5，则为领料出库查询

4
bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
View File

@ -776,10 +776,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
END AS status, END AS status,
bp.pro_id AS proId, bp.pro_id AS proId,
bp.pro_name AS proName, bp.pro_name AS proName,
bu.unit_name AS teamName, IF(csi.`status` = 0,bu.unit_name,"") AS teamName,
bu.bzz_idcard AS idCard, bu.bzz_idcard AS idCard,
mm.qr_code AS qrCode, mm.qr_code AS qrCode,
bz.ssfbdw AS subUnitName IF(csi.`status` = 0,bz.ssfbdw,"") AS subUnitName
FROM FROM
slt_agreement_info sai slt_agreement_info sai
LEFT JOIN bm_agreement_info bai ON sai.agreement_id = bai.agreement_id LEFT JOIN bm_agreement_info bai ON sai.agreement_id = bai.agreement_id