From 120215455f4fb2e5a1447f3ecda87f36aca1f38f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 27 二月 2026 08:54:22 +0800
Subject: [PATCH] 1）有到期时间的，到期前3个月变成红色（像人事管理那样）；没有到期时间的，从建档时间起算，9个月后变成红色。完成 （2）建档后1个月没有下单，变成血红色。 完成 （3）列表中删除“完结状态”；操作中删除“订单关联” 完成 （4）在“应收款订单”后面增加“未收款金额” 、“逾期收款”完成
---
CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs
index 6d89381..1063f94 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs
@@ -99,6 +99,10 @@
new SqlParameter("@ManageCountry1", trueModel.ManageCountry1) ,
new SqlParameter("@BF_IsDeliverManage", trueModel.BF_IsDeliverManage) ,
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
{
@@ -191,6 +195,10 @@
new SqlParameter("@ManageCountry1", trueModel.ManageCountry1) ,
new SqlParameter("@BF_IsDeliverManage", trueModel.BF_IsDeliverManage) ,
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
{
@@ -325,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