From 40eacc41d6f70f64ffd8f1fd18a8e12bce3fd86d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 16 十月 2025 12:10:34 +0800
Subject: [PATCH] 没有批准的就不显示在列表中
---
CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs
index afa3815..5981115 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs
@@ -68,11 +68,12 @@
new SqlParameter("@CreateTime", trueModel.CreateTime) ,
new SqlParameter("@Creator", trueModel.Creator) ,
new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,
- new SqlParameter("@Operator", trueModel.Operator) ,
-
- };
- string sql = "Insert Into OA_ShebeiWeixiu ([MemberId],[ShebeiId],[WeixiuTime],[CateId],[Name],[Anzhuangdidian],[Remark],[WeixiuPrice],[Zerenren],[ZerenrenName],[DanzePrice],[WeixiuShebeiId],[FukuanShebeiId],[FukuanshenqingId],[Shifoufufei],[CreateTime],[Creator],[LastUpdateTime],[Operator])"
- + " Values (@MemberId,@ShebeiId,@WeixiuTime,@CateId,@Name,@Anzhuangdidian,@Remark ,@WeixiuPrice,@Zerenren,@ZerenrenName,@DanzePrice,@WeixiuShebeiId,@FukuanShebeiId,@FukuanshenqingId,@Shifoufufei,@CreateTime,@Creator,@LastUpdateTime,@Operator)";
+ new SqlParameter("@Operator", trueModel.Operator) ,
+ new SqlParameter("@ApprovalStatus", trueModel.ApprovalStatus.HasValue?trueModel.ApprovalStatus.Value:0) ,
+
+ };
+ string sql = "Insert Into OA_ShebeiWeixiu ([MemberId],[ShebeiId],[WeixiuTime],[CateId],[Name],[Anzhuangdidian],[Remark],[WeixiuPrice],[Zerenren],[ZerenrenName],[DanzePrice],[WeixiuShebeiId],[FukuanShebeiId],[FukuanshenqingId],[Shifoufufei],[CreateTime],[Creator],[LastUpdateTime],[Operator],[ApprovalStatus])"
+ + " Values (@MemberId,@ShebeiId,@WeixiuTime,@CateId,@Name,@Anzhuangdidian,@Remark ,@WeixiuPrice,@Zerenren,@ZerenrenName,@DanzePrice,@WeixiuShebeiId,@FukuanShebeiId,@FukuanshenqingId,@Shifoufufei,@CreateTime,@Creator,@LastUpdateTime,@Operator,@ApprovalStatus)";
try
{
@@ -129,8 +130,9 @@
new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,
new SqlParameter("@Operator", trueModel.Operator) ,
+ new SqlParameter("@ApprovalStatus", trueModel.ApprovalStatus.HasValue?trueModel.ApprovalStatus.Value:0) ,
};
- string sql = "Update OA_ShebeiWeixiu Set [MemberId]=@MemberId,[ShebeiId]=@ShebeiId,[WeixiuTime]=@WeixiuTime,[CateId]=@CateId,[Name]=@Name,[Anzhuangdidian]=@Anzhuangdidian,[Remark]=@Remark,[WeixiuPrice]=@WeixiuPrice,[Zerenren]=@Zerenren,[ZerenrenName]=@ZerenrenName,[DanzePrice]=@DanzePrice, [WeixiuShebeiId]=@WeixiuShebeiId,[FukuanShebeiId]=@FukuanShebeiId,[FukuanshenqingId]=@FukuanshenqingId,[Shifoufufei]=@Shifoufufei,[LastUpdateTime]=@LastUpdateTime, [Operator]=@Operator where [Keyid] =@Keyid ";
+ string sql = "Update OA_ShebeiWeixiu Set [MemberId]=@MemberId,[ShebeiId]=@ShebeiId,[WeixiuTime]=@WeixiuTime,[CateId]=@CateId,[Name]=@Name,[Anzhuangdidian]=@Anzhuangdidian,[Remark]=@Remark,[WeixiuPrice]=@WeixiuPrice,[Zerenren]=@Zerenren,[ZerenrenName]=@ZerenrenName,[DanzePrice]=@DanzePrice, [WeixiuShebeiId]=@WeixiuShebeiId,[FukuanShebeiId]=@FukuanShebeiId,[FukuanshenqingId]=@FukuanshenqingId,[Shifoufufei]=@Shifoufufei,[LastUpdateTime]=@LastUpdateTime, [Operator]=@Operator,ApprovalStatus=@ApprovalStatus where [Keyid] =@Keyid ";
try
{
@@ -287,11 +289,11 @@
/// </summary>
/// <param name="pagination"></param>
/// <returns></returns>
- public IEnumerable<Model.OA_ShebeiWeixiu> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid _MemberId, int? _CateId, string _Name, int? _Status, string Anzhuangdidian, int? Zerenren, int? Shifoufufei)
+ public IEnumerable<Model.OA_ShebeiWeixiu> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid _MemberId, int? _CateId, string _Name, int? _Status, string Anzhuangdidian, int? Zerenren, int? Shifoufufei, int? guanliZerenren)
{
try
{
- string condition = " 1=1 ";
+ string condition = " ApprovalStatus=1 ";
if (_MemberId != Guid.Empty)
condition += " and a.MemberId = '" + _MemberId + "'";
@@ -311,11 +313,40 @@
if (Zerenren.HasValue)
condition += " and a.Zerenren = '" + Zerenren + "'";
+ if (guanliZerenren.HasValue)
+ condition += " and c.Zerenren = '" + guanliZerenren + "'";
+
+
+
if (Shifoufufei.HasValue)
condition += " and a.Shifoufufei = '" + Shifoufufei + "'";
- return _dataBase.SelectModelPage<Model.OA_ShebeiWeixiu>(pagination, " a.*,b.Name as CateName ", " OA_ShebeiWeixiu as a left join OA_ShebeiCate as b on a.CateId = b.Keyid ", " a.WeixiuTime DESC", " Keyid desc ", condition);
+
+ /// <summary>
+ /// 鏌ヨ鏉ユ簮
+ /// </summary>
+ string fromss = " OA_ShebeiWeixiu as a left join OA_ShebeiCate as b on a.CateId = b.Keyid left join OA_ShebeiManage as c on a.ShebeiId = c.Keyid " +
+
+
+
+
+
+ " where " + condition;
+
+ var ssss = _dataBase.SelectModel<Model.OA_ShebeiWeixiu>(" sum(a.WeixiuPrice) as WeixiuPrice,sum(a.DanzePrice) as DanzePrice ", fromss);
+ if (ssss.Count > 0)
+ {
+ var aaaaa = ssss.First();
+ pagination.heji1 = aaaaa.WeixiuPrice;
+ pagination.heji3 = aaaaa.DanzePrice;
+ }
+
+
+
+
+
+ return _dataBase.SelectModelPage<Model.OA_ShebeiWeixiu>(pagination, " a.*,b.Name as CateName, c.ZerenrenName as ShebeiZerenrenName ", " OA_ShebeiWeixiu as a left join OA_ShebeiCate as b on a.CateId = b.Keyid left join OA_ShebeiManage as c on a.ShebeiId = c.Keyid ", " a.WeixiuTime DESC", " Keyid desc ", condition);
}
catch (Exception ex)
{
--
Gitblit v1.9.1