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

代码提交

This commit is contained in:
liang.chao 2025-09-04 19:54:59 +08:00
parent 4ca2b3e091
commit 81f82e3007
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/MachineInfoBean.java
View File

@ -51,7 +51,12 @@ public class MachineInfoBean {
private String personName; private String personName;
// 联系方式 // 联系方式
private String personPhone; private String persoPhone;
private String specification;
private String materialName;
private String materialDw;
private String subKcNum;
} }

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/ProIdsBean.java
View File

@ -23,6 +23,9 @@ public class ProIdsBean {
private String proCenter; private String proCenter;
private Integer deptId; private Integer deptId;
private BigDecimal typeNum; private BigDecimal typeNum;
private String materialName;
private String specification;
/** /**
* 1 牵张设备 2 抱杆 3动力设备 4 变电专业设备 5安全工器具 6自主创新设备 7其他 * 1 牵张设备 2 抱杆 3动力设备 4 变电专业设备 5安全工器具 6自主创新设备 7其他

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/ProDataUseInfoImpl.java
View File

@ -180,7 +180,7 @@ public class ProDataUseInfoImpl implements ProDataUseInfoService {
for (MachineInfoBean machineDetail : maTypeList) { for (MachineInfoBean machineDetail : maTypeList) {
SysUser user = proDataUseInfoMapper.getPersonNameAndPhone(machineDetail); SysUser user = proDataUseInfoMapper.getPersonNameAndPhone(machineDetail);
machineDetail.setPersonName(user.getNickName()); machineDetail.setPersonName(user.getNickName());
machineDetail.setPersonPhone(user.getPhonenumber()); machineDetail.setPersoPhone(user.getPhonenumber());
} }
return maTypeList; return maTypeList;
} }

23
bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
View File

@ -76,7 +76,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ELSE ELSE
IFNULL(mt.storage_num, 0) + IFNULL(subquery1.usNum, 0) + IFNULL(subquery2.repairNum, 0) IFNULL(mt.storage_num, 0) + IFNULL(subquery1.usNum, 0) + IFNULL(subquery2.repairNum, 0)
END AS inventoryNum, END AS inventoryNum,
subquery1.unitName AS unitName,
mt2.is_statics AS isStatics mt2.is_statics AS isStatics
FROM ma_type mt FROM ma_type mt
LEFT JOIN ( LEFT JOIN (
@ -174,7 +173,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ma_type mt2 on mt2.type_id = mt.parent_id LEFT JOIN ma_type mt2 on mt2.type_id = mt.parent_id
LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
WHERE mt.del_flag = '0' and mt.`level` = '4' WHERE mt.del_flag = '0' and mt.`level` = '4' and mt2.is_statics is not null
<if test="isStatics != null"> <if test="isStatics != null">
and mt2.is_statics = #{isStatics} and mt2.is_statics = #{isStatics}
</if> </if>
@ -289,7 +288,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mt.type_name as typeModelName, mt.type_name as typeModelName,
mt.unit_name as unit, mt.unit_name as unit,
mt2.type_name as typeName, mt2.type_name as typeName,
sd.dept_name as deptName sd.dept_name as deptName,
sd.pro_center as proCenter
from slt_agreement_info sai from 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
left join bm_project bp on bai.project_id = bp.pro_id left join bm_project bp on bai.project_id = bp.pro_id
@ -361,21 +361,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getMaTypeList" resultType="com.bonus.material.push.domain.MachineInfoBean"> <select id="getMaTypeList" resultType="com.bonus.material.push.domain.MachineInfoBean">
SELECT SELECT
mt.type_id AS typeId, mt.type_id AS typeId,
mt.type_name AS typeModelName, mt.type_name AS specification,
mt2.type_name AS typeName, mt2.type_name AS materialName,
mt.unit_name AS unit, mt.unit_name AS materialDw,
mt.storage_num AS num mt.storage_num AS subKcNum
FROM FROM
ma_type mt ma_type mt
LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id
WHERE WHERE
mt.del_flag = 0 mt.del_flag = 0
AND mt.`level` =4 AND mt.`level` =4
<if test="typeName != null and typeName !=''"> <if test="materialName != null and materialName !=''">
AND mt2.type_name like concat ('%', #{typeName}, '%') AND mt2.type_name like concat ('%', #{materialName}, '%')
</if> </if>
<if test="typeModelName != null and typeModelName !=''"> <if test="specification != null and specification !=''">
AND mt.type_name like concat ('%', #{typeModelName}, '%') AND mt.type_name like concat ('%', #{specification}, '%')
</if> </if>
</select> </select>
<select id="getUseNumsDetails" resultType="com.bonus.material.push.domain.MachineInfoBean"> <select id="getUseNumsDetails" resultType="com.bonus.material.push.domain.MachineInfoBean">
@ -651,6 +651,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sai.num num, sai.num num,
mt.type_name as typeModelName, mt.type_name as typeModelName,
mt.unit_name as unit, mt.unit_name as unit,
sd.dept_name,
mt2.type_name as typeName mt2.type_name as typeName
from slt_agreement_info sai from 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