From a7711b47c02807531f04313ae829584310f37aba Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 28 十一月 2025 12:17:10 +0800
Subject: [PATCH] 你们明天在那个公文管理公文管理那个操作操作界面增加一个审核， 好点审核呢，实际上是修改这个只有我才有一个权限， 只是只有我一个人，因为现在来看他们。相当于说， 没经过我审核，他们整些你看嘛，发你妈一些公文， 像狗屎一样，格式都不对头，在这儿乱在这儿乱写啊， 必须就是我，我审核，我点审核，你相就是复制一个修改过嘛， 相当于就是。好，必须是我，我点了审核好后头我修改好了， 提交好了才能发布。只要我没在审核里头的话，好，这个就发布不了 。好怀疑着呢，怀疑怀疑着来修改，还是在修改里头整？
---
CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs
index d048350..818249d 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs
@@ -157,29 +157,29 @@
Condition += " and ok.BusinessManagerId = '" + BusinessManagerId + "'";
if (!string.IsNullOrEmpty(CustormerName))
Condition += " and oe.CompanyName like '%" + CustormerName + "%'";
-
- if (!string.IsNullOrEmpty(PayStates))
- {
- if (PayStates == "2")
- {
- Condition += " and not EXISTS ( select eoe.[KaipiaoshenqingId] from [EC_OrderExtend] eoe inner join [EC_OrderBasic] eob on eob.Keyid = eoe.Keyid where ok.Keyid = eoe.[KaipiaoshenqingId] and eob.PayState !=-1 ) ";
- }
- else if (PayStates == "1")
- {
- Condition += " and EXISTS ( select eoe.[KaipiaoshenqingId] from [EC_OrderExtend] eoe inner join [EC_OrderBasic] eob on eob.Keyid = eoe.Keyid where ok.Keyid = eoe.[KaipiaoshenqingId] and eob.PayState !=-1 ) ";
- }
- }
if (!string.IsNullOrEmpty(HuikuanStates))
{
if (HuikuanStates == "2")
{
- Condition += " and ok.Huikuanmoney >0 ";
+ Condition += " and ok.Huikuanmoney >= kpmoney ";
}
else if (HuikuanStates == "1")
{
- Condition += " and ( ok.Huikuanmoney is null or ok.Huikuanmoney <=0) ";
+ Condition += " and ( ok.Huikuanmoney is null or ok.Huikuanmoney < kpmoney ) ";
}
}
+ if (!string.IsNullOrEmpty(PayStates))
+ {
+ if (PayStates == "2")
+ {
+ Condition += " and (( ok.Shenqingleixing ='璁㈠崟寮�绁�' and not EXISTS ( select eoe.[KaipiaoshenqingId] from [EC_OrderExtend] eoe inner join [EC_OrderBasic] eob on eob.Keyid = eoe.Keyid where ok.Keyid = eoe.[KaipiaoshenqingId] and eob.PayState !=-1 ) ) or ( ok.Shenqingleixing ='棰勪粯娆惧紑绁�' and ok.[Kehumoney]>=ok.[kpmoney] ) )";
+ }
+ else if (PayStates == "1")
+ {
+ Condition += " and ( ( ok.Shenqingleixing ='璁㈠崟寮�绁�' and EXISTS ( select eoe.[KaipiaoshenqingId] from [EC_OrderExtend] eoe inner join [EC_OrderBasic] eob on eob.Keyid = eoe.Keyid where ok.Keyid = eoe.[KaipiaoshenqingId] and eob.PayState !=-1 ) ) or ( ok.Shenqingleixing ='棰勪粯娆惧紑绁�' and ok.[Kehumoney] < ok.[kpmoney] ) )";
+ }
+ }
+
Query query = new Query();
IList<Criterion> criterias = new List<Criterion>()
--
Gitblit v1.9.1