From 727a27340fc49d41bf9f7efd81a9a44ade7a9677 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 28 六月 2022 13:15:52 +0800
Subject: [PATCH] 合同盖章
---
zhengcaioa/Services/FiOrderrecievemoneyService.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/zhengcaioa/Services/FiOrderrecievemoneyService.cs b/zhengcaioa/Services/FiOrderrecievemoneyService.cs
index 9532878..4932909 100644
--- a/zhengcaioa/Services/FiOrderrecievemoneyService.cs
+++ b/zhengcaioa/Services/FiOrderrecievemoneyService.cs
@@ -200,7 +200,9 @@
&& (string.IsNullOrWhiteSpace(searchEntity.HuiyuanId) || ggg.HuiyuanId == searchEntity.HuiyuanId.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.StartTime) || a.XdTime >= DateTime.Parse(searchEntity.StartTime) )
&& (string.IsNullOrWhiteSpace(searchEntity.EndTime) || a.XdTime <= DateTime.Parse(searchEntity.EndTime).AddSeconds(1))
-
+ && ((searchEntity.HuiyuanIds == null || searchEntity.HuiyuanIds.Length == 0) || searchEntity.HuiyuanIds.Contains(ggg.HuiyuanId))
+ && ((searchEntity.OrderTypes == null || searchEntity.OrderTypes.Length == 0) || searchEntity.OrderTypes.Contains(a.OrderType))
+ && (string.IsNullOrWhiteSpace(searchEntity.OrderType1) || a.OrderType1 == searchEntity.OrderType1.Trim())
@@ -223,7 +225,7 @@
YishouMoney = lll.YishouMoney??0,
WeishouMoney = (a.Money ?? 0) /*- (a.Youhui ?? 0)*/ - (lll.YishouMoney??0),
-
+ HuiyuanId = ggg.HuiyuanId,
@@ -242,7 +244,7 @@
if ( !string.IsNullOrWhiteSpace(searchEntity.Fkzt)){
if (searchEntity.Fkzt.Trim().Equals("01"))
{
- query = query.Where(x => x.YishouMoney <= 0).OrderByDescending(x => x.OrderNo).ToList();
+ query = query.Where(x => x.YishouMoney <= 0 && x.WeishouMoney>0).OrderByDescending(x => x.OrderNo).ToList();
}
else if (searchEntity.Fkzt.Trim().Equals("02"))
{
--
Gitblit v1.9.1