From d3205f4627ceb7af1344ce77715def28fee5545b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 17 十二月 2025 08:56:19 +0800
Subject: [PATCH] 在“编号”和“片区”直接增加一列“送货时间”，该送货时间显示进行了“送货安排”操作的学校的时间，没有安排送货的学校就是空白 完成
---
CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs
index 693abff..1063f94 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs
@@ -101,6 +101,8 @@
new SqlParameter("@BF_IsDriver", trueModel.BF_IsDriver) ,
new SqlParameter("@BF_Isbaoxiaojingli", trueModel.BF_Isbaoxiaojingli) ,
new SqlParameter("@BF_IsBaoxiaozhuguan", trueModel.BF_IsBaoxiaozhuguan) ,
+ new SqlParameter("@BF_IsGongwen", trueModel.BF_IsGongwen.HasValue?trueModel.BF_IsGongwen.Value:false) ,
+ new SqlParameter("@BF_IsChangyongziliao", trueModel.BF_IsChangyongziliao.HasValue?trueModel.BF_IsChangyongziliao.Value:false) ,
};
try
{
@@ -195,6 +197,8 @@
new SqlParameter("@BF_IsDriver", trueModel.BF_IsDriver) ,
new SqlParameter("@BF_Isbaoxiaojingli", trueModel.BF_Isbaoxiaojingli) ,
new SqlParameter("@BF_IsBaoxiaozhuguan", trueModel.BF_IsBaoxiaozhuguan) ,
+ new SqlParameter("@BF_IsGongwen", trueModel.BF_IsGongwen.HasValue?trueModel.BF_IsGongwen.Value:false) ,
+ new SqlParameter("@BF_IsChangyongziliao", trueModel.BF_IsChangyongziliao.HasValue?trueModel.BF_IsChangyongziliao.Value:false) ,
};
try
{
@@ -329,7 +333,7 @@
{
condition += " and a.DepartmentId = '" + DepartmentId + "'";
}
- return _dataBase.SelectModelPage<Model.OA_Staff>(pagination, " a.*,b.Name as DepartmentName ", " dbo.OA_Staff AS a LEFT JOIN dbo.OA_Department AS b ON a.DepartmentId = b.Keyid ", "a.Status DESC,a.DepartmentId ASC ", " Status DESC,DepartmentId ASC ", condition);
+ return _dataBase.SelectModelPage<Model.OA_Staff>(pagination, " a.*,b.Name as DepartmentName ", " dbo.OA_Staff AS a LEFT JOIN dbo.OA_Department AS b ON a.DepartmentId = b.Keyid ", "a.Status DESC,a.DepartmentId ASC ,a.SM_Post DESC", " Status DESC,DepartmentId ASC,SM_Post DESC ", condition);
}
catch (Exception ex)
{
--
Gitblit v1.9.1