Browse Source

后勤接口修改

zhanghao 2 months ago
parent
commit
a5d0937294

+ 75 - 5
project-zcustom/src/main/java/com/project/zcustom/service/logistics/impl/LargePlatAssetServiceImpl.java

@@ -1,5 +1,6 @@
 package com.project.zcustom.service.logistics.impl;
 
+import com.project.zcustom.domain.addional.LargeAssetDirs;
 import com.project.zcustom.domain.addional.LargeLogistics;
 import com.project.zcustom.mapper.logistics.PlatLogisticsMapper;
 import com.project.zcustom.service.logistics.ILargePlatAssetService;
@@ -19,22 +20,91 @@ public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
     private PlatLogisticsMapper platLogisticsMapper;
     public LargeLogistics getBuildingAssetRate(String appOrg){
         LargeLogistics largeLogistics = new LargeLogistics();
-        largeLogistics.setBuildingAssetList(platLogisticsMapper.getBuildingAssetRate(appOrg));
+        List<LargeAssetDirs> list1 = platLogisticsMapper.getBuildingAssetRate(appOrg);
+        if (list1.size() > 0){
+            largeLogistics.setBuildingAssetList(list1);
+        }
+        else {
+            List<LargeAssetDirs> list2 = new ArrayList<>();
+            LargeAssetDirs largeAssetDirs1 = new LargeAssetDirs();
+            LargeAssetDirs largeAssetDirs2 = new LargeAssetDirs();
+            LargeAssetDirs largeAssetDirs3 = new LargeAssetDirs();
+            LargeAssetDirs largeAssetDirs4 = new LargeAssetDirs();
+            LargeAssetDirs largeAssetDirs5 = new LargeAssetDirs();
+            LargeAssetDirs largeAssetDirs6 = new LargeAssetDirs();
+            LargeAssetDirs largeAssetDirs7 = new LargeAssetDirs();
+            largeAssetDirs1.setAssetNum(0L);
+            largeAssetDirs2.setAssetNum(0L);
+            largeAssetDirs3.setAssetNum(0L);
+            largeAssetDirs4.setAssetNum(0L);
+            largeAssetDirs5.setAssetNum(0L);
+            largeAssetDirs6.setAssetNum(0L);
+            largeAssetDirs7.setAssetNum(0L);
+            largeAssetDirs1.setCategoryName("电梯");
+            largeAssetDirs2.setCategoryName("电气");
+            largeAssetDirs3.setCategoryName("空调通风");
+            largeAssetDirs4.setCategoryName("供热采暖");
+            largeAssetDirs5.setCategoryName("消防");
+            largeAssetDirs6.setCategoryName("给排水");
+            largeAssetDirs7.setCategoryName("楼宇智能化");
+            list2.add(largeAssetDirs1);
+            list2.add(largeAssetDirs2);
+            list2.add(largeAssetDirs3);
+            list2.add(largeAssetDirs4);
+            list2.add(largeAssetDirs5);
+            list2.add(largeAssetDirs6);
+            list2.add(largeAssetDirs7);
+            largeLogistics.setBuildingAssetList(list2);
+        }
         largeLogistics.setBuildingAssetNum(platLogisticsMapper.getBuildingAssetNum(appOrg));
         return largeLogistics;
     }
 
     public LargeLogistics getServiceAssetRate(String appOrg){
         LargeLogistics largeLogistics = new LargeLogistics();
-        largeLogistics.setServiceAssetList(platLogisticsMapper.getServiceAssetRate(appOrg));
-        largeLogistics.setBuildingAssetNum(platLogisticsMapper.getServiceAssetNum(appOrg));
+        List<LargeAssetDirs> list1 = platLogisticsMapper.getServiceAssetRate(appOrg);
+        if (list1.size() > 0){
+            largeLogistics.setServiceAssetList(list1);
+        }
+        else {
+            List<LargeAssetDirs> list2 = new ArrayList<>();
+            LargeAssetDirs largeAssetDirs1 = new LargeAssetDirs();
+            LargeAssetDirs largeAssetDirs2 = new LargeAssetDirs();
+            largeAssetDirs1.setAssetNum(0L);
+            largeAssetDirs2.setAssetNum(0L);
+            largeAssetDirs1.setCategoryName("物业设备");
+            largeAssetDirs2.setCategoryName("食堂设备");
+            list2.add(largeAssetDirs1);
+            list2.add(largeAssetDirs2);
+            largeLogistics.setServiceAssetList(list2);
+        }
+        largeLogistics.setServiceAssetNum(platLogisticsMapper.getServiceAssetNum(appOrg));
         return largeLogistics;
     }
 
     public LargeLogistics getOfficeAssetRate(String appOrg){
         LargeLogistics largeLogistics = new LargeLogistics();
-        largeLogistics.setServiceAssetList(platLogisticsMapper.getOfficeAssetRate(appOrg));
-        largeLogistics.setBuildingAssetNum(platLogisticsMapper.getOfficeAssetNum(appOrg));
+        List<LargeAssetDirs> list1 = platLogisticsMapper.getOfficeAssetRate(appOrg);
+        if (list1.size() > 0){
+            largeLogistics.setOfficeAssetList(list1);
+        }
+        else {
+            List<LargeAssetDirs> list2 = new ArrayList<>();
+            LargeAssetDirs largeAssetDirs1 = new LargeAssetDirs();
+            LargeAssetDirs largeAssetDirs2 = new LargeAssetDirs();
+            LargeAssetDirs largeAssetDirs3 = new LargeAssetDirs();
+            largeAssetDirs1.setAssetNum(0L);
+            largeAssetDirs2.setAssetNum(0L);
+            largeAssetDirs3.setAssetNum(0L);
+            largeAssetDirs1.setCategoryName("普通低值易耗品");
+            largeAssetDirs2.setCategoryName("重点低值易耗品");
+            largeAssetDirs3.setCategoryName("办公固定资产");
+            list2.add(largeAssetDirs1);
+            list2.add(largeAssetDirs2);
+            list2.add(largeAssetDirs3);
+            largeLogistics.setOfficeAssetList(list2);
+        }
+        largeLogistics.setOfficeAssetNum(platLogisticsMapper.getOfficeAssetNum(appOrg));
         return largeLogistics;
     }
 

+ 25 - 25
project-zcustom/src/main/resources/mapper/zcustom/logistics/PlatLogisticsMapper.xml

@@ -148,13 +148,14 @@
 
     <select id="getBuildingAssetRate" parameterType="String" resultMap="LargePlatAssetDirsResult">
         SELECT
-            a.category_name,
-            a.asset_num
+        a.category_name,
+        SUM( a.asset_num ) AS asset_num
         FROM
-            large_plat_logistics_building_asset a
-                LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
-        WHERE
-            b.app_org = #{appOrg}
+        large_plat_logistics_building_asset a
+        LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
+        <if test="appOrg != '0000'">WHERE b.app_org = #{appOrg}</if>
+        GROUP BY
+        a.category_name
     </select>
 
     <select id="getBuildingAssetNum" parameterType="String" resultType="Long">
@@ -163,19 +164,19 @@
         FROM
             large_plat_logistics a
                 LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
-        WHERE
-            b.app_org = #{appOrg}
+        <if test="appOrg != '0000'">WHERE b.app_org = #{appOrg}</if>
     </select>
 
     <select id="getServiceAssetRate" parameterType="String" resultMap="LargePlatAssetDirsResult">
         SELECT
-            a.category_name,
-            a.asset_num
+        a.category_name,
+        SUM( a.asset_num ) AS asset_num
         FROM
-            large_plat_logistics_service_asset a
-                LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
-        WHERE
-            b.app_org = #{appOrg}
+        large_plat_logistics_service_asset a
+        LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
+        <if test="appOrg != '0000'">WHERE b.app_org = #{appOrg}</if>
+        GROUP BY
+        a.category_name
     </select>
 
     <select id="getServiceAssetNum" parameterType="String" resultType="Long">
@@ -184,29 +185,28 @@
         FROM
             large_plat_logistics a
                 LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
-        WHERE
-            b.app_org = #{appOrg}
+        <if test="appOrg != '0000'">WHERE b.app_org = #{appOrg}</if>
     </select>
 
     <select id="getOfficeAssetRate" parameterType="String" resultMap="LargePlatAssetDirsResult">
         SELECT
-            a.category_name,
-            a.asset_num
+        a.category_name,
+        SUM( a.asset_num ) AS asset_num
         FROM
-            large_plat_logistics_office_asset a
-                LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
-        WHERE
-            b.app_org = #{appOrg}
+        large_plat_logistics_office_asset a
+        LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
+        <if test="appOrg != '0000'">WHERE b.app_org = #{appOrg}</if>
+        GROUP BY
+        a.category_name
     </select>
 
     <select id="getOfficeAssetNum" parameterType="String" resultType="Long">
         SELECT
-            office_asset_num
+            SUM( office_asset_num )
         FROM
             large_plat_logistics a
                 LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
-        WHERE
-            b.app_org = #{appOrg}
+        <if test="appOrg != '0000'">WHERE b.app_org = #{appOrg}</if>
     </select>
 
     <select id="getStockAssetNum" parameterType="String" resultMap="LargePlatLogisticsResult">