Browse Source

新增报销总计数据调整

anderx 1 year ago
parent
commit
33b68ef84a
1 changed files with 2 additions and 0 deletions
  1. 2 0
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

+ 2 - 0
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -2275,6 +2275,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
             group by a.order_dep )b on a.id=b.order_dep
     left join (select a.apply_dep,count(a.id)expenseCount, sum(ROUND(a.duration/7.5) )days ,sum(a.amount)amount
            from expense_account a where a.apply_dep in (select a.apply_dep from expense_account a where a.target_type = 0 group by apply_dep)
+            and a.status=2
           <if test="startTime !=null and endTime != null">
             and a.create_time BETWEEN #{startTime} and #{endTime}
           </if>
@@ -2282,6 +2283,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
     left join (select apply_dep,count(aid)peopleCount from (select a.apply_dep,aid from expense_account a where a.apply_dep in
           (select a.apply_dep
           from expense_account a where a.target_type = 0 group by apply_dep)
+            and a.status=2
           <if test="startTime !=null and endTime != null">
             and a.create_time BETWEEN #{startTime} and #{endTime}
           </if>