修改年度预算查询bUG修改

src/main/java/com/liang/controller/StaBudgetapprovalController.java

@@ -243,7 +243,11 @@ public class StaBudgetapprovalController extends BaseController {
                 }
 
             }else {
-                paraMap.put("nf",nf);
+                if (nfs[0].equals("0")){
+                    paraMap.put("nf","");
+                }else{
+                    paraMap.put("nf",nf);
+                }
             }
         }
 

src/main/resources/mapper/PrjAnnualbudgetDao.xml

@@ -354,26 +354,29 @@
         d.dept_name AS SSBMMC,
         u.name AS SQRXM,
         bd.XMZYS,
-        pf.CZJE * 10000 AS CZJE,
-        COALESCE(
-        -- 在子查询里先对BZJE列的NULL值替换为0，再进行关联、筛选、分组求和
-        (SELECT SUM(sb.BZJE)
-        FROM sta_BudgetApproval sb
-        where sb.NYS = a.ID AND sb.SPZT != '作废'
+        COALESCE (
+        (
+        SELECT
+        pf.CZJE
+        FROM
+        prj_FeeScheme pf
+        WHERE
+        a.RWS = pf.ZB
+        AND a.NF = pf.NF
+        AND pf.DWMC LIKE '%国网陕西省%'
         ),
         0.00
+        ) * 10000 AS CZJE,
+        COALESCE (-- 在子查询里先对BZJE列的NULL值替换为0，再进行关联、筛选、分组求和
+        ( SELECT SUM ( sb.BZJE ) FROM sta_BudgetApproval sb WHERE sb.NYS = a.ID AND sb.SPZT != '作废' ),
+        0.00
         ) AS BZZE,
-        COALESCE(
-        -- 在子查询里先对BZJE列的NULL值替换为0，再进行关联、筛选、分组求和
-        (SELECT SUM(sb.SQJE)
-        FROM sta_BudgetApproval sb
-        where sb.NYS = a.ID AND sb.SPZT != '作废'
-        ),
+        COALESCE (-- 在子查询里先对BZJE列的NULL值替换为0，再进行关联、筛选、分组求和
+        ( SELECT SUM ( sb.SQJE ) FROM sta_BudgetApproval sb WHERE sb.NYS = a.ID AND sb.SPZT != '作废' ),
         0.00
         ) AS SQJE
         FROM
         prj_AnnualBudget a
-        LEFT JOIN prj_FeeScheme pf ON a.RWS = pf.ZB and a.NF =  pf.NF
         LEFT JOIN base_ProjectType t ON t.XMLX = a.XMLX
         LEFT JOIN base_Person r ON r.ID = a.XMFZR
         LEFT JOIN sys_user_info u ON u.user_id = a.SQR
@@ -382,7 +385,6 @@
         AND bd.FJ = ''
         WHERE
         1 = 1
-          and pf.DWMC like '%国网陕西省%'
         <if test="deptName!= null and deptName != ''">
             and(
             <if test="deptName !='电源技术中心'">