From 7bcbbbd0459f00ebc3aa7d4f249cb9231a6b5d40 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 31 十月 2025 12:25:17 +0800
Subject: [PATCH] 这个销售绩效查询这个列表中的，你把这个到期类型和到期时间合并，现在到期类型就不要了， 到期时间里面，日期的就显示。时间，他是和金额执行完毕的，就在到期时间里头， 就填上金额执行完毕那个合同金额也是就有金额的显示。金额没得金额的，就先据实结算。好，合同类型这个就不要了。
---
CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs
index ff5b7d3..e07e3fb 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs
@@ -353,6 +353,26 @@
}
/// <summary>
+ /// BF_IsGongwen
+ /// </summary>
+ public bool? BF_IsGongwen
+ {
+ get;
+
+ set;
+ }
+
+ /// <summary>
+ /// BF_IsChangyongziliao
+ /// </summary>
+ public bool? BF_IsChangyongziliao
+ {
+ get;
+
+ set;
+ }
+
+ /// <summary>
/// 鎵�鍦ㄩ儴闂�
/// </summary>
public int? DepartmentId
@@ -594,6 +614,20 @@
_sm_contractendtime = value;
}
}
+
+
+
+ /// <summary>
+ /// 鍚堝悓鍒版湡鏃堕棿
+ /// </summary>
+ public string SM_ContractEndTimeName
+ {
+ get;
+
+ set;
+
+ }
+
/// <summary>
/// 绂昏亴瀹℃壒/鍦ㄨ亴0,鐢宠涓�1,鍚屾剰绂昏亴2,鎷掔粷鐢宠3
/// </summary>
@@ -1336,6 +1370,17 @@
this.BF_Isbaoxiaojingli = isChange ? MyConvert.ConvertToBoolean(value) : BF_Isbaoxiaojingli;
theValue = this.BF_Isbaoxiaojingli;
}
+ else if ("BF_IsGongwen".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 69)
+ {
+ this.BF_IsGongwen = isChange ? MyConvert.ConvertToBoolean(value) : BF_IsGongwen;
+ theValue = this.BF_IsGongwen;
+ }
+ else if ("BF_IsChangyongziliao".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 70)
+ {
+ this.BF_IsChangyongziliao = isChange ? MyConvert.ConvertToBoolean(value) : BF_IsChangyongziliao;
+ theValue = this.BF_IsChangyongziliao;
+ }
+
return theValue;
}
--
Gitblit v1.9.1