diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/MachineInfoBean.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/MachineInfoBean.java
index 66803c40..03d12e39 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/MachineInfoBean.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/MachineInfoBean.java
@@ -51,7 +51,12 @@ public class MachineInfoBean {
private String personName;
// 联系方式
- private String personPhone;
+ private String persoPhone;
+
+ private String specification;
+ private String materialName;
+ private String materialDw;
+ private String subKcNum;
}
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/ProIdsBean.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/ProIdsBean.java
index 91f9ba30..fba3cf96 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/ProIdsBean.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/ProIdsBean.java
@@ -23,6 +23,9 @@ public class ProIdsBean {
private String proCenter;
private Integer deptId;
private BigDecimal typeNum;
+ private String materialName;
+
+ private String specification;
/**
* 1 牵张设备 2 抱杆 3动力设备 4 变电专业设备 5安全工器具 6自主创新设备 7其他
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/ProDataUseInfoImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/ProDataUseInfoImpl.java
index 8eadba95..a2da1fdf 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/ProDataUseInfoImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/ProDataUseInfoImpl.java
@@ -180,7 +180,7 @@ public class ProDataUseInfoImpl implements ProDataUseInfoService {
for (MachineInfoBean machineDetail : maTypeList) {
SysUser user = proDataUseInfoMapper.getPersonNameAndPhone(machineDetail);
machineDetail.setPersonName(user.getNickName());
- machineDetail.setPersonPhone(user.getPhonenumber());
+ machineDetail.setPersoPhone(user.getPhonenumber());
}
return maTypeList;
}
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
index 845c4838..82982904 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
@@ -76,7 +76,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ELSE
IFNULL(mt.storage_num, 0) + IFNULL(subquery1.usNum, 0) + IFNULL(subquery2.repairNum, 0)
END AS inventoryNum,
- subquery1.unitName AS unitName,
mt2.is_statics AS isStatics
FROM ma_type mt
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 mt3 ON mt3.type_id = mt2.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
and mt2.is_statics = #{isStatics}
@@ -289,7 +288,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mt.type_name as typeModelName,
mt.unit_name as unit,
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
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
@@ -361,21 +361,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"