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

大屏二级接口修改

This commit is contained in:
hongchao 2025-10-17 16:30:19 +08:00
parent f99abf6cf4
commit 8bc69b7139
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java
View File

@ -58,10 +58,10 @@ public class PushProDataUseInfoController extends BaseController {
*/
@PostMapping(value = "getProDataDetails")
public AjaxResult getProDataDetails(@RequestBody ProIdsBean bean) {
public TableDataInfo getProDataDetails(@RequestBody ProIdsBean bean) {
try {
List<MachineInfoBean> results = service.getProDataDetails(bean);
return AjaxResult.success(results);
return getDataTable(results);
} catch (Exception e) {
logger.error(e.toString(), e);
throw new ServiceException("数据查询异常，请联系运维人员查询日志处理");

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

@ -63,4 +63,7 @@ public class MachineInfoBean {
*/
private Integer isStatics;
//租赁价格
private String leasePrice;
}

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

@ -49,6 +49,10 @@ public class ProDataUseInfoImpl implements ProDataUseInfoService {
@Override
public List<MachineInfoBean> getProDataDetails(ProIdsBean bean) {
List<MachineInfoBean> machineDetails = proDataUseInfoMapper.getProDataDetails(bean);
for (MachineInfoBean machineDetail : machineDetails) {
String typeKeeperName = proDataUseInfoMapper.getTypeKeeperName(machineDetail);
machineDetail.setTypeKeeperName(typeKeeperName);
}
return machineDetails;
}

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

@ -1282,6 +1282,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mt.type_name as typeModelName,
mt.unit_name as unit,
sum(sai.num) num,
mt.lease_price as leasePrice,
ANY_VALUE(mt.type_id) as typeId,
mt2.is_statics as isStatics
FROM slt_agreement_info sai
@ -1296,6 +1297,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isStatics != null">
AND mt2.is_statics = #{isStatics}
</if>
<if test="typeName != null and typeName !=''">
AND mt2.type_name like concat ('%', #{typeName}, '%')
</if>
<if test="typeModelName != null and typeModelName !=''">
AND mt.type_name like concat ('%', #{typeModelName}, '%')
</if>
GROUP BY mt.type_id
</select>
</mapper>