年度预算限制解除，费用管理重复数据处理

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
-        where p.XMMB != 1
+        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 CONCAT(p.ID, f.NF) not in (select CONCAT(RWS, NF) from prj_AnnualBudget where XMLX !='s8')
         <if test="zwmc != null and zwmc != ''">
             and p.ZWMC like '%'+#{zwmc}+'%'
         </if>
@@ -709,6 +710,7 @@
     </select>
     <!--     获取费用管理列表 -->
     <select id="getFyglList" resultMap="FeeManagementMap" parameterType="map">
+        select * from(
         select p.ID,p.ZWMC,p.ERPBH,p.XMLX,t.XMLXMC,b.XMFZRXM,d.dept_name as SSBMMC,b.NF, case when aa.NF=b.NF then
         aa.YSJE else 0 end as YSJE, case when aa.NF=b.NF then aa.XMZ else 0 end as XMZ, (SUM(case when b.BZJE is null
         and b.SFBYJ =0 then b.SQJE else 0 end)/10000+SUM(case when b.BZJE is not null and b.SFBYJ =0 then b.BZJE else 0
@@ -725,7 +727,8 @@
         1 end)) as RZBFB from prj_Project p left join (select s.*,r.XM as XMFZRXM from sta_BudgetApproval s left join
         base_Person r on r.ID=s.XMFZR where s.SPZT != '作废') b on b.XMID=p.ID left join base_ProjectType t on
         t.XMLX=p.XMLX left join sys_dept_info d on d.dept_id=p.SSBM left join (select a.*,bd.YSJE,bd.XMZ,bd.BYJ from
-        prj_AnnualBudget a left join prj_AnnualBudgetDetail bd on bd.NYS = a.ID and bd.FJ = '' where a.SPZT != '作废') aa
+        prj_AnnualBudget a left join prj_AnnualBudgetDetail bd on bd.NYS = a.ID and bd.FJ = '' where a.SPZT != '作废')
+        aa
         on aa.RWS=p.ID where 1 = 1
         <if test="xmmc != null and xmmc != ''">and p.ZWMC like '%'+#{xmmc}+'%'</if>
         <if test="erpbh != null and erpbh != ''">and p.ERPBH like '%'+#{erpbh}+'%'</if>
@@ -735,10 +738,11 @@
         <if test="nf != null and nf != ''">and b.NF = #{nf}</if>
         group by p.ID,p.ZWMC,p.ERPBH,p.XMLX,t.XMLXMC,b.XMFZRXM,d.dept_name,b.NF,aa.NF,aa.YSJE,aa.XMZ,aa.BYJ
         <choose>
-            <when test="sortName != null and sortName != '' and sortOrder != null and sortOrder != ''">order by
-                ${sortName} ${sortOrder}
-            </when>
+            <when test="sortName != null and sortName != '' and sortOrder != null and sortOrder != ''">order by</when>
         </choose>
+        ${sortName} ${sortOrder}
+        ) as sx
+        WHERE YSJE &lt;&gt; 0
     </select>
 
     <!-- 根据erp 编号查询数据  -->