From a1128af03b33bb562ae445c7facb8847c97ee150 Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Fri, 17 Oct 2025 11:00:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=89=A9=E8=B5=84=E4=BA=8C?= =?UTF-8?q?=E7=BA=A7=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PushProDataUseInfoController.java | 18 +++++++++++++++ .../material/push/domain/MachineInfoBean.java | 4 ++++ .../material/push/domain/ProIdsBean.java | 2 +- .../push/mapper/ProDataUseInfoMapper.java | 2 ++ .../push/service/ProDataUseInfoService.java | 2 ++ .../push/service/impl/ProDataUseInfoImpl.java | 6 +++++ .../material/push/ProDataUseInfoMapper.xml | 23 +++++++++++++++++++ 7 files changed, 56 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java index 23335871..b36e7be1 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java @@ -50,6 +50,24 @@ public class PushProDataUseInfoController extends BaseController { } } + /** + * 查询推送数据详情二级页面 + * + * @param bean + * @return + */ + + @PostMapping(value = "getProDataDetails") + public AjaxResult getProDataDetails(@RequestBody ProIdsBean bean) { + try { + List results = service.getProDataDetails(bean); + return AjaxResult.success(results); + } catch (Exception e) { + logger.error(e.toString(), e); + throw new ServiceException("数据查询异常，请联系运维人员查询日志处理"); + } + } + /** * 查询每个分类机具详情 * 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 03d12e39..92ad764f 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 @@ -58,5 +58,9 @@ public class MachineInfoBean { private String materialDw; private String subKcNum; + /** + * 1 牵张设备 2 抱杆 3动力设备 4 变电专业设备 5安全工器具 6自主创新设备 7其他 + */ + private Integer isStatics; } 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 60178d39..bd955432 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 @@ -14,7 +14,7 @@ import java.util.List; public class ProIdsBean { private List proIds; private List projectIds; - private Integer proId; + private String proId; private String proName; private Integer typeId; private String typeName; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/mapper/ProDataUseInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/mapper/ProDataUseInfoMapper.java index 8f52d6ca..16f701e4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/mapper/ProDataUseInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/mapper/ProDataUseInfoMapper.java @@ -59,4 +59,6 @@ public interface ProDataUseInfoMapper { List getCompletionNotRefundedDetailsSub(ProIdsBean bean); List getDeviceNumByType(ProIdsBean bean); + + List getProDataDetails(ProIdsBean bean); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/ProDataUseInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/ProDataUseInfoService.java index 1ae21d68..511f5f17 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/ProDataUseInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/ProDataUseInfoService.java @@ -50,4 +50,6 @@ public interface ProDataUseInfoService { List getCompletionNotRefundedDetailsSub(ProIdsBean bean); List getDeviceNumByType(ProIdsBean bean); + + List getProDataDetails(ProIdsBean bean); } 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 8832bf2b..eef04adf 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 @@ -46,6 +46,12 @@ public class ProDataUseInfoImpl implements ProDataUseInfoService { return machineDetails; } + @Override + public List getProDataDetails(ProIdsBean bean) { + List machineDetails = proDataUseInfoMapper.getProDataDetails(bean); + return machineDetails; + } + /** * 统计数据 * 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 f8413634..b45c459e 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 @@ -1275,4 +1275,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY res.typeName +