src/main/resources/mapper/PrjAnnualbudgetdetailDao.xml

@@ -605,10 +605,20 @@
 
     <select id="selectXMZYS" resultType="java.math.BigDecimal">
 
-        SELECT SUM(CZJE)
+        (
+         SELECT SUM(CZJE)
         from prj_feescheme
         where ZB = #{id}
-          and DWMC LIKE '%国网陕西省电力%'
+        and DWMC LIKE '%国网陕西省电力%'
+            ) + (
+        SELECT SUM(puc.SKJE) skje
+        from prj_FeeScheme pfs
+        left join prj_UndertakeCompany puc  on puc.ZB = pfs.ID
+        where
+         pfs.ZB = #{id}
+        and pfs.DWMC  not like '%国网陕西%'
+        and puc.DWMC like '%国网陕西%'
+              )
 
     </select>
     <select id="selectXMZYS_SX" resultType="java.math.BigDecimal">

src/main/resources/mapper/PrjProjectDao.xml

@@ -503,9 +503,10 @@
         left join prj_Member m on m.XM = p.ID and m.XMJS = 1
         left join prj_Budget b on b.XM = p.ID and b.FJ = ''
         left join prj_FeeScheme f on f.ZB = p.ID
+        left join prj_AnnualBudget pa on pa.rws = f.zb and pa.nf = f.nf
         where p.XMMB != 1
         and p.SPZT = '审批结束'
-        and CONCAT(p.ID, f.NF) not in (select CONCAT(RWS, NF) from prj_AnnualBudget where XMLX !='s8')
+        and (p.xmlx = 's8' or ( pa.nf is null ))
         <if test="zwmc != null and zwmc != ''">
             and p.ZWMC like '%'+#{zwmc}+'%'
         </if>