大屏物资二级详情页面接口

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<MachineInfoBean> results = service.getProDataDetails(bean);
+            return AjaxResult.success(results);
+        } catch (Exception e) {
+            logger.error(e.toString(), e);
+            throw new ServiceException("数据查询异常，请联系运维人员查询日志处理");
+        }
+    }
+
     /**
      * 查询每个分类机具详情
      *

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;
 
 }

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<String> proIds;
     private List<String> projectIds;
-    private Integer proId;
+    private String proId;
     private String proName;
     private Integer typeId;
     private String typeName;

bonus-modules/bonus-material/src/main/java/com/bonus/material/push/mapper/ProDataUseInfoMapper.java

@@ -59,4 +59,6 @@ public interface ProDataUseInfoMapper {
     List<MachineInfoBean> getCompletionNotRefundedDetailsSub(ProIdsBean bean);
 
     List<TotalNumsBean> getDeviceNumByType(ProIdsBean bean);
+
+    List<MachineInfoBean> getProDataDetails(ProIdsBean bean);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/ProDataUseInfoService.java

@@ -50,4 +50,6 @@ public interface ProDataUseInfoService {
     List<MachineInfoBean> getCompletionNotRefundedDetailsSub(ProIdsBean bean);
 
     List<TotalNumsBean> getDeviceNumByType(ProIdsBean bean);
+
+    List<MachineInfoBean> getProDataDetails(ProIdsBean bean);
 }

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<MachineInfoBean> getProDataDetails(ProIdsBean bean) {
+        List<MachineInfoBean> machineDetails = proDataUseInfoMapper.getProDataDetails(bean);
+        return machineDetails;
+    }
+
     /**
      * 统计数据
      *

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
     </select>
+    <select id="getProDataDetails" resultType="com.bonus.material.push.domain.MachineInfoBean">
+        SELECT
+            ANY_VALUE(bp.pro_name) as proName,
+            mt2.type_name as typeName,
+            mt.type_name as typeModelName,
+            mt.unit_name as unit,
+            sum(sai.num) num,
+            ANY_VALUE(mt.type_id) as typeId,
+            mt2.is_statics as isStatics
+        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
+                 LEFT JOIN ma_type mt ON sai.type_id = mt.type_id
+                 LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id
+        WHERE
+            sai.is_slt = 0
+          AND sai.end_time IS NULL
+          AND bp.external_id = #{proId}
+        <if test="isStatics != null">
+            AND mt2.is_statics = #{isStatics}
+        </if>
+        GROUP BY mt.type_id
+    </select>
 </mapper>