From 5ae2f1679f9598b5e8ac5b37ab92c40210d708c8 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Sat, 23 Dec 2023 23:17:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../largeScreen/domain/CommonConstants.java   |   2 +-
 .../service/impl/LargeScreenServiceImpl.java  |  18 +-
 .../mapper/largeScreen/LargeScreenMapper.xml  | 216 ++++++------------
 3 files changed, 78 insertions(+), 158 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/CommonConstants.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/CommonConstants.java
index 1bb127a8..3bceb1dd 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/CommonConstants.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/CommonConstants.java
@@ -11,7 +11,7 @@ public class CommonConstants {
     public static final String SGJJ = "施工机具";
     /** 安全工器具*/
     public static final String AQGQJ = "安全工器具";
-    /** 机具分公司*/
+    /** 机具设备分公司*/
     public static final String JJ = "机具设备分公司";
     /** 调试分公司*/
     public static final String TS = "调试分公司";
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java
index d836756c..9d9c0818 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java
@@ -30,7 +30,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
     @Override
     public AjaxResult getMaterialReqData() {
         HashMap<Object, Object> map = new HashMap<>(2);
-        // 施工工具、安全工器具数量
+        // 施工机具、安全工器具数量
         int num = 0, num2 = 0;
         try {
             List<MaTypeDo> list = mapper.getMaterialReqData(DateTimeHelper.getNowDate());
@@ -48,7 +48,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
     @Override
     public AjaxResult getMaterialReturnData() {
         HashMap<Object, Object> map = new HashMap<>(2);
-        // 施工工具、安全工器具数量
+        // 施工机具、安全工器具数量
         int num = 0, num2 = 0;
         try {
             List<MaTypeDo> list = mapper.getMaterialReturnData(DateTimeHelper.getNowDate());
@@ -80,9 +80,9 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
         ParamsDto dto = new ParamsDto();
         try {
             // 施工机具
-            TotalOwnershipVo vo = countNum("1", CommonConstants.SGJJ);
+            TotalOwnershipVo vo = countNum("1", CommonConstants.JJ);
             // 安全工器具
-            TotalOwnershipVo vo2 = countNum("2", CommonConstants.AQGQJ);
+            TotalOwnershipVo vo2 = countNum("2", CommonConstants.TS);
             list.add(vo);
             list.add(vo2);
         } catch (Exception e) {
@@ -146,7 +146,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
         HashMap<Object, Object> map = new HashMap<>(3);
         try {
             dto.setType("1");
-            dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.SGJJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.AQGQJ : null);
+            dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.JJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.TS : null);
             List<MaterialDataVo> lyList = mapper.getScrapAnalysisByMonth(dto);
             dto.setType("2");
             List<MaterialDataVo> bfList = mapper.getScrapAnalysisByMonth(dto);
@@ -169,7 +169,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
         List<String> yearMonthList = DateTimeHelper.getYearMonth();
         List<Integer> valueList = new ArrayList<>();
         List<Integer> valueList2 = new ArrayList<>();
-        dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.SGJJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.AQGQJ : null);
+        dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.JJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.TS : null);
         try {
             for (String date : yearMonthList) {
                 String year = date.substring(0, 4);
@@ -208,7 +208,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
         int num = 0, num2 = 0;
         String rate = "0%", rate2 = "0%";
         try {
-            dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.SGJJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.AQGQJ : null);
+            dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.JJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.TS : null);
             dto.setStartDate(monthDayMap.get("beginDate"));
             dto.setEndDate(monthDayMap.get("endDate"));
             List<MaTypeDo> list = mapper.getPickingAnalysisByMonth(dto);
@@ -235,7 +235,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
         Map<String, String> monthDayMap = DateTimeHelper.getNowOneMonthDay();
         dto.setStartDate(monthDayMap.get("beginDate"));
         dto.setEndDate(monthDayMap.get("endDate"));
-        dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.SGJJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.AQGQJ : null);
+        dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.JJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.TS : null);
         try {
             List<ScrapAnalysisVo> list = mapper.getMaterialReturnByMonth(dto);
             List<Integer> valueList = commonUtil.setMaterialReturnData(list);
@@ -259,7 +259,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
         Map<String, String> monthDayMap = DateTimeHelper.getNowOneMonthDay();
         dto.setStartDate(monthDayMap.get("beginDate"));
         dto.setEndDate(monthDayMap.get("endDate"));
-        dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.SGJJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.AQGQJ : null);
+        dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.JJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.TS : null);
         try {
             List<ScrapAnalysisVo> list = mapper.getMaintenanceByMonth(dto);
             List<Integer> valueList = commonUtil.setMaintenanceData(list);
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
index aa12ab69..50a70919 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
@@ -27,23 +27,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!--当月领料分析-->
     <select id="getPickingAnalysisByMonth" resultType="com.bonus.sgzb.largeScreen.domain.MaTypeDo">
         SELECT lod.out_num AS num,
-               a.typeName,
-               a.manage_type AS manageType
+               mt.type_name AS typeName,
+               mt.manage_type AS manageType
         FROM lease_out_details lod
-        LEFT JOIN (
-            SELECT mt.type_id,mt4.type_name AS typeName,mt.manage_type
-            FROM ma_type mt
-            LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-            LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-            LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-            WHERE mt.`level` = '4'
-        )a ON lod.type_id = a.type_id
+        LEFT JOIN ma_type mt ON lod.type_id = mt.type_id AND mt.`level` = '4'
+        LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
         WHERE lod.create_time BETWEEN CONCAT(#{startDate}, ' 00:00:00') AND CONCAT(#{endDate}, ' 23:59:59')
         <if test="maType!=null and maType == 1">
-            AND a.typeName = #{maTypeName}
+            AND sd.dept_name = #{maTypeName}
         </if>
         <if test="maType!=null and maType == 2">
-            AND a.typeName = #{maTypeName}
+            AND sd.dept_name = #{maTypeName}
         </if>
     </select>
     <!--设备分布-->
@@ -53,44 +47,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         /*验收*/
         <if test="type == 1">
             SELECT pcd.check_num AS num,
-                   a.typeName
+                   mt.type_name AS typeName
             FROM purchase_check_info pci
             LEFT JOIN purchase_check_details pcd ON pci.task_id = pcd.task_id
-            LEFT JOIN (
-                SELECT mt.type_id,mt4.type_name AS typeName
-                FROM ma_type mt
-                LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-                LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-                LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-                WHERE mt.`level` = '4'
-            )a ON pcd.type_id = a.type_id
+            LEFT JOIN ma_type mt ON pcd.type_id = mt.type_id AND mt.`level` = '4'
+            LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
             WHERE pci.arrival_time BETWEEN CONCAT(#{startDate}, ' 00:00:00') AND CONCAT(#{endDate}, ' 23:59:59')
             <if test="maType!=null and maType == 1">
-                AND a.typeName = #{maTypeName}
+                AND sd.dept_name = #{maTypeName}
             </if>
             <if test="maType!=null and maType == 2">
-                AND a.typeName = #{maTypeName}
+                AND sd.dept_name = #{maTypeName}
             </if>
         </if>
         /*入库*/
         <if test="type == 2">
             SELECT iad.input_num,
-                   a.typeName
+                   mt.type_name AS typeName
             FROM input_apply_details iad
-            LEFT JOIN (
-                SELECT mt.type_id,mt4.type_name AS typeName
-                FROM ma_type mt
-                LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-                LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-                LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-                WHERE mt.`level` = '4'
-            )a ON iad.type_id = a.type_id
+            LEFT JOIN ma_type mt ON iad.type_id = mt.type_id AND mt.`level` = '4'
+            LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
             WHERE iad.create_time BETWEEN CONCAT(#{startDate}, ' 00:00:00') AND CONCAT(#{endDate}, ' 23:59:59') AND iad.input_type = '1'
             <if test="maType!=null and maType == 1">
-                AND a.typeName = #{maTypeName}
+                AND sd.dept_name = #{maTypeName}
             </if>
             <if test="maType!=null and maType == 2">
-                AND a.typeName = #{maTypeName}
+                AND sd.dept_name = #{maTypeName}
             </if>
         </if>
     </select>
@@ -101,24 +83,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             SELECT SUM(lod.out_num) AS num,
                    bui.unit_name AS unitName
             FROM lease_out_details lod
-            LEFT JOIN (
-                SELECT mt.type_id,mt4.type_name AS typeName
-                FROM ma_type mt
-                LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-                LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-                LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-                WHERE mt.`level` = '4'
-            )a ON lod.type_id = a.type_id
+            LEFT JOIN ma_type mt ON lod.type_id = mt.type_id AND mt.`level` = '4'
+            LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
             LEFT JOIN lease_apply_info lai ON lod.parent_id = lai.id
             LEFT JOIN tm_task_agreement tta ON lai.task_id = tta.task_id
             LEFT JOIN bm_agreement_info bai ON tta.agreement_id = bai.agreement_id
             LEFT JOIN bm_unit_info bui ON bai.unit_id = bui.unit_id
             <where>
                 <if test="maType!=null and maType == 1">
-                    a.typeName = #{maTypeName}
+                    sd.dept_name = #{maTypeName}
                 </if>
                 <if test="maType!=null and maType == 2">
-                    AND a.typeName = #{maTypeName}
+                    AND sd.dept_name = #{maTypeName}
                 </if>
             </where>
             GROUP BY bai.unit_id
@@ -129,23 +105,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             SELECT SUM(scrap_num) AS num,
                    bui.unit_name AS unitName
             FROM scrap_apply_details sad
-            LEFT JOIN (
-                SELECT mt.type_id,mt4.type_name AS typeName
-                FROM ma_type mt
-                LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-                LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-                LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-                WHERE mt.`level` = '4'
-            )a ON sad.type_id = a.type_id
+            LEFT JOIN ma_type mt ON sad.type_id = mt.type_id AND mt.`level` = '4'
+            LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
             LEFT JOIN tm_task_agreement tta ON sad.task_id = tta.task_id
             LEFT JOIN bm_agreement_info bai ON tta.agreement_id = bai.agreement_id
             LEFT JOIN bm_unit_info bui ON bai.unit_id = bui.unit_id
             WHERE sad.status = '1'
             <if test="maType!=null and maType == 1">
-                AND a.typeName = #{maTypeName}
+                AND sd.dept_name = #{maTypeName}
             </if>
             <if test="maType!=null and maType == 2">
-                AND a.typeName = #{maTypeName}
+                AND sd.dept_name = #{maTypeName}
             </if>
             GROUP BY bai.unit_id
             ORDER BY num DESC
@@ -155,22 +125,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getMaterialReturnByMonth" resultType="com.bonus.sgzb.largeScreen.domain.ScrapAnalysisVo">
         SELECT bad.pre_num AS planNum,
                bad.audit_num AS realityNum,
-               a.typeName
+               mt.type_name AS  typeName
         FROM back_apply_details bad
-        LEFT JOIN (
-            SELECT mt.type_id,mt4.type_name AS typeName
-            FROM ma_type mt
-            LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-            LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-            LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-            WHERE mt.`level` = '4'
-        )a ON bad.type_id = a.type_id
+        LEFT JOIN ma_type mt ON bad.type_id = mt.type_id AND mt.`level` = '4'
+        LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
         WHERE bad.create_time BETWEEN CONCAT(#{startDate}, ' 00:00:00') AND CONCAT(#{endDate}, ' 23:59:59')
         <if test="maType!=null and maType == 1">
-            AND a.typeName = #{maTypeName}
+            AND sd.dept_name = #{maTypeName}
         </if>
         <if test="maType!=null and maType == 2">
-            AND a.typeName = #{maTypeName}
+            AND sd.dept_name = #{maTypeName}
         </if>
     </select>
     <!--当月维修分析-->
@@ -178,82 +142,62 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT rad.repair_num AS repairNum,
                rad.repaired_num AS repairedNum,
                rad.scrap_num AS scrapNum,
-               a.typeName
+               mt.type_name AS typeName
         FROM repair_apply_details rad
-        LEFT JOIN (
-            SELECT mt.type_id,mt4.type_name AS typeName
-            FROM ma_type mt
-            LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-            LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-            LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-            WHERE mt.`level` = '4'
-        )a ON rad.type_id = a.type_id
+        LEFT JOIN ma_type mt ON rad.type_id = mt.type_id AND mt.`level` = '4'
+        LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
         WHERE rad.create_time BETWEEN CONCAT(#{startDate}, ' 00:00:00') AND CONCAT(#{endDate}, ' 23:59:59')
         <if test="maType!=null and maType == 1">
-            AND a.typeName = #{maTypeName}
+            AND sd.dept_name = #{maTypeName}
         </if>
         <if test="maType!=null and maType == 2">
-            AND a.typeName = #{maTypeName}
+            AND sd.dept_name = #{maTypeName}
         </if>
     </select>
     <!--施工机具/工器具总保有量-->
     <select id="getTotalOwnership" resultType="com.bonus.sgzb.largeScreen.domain.ScrapAnalysisVo">
         /*在库*/
         <if test="type == 1">
-            SELECT mt4.type_name AS typeName,
+            SELECT mt.type_name AS typeName,
                    mt.num AS num
             FROM ma_type mt
-            LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-            LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-            LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
+            LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
             WHERE mt.`level` = '4' AND mt.del_flag = '0'
             <if test="maType!=null and maType == 1">
-                AND mt4.type_name = #{maTypeName}
+                AND sd.dept_name = #{maTypeName}
             </if>
             <if test="maType!=null and maType == 2">
-                AND mt4.type_name = #{maTypeName}
+                AND sd.dept_name = #{maTypeName}
             </if>
         </if>
         /*待入库 新购/修试*/
         <if test="type == 2">
             SELECT pcd.purchase_num AS num,
                    pcd.input_num AS num2,
-                   a.typeName AS typeName
+                   mt.type_name AS typeName
             FROM purchase_check_details pcd
-            LEFT JOIN (
-                SELECT mt.type_id,mt4.type_name AS typeName
-                FROM ma_type mt
-                LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-                LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-                LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-                WHERE mt.`level` = '4'
-            )a ON pcd.type_id = a.type_id
+            LEFT JOIN ma_type mt ON pcd.type_id = mt.type_id AND mt.`level` = '4'
+            LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
             WHERE pcd.status = '1'
             <if test="maType!=null and maType == 1">
-                AND a.typeName = #{maTypeName}
+                AND sd.dept_name = #{maTypeName}
             </if>
             <if test="maType!=null and maType == 2">
-                AND a.typeName = #{maTypeName}
+                AND sd.dept_name = #{maTypeName}
             </if>
         UNION ALL
             SELECT rid.repair_num AS num,
                    rid.input_num AS num2,
-                   a.typeName AS typeName
+                   mt.type_name AS typeName
             FROM repair_input_details rid
-            LEFT JOIN (
-                SELECT mt.type_id,mt4.type_name AS typeName
-                FROM ma_type mt
-                LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-                LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-                LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-                WHERE mt.`level` = '4'
-            )a ON rid.type_id = a.type_id
+            LEFT JOIN ma_type mt ON rid.type_id = mt.type_id AND mt.`level` = '4'
+            LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
             <where>
                 <if test="maType!=null and maType == 1">
-                    a.typeName = #{maTypeName}
+                    sd.dept_name = #{maTypeName}
                 </if>
                 <if test="maType!=null and maType == 2">
-                    AND a.typeName = #{maTypeName}
+                    AND sd.dept_name = #{maTypeName}
                 </if>
             </where>
         </if>
@@ -261,43 +205,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="type == 3">
             SELECT  lod.out_num AS num,
                    '1' AS type,
-                    a.typeName AS typeName
+                    mt.type_name AS typeName
             FROM lease_out_details lod
-            LEFT JOIN (
-                SELECT mt.type_id,mt4.type_name AS typeName
-                FROM ma_type mt
-                LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-                LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-                LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-                WHERE mt.`level` = '4'
-            )a ON lod.type_id = a.type_id
+            LEFT JOIN ma_type mt ON lod.type_id = mt.type_id AND mt.`level` = '4'
+            LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
             <where>
                 <if test="maType!=null and maType == 1">
-                    a.typeName = #{maTypeName}
+                    sd.dept_name = #{maTypeName}
                 </if>
                 <if test="maType!=null and maType == 2">
-                    AND a.typeName = #{maTypeName}
+                    AND sd.dept_name = #{maTypeName}
                 </if>
             </where>
         UNION ALL
             SELECT bad.audit_num AS num,
                     '2' AS type,
-                    a.typeName AS typeName
+                    mt.type_name AS typeName
             FROM back_apply_details bad
-            LEFT JOIN (
-                SELECT mt.type_id,mt4.type_name AS typeName
-                FROM ma_type mt
-                LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-                LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-                LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-                WHERE mt.`level` = '4'
-            )a ON bad.type_id = a.type_id
+            LEFT JOIN ma_type mt ON bad.type_id = mt.type_id AND mt.`level` = '4'
+            LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
             <where>
                 <if test="maType!=null and maType == 1">
-                    a.typeName = #{maTypeName}
+                    sd.dept_name = #{maTypeName}
                 </if>
                 <if test="maType!=null and maType == 2">
-                    AND a.typeName = #{maTypeName}
+                    AND sd.dept_name = #{maTypeName}
                 </if>
             </where>
         </if>
@@ -306,44 +238,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             SELECT rad.repair_num AS repairNum,
                    rad.repaired_num AS repairedNum,
                    rad.scrap_num AS scrapNum,
-                   a.typeName AS typeName
+                   mt.type_name AS typeName
             FROM repair_apply_details rad
-            LEFT JOIN (
-                SELECT mt.type_id,mt4.type_name AS typeName
-                FROM ma_type mt
-                LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-                LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-                LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-                WHERE mt.`level` = '4'
-            )a ON rad.type_id = a.type_id
+            LEFT JOIN ma_type mt ON rad.type_id = mt.type_id AND mt.`level` = '4'
+            LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
             <where>
                 <if test="maType!=null and maType == 1">
-                    a.typeName = #{maTypeName}
+                    sd.dept_name = #{maTypeName}
                 </if>
                 <if test="maType!=null and maType == 2">
-                    AND a.typeName = #{maTypeName}
+                    AND sd.dept_name = #{maTypeName}
                 </if>
             </where>
         </if>
         /*报废*/
         <if test="type == 5">
             SELECT sad.scrap_num AS num,
-                   a.typeName AS typeName
+                   mt.type_name AS typeName
             FROM scrap_apply_details sad
-            LEFT JOIN (
-                SELECT mt.type_id,mt4.type_name AS typeName
-                FROM ma_type mt
-                LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-                LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-                LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-                WHERE mt.`level` = '4'
-            )a ON sad.type_id = a.type_id
+            LEFT JOIN ma_type mt ON sad.type_id = mt.type_id AND mt.`level` = '4'
+            LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
             WHERE sad.status = '1'
                 <if test="maType!=null and maType == 1">
-                    AND a.typeName = #{maTypeName}
+                    AND sd.dept_name = #{maTypeName}
                 </if>
                 <if test="maType!=null and maType == 2">
-                    AND a.typeName = #{maTypeName}
+                    AND sd.dept_name = #{maTypeName}
                 </if>
         </if>
     </select>