Browse Source

财务统计成本支付BUG修复

anderx 2 years ago
parent
commit
9b7acdef39

+ 4 - 3
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -1433,11 +1433,12 @@
   </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)or (a.process_state=6),1,0)) changeInvoiceCount
+           sum(if(a.process_state>6 and a.status=2,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}
-      and a.process_state in (6,8,9) and a.status in(1,2) and b.delete_sign in (0,2,3)
+    where a.process_state in (6,8,9) and a.status in(1,2) and b.delete_sign in (0,2,3)
+    and  c.finance_id = #{aid}
+
   </select>
   <select id="selectFinanceReceivablesCount" resultType="java.math.BigDecimal">
     SELECT  sum(a.money)  receivables

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

@@ -552,7 +552,7 @@ where x.id=  #{tid}
 		from t_order_payment a left join t_order_task b on a.tid=b.id left join t_order_new c on b.order_no=c.order_no
 		left join business_project bp on b.commodity_id=bp.id
 		left join t_order_mid d on b.order_no=d.order_no left join t_task_mid f on a.tid=f.tid
-		where 1=1
+		where 1=1 and c.delete_sign in (0,2,3)
 		<if test="lvl==0">
 		and d.finance_id= #{aid}
 		</if>
@@ -611,7 +611,7 @@ where x.id=  #{tid}
 		select count(*)
 		from t_order_payment a left join t_order_task b on a.tid=b.id left join t_order_new c on b.order_no=c.order_no
 		left join t_order_mid d on b.order_no=d.order_no
-		where 1=1
+        where 1=1 and c.delete_sign in (0,2,3)
 		<if test="lvl==0">
 		and d.finance_id= #{aid}
 		</if>

+ 5 - 2
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -24,6 +24,7 @@ import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
@@ -68,6 +69,8 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	private AsyncUtils	asyncUtils;
 	@Autowired
 	private FinanceCountMapper	financeCountMapper;
+	@Value(value = "${upload.path}")
+	private final String	uploadPath			= null;
 
 
 
@@ -1011,7 +1014,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 				list2.add(out2);
 			}
 			NewExcelUtil<outPaymentListFinance> excelUtil=new NewExcelUtil<>(outPaymentListFinance.class);
-			return excelUtil.exportExcel(list2, "财务成本列表");
+			return excelUtil.exportExcel(list2, "财务成本列表",uploadPath);
 		}else {
 			List<outPaymentListPatent> list3=new ArrayList<outPaymentListPatent>();
 			for (outPaymentList out : list) {
@@ -1036,7 +1039,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 					list3.add(out3);
 			}
 			NewExcelUtil<outPaymentListPatent> p=new NewExcelUtil<>(outPaymentListPatent.class);
-			return p.exportExcel(list3, "专利成本列表");
+			return p.exportExcel(list3, "专利成本列表",uploadPath);
 		}
 	}