From 847fb7063af8e80bd864709ba8e97f06dc87ac4f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 19 十一月 2025 10:02:48 +0800
Subject: [PATCH] 20251118 查看送货情况列表默认“未送货”和“配送中”的学校 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
index 56a5aa1..635df8e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
@@ -60,6 +60,7 @@
OA_WageManageBLL bll_OA_WageManageBLL = null;
OA_WageAwardPunishBLL bll_OA_WageAwardPunishBLL = null;
OA_CustomerAccessRecordBLL bll_OA_CustomerAccessRecordBLL = null;
+ OA_GongzuozhizeBLL bll_OA_GongzuozhizeBLL = null;
public string old_province = "";
public string old_city = "";
@@ -103,6 +104,7 @@
bll_OA_WageManageBLL = new OA_WageManageBLL();
bll_OA_WageAwardPunishBLL = new OA_WageAwardPunishBLL();
bll_OA_CustomerAccessRecordBLL = new OA_CustomerAccessRecordBLL();
+ bll_OA_GongzuozhizeBLL = new OA_GongzuozhizeBLL();
}
protected void Page_Load(object sender, EventArgs e)
@@ -247,6 +249,18 @@
else if (Request["dateType"] == "shebeiNamecheckname")
{
Response.Write(IsExitsShebeiNameCateName(Request["name"], Request["keyid"]));
+ }
+ else if (Request["dateType"] == "Gongzuozhizeckname")
+ {
+ if (string.IsNullOrEmpty(Request["name"]))
+ {
+ Response.Write(1);
+ }
+ else
+ {
+ Response.Write(IsExitsGongzuozhizeName(Request["name"], Request["keyid"]));
+ }
+
}
else if (Request["dateType"] == "resumeCateChange")
{
@@ -1444,6 +1458,18 @@
return bll_OA_ShebeiManageBLL.IsExitsName(Name, CurrentUser.MemberId, Keyid);
}
+
+ /// <summary>
+ /// 妫�娴嬭鏀跨墿鍝佹槸鍚﹂噸澶�
+ /// </summary>
+ /// <param name="Name"></param>
+ /// <param name="Keyid"></param>
+ /// <returns></returns>
+ public int IsExitsGongzuozhizeName(string Name, string Keyid)
+ {
+ return bll_OA_GongzuozhizeBLL.IsExitsName(Name.ToInt32(), Keyid.ToInt32());
+ }
+
#endregion
#region 鏍规嵁鑱屼綅绫诲埆鑾峰彇鍏ㄩ儴鑱屼綅
@@ -1706,12 +1732,11 @@
OA_WageManage m_OA_WageManage = bll_OA_WageManageBLL.GetModelByMemberId(staffId);
DateTime? calculateTimeStart = (calculateTimeString.Replace("骞�", "-").Replace("鏈�", "-") + "1").ToDateTime2();
DateTime? calculateTimeEnd = calculateTimeStart.Value.AddMonths(1);
-
//濂栧姳鍜岀綒娆�
Pagination pa = new Pagination();
pa.PageSize = 500;
pa.PageIndex = 1;
- List<OA_WageAwardPunish> m_OA_WageAwardPunishList = bll_OA_WageAwardPunishBLL.SelectModelPageByWage(pa, CurrentUser.MemberId, null, m_OA_Staff.Name, calculateTimeString).ToList();
+ List<OA_WageAwardPunish> m_OA_WageAwardPunishList = bll_OA_WageAwardPunishBLL.SelectModelPageByWage(pa, CurrentUser.MemberId, null, m_OA_Staff.Name, calculateTimeString, calculateTimeString).ToList();
if (m_OA_WageAwardPunishList != null && m_OA_WageAwardPunishList.Count == 1)
{
m_OA_WagesRecord.RewardMoney = m_OA_WageAwardPunishList[0].RewardMoney ?? 0;
--
Gitblit v1.9.1