Browse Source

财务统计变更模块修改

anderx 2 years ago
parent
commit
47861b5fbc

+ 1 - 0
src/main/java/com/goafanti/admin/service/impl/AdminStatisticsServiceImpl.java

@@ -202,6 +202,7 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
         String aid = TokenManager.getAdminId();
         OutFinanceCount financeCount=adminMapper.financeInfo(aid, startTime, endTime);
         Integer rangePublicCount = publicReleaseMapper.selectCountByaidAndDate(aid, startTime, endTime);
+        if (rangePublicCount==null) rangePublicCount=0;
         financeCount.setRangePublicCount(rangePublicCount);
         BigDecimal rangeReceivables=adminMapper.selectFinanceReceivablesCount(aid,startTime,endTime);
         if (rangeReceivables==null)rangeReceivables=new BigDecimal(0);

+ 2 - 1
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -1432,7 +1432,8 @@
       and a.start_time  between #{startTime} and #{endTime}
   </select>
   <select id="selectFinanceChangeCount" resultType="com.goafanti.admin.bo.OutFinanceCount">
-    select c.finance_id aid,sum(if(a.process_state=6,1,0))changeCount,sum(if(a.process_state>6 and a.status=2,1,0)) changeInvoiceCount
+    select c.finance_id aid,sum(if(a.process_state=6,1,0))changeCount,
+           sum(if((a.process_state>6 and a.status=2)or (a.process_state=6),1,0)) changeInvoiceCount
     from new_order_change a left join t_order_new b on a.order_no =b.order_no
                             left join department c on b.order_dep =c.id
     where c.finance_id = #{aid}