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_WageAwardPunish.cs | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_WageAwardPunish.cs b/CY_ECommercePlatform/CY.Model/OA/OA_WageAwardPunish.cs
index 474638b..a19159f 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_WageAwardPunish.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_WageAwardPunish.cs
@@ -28,6 +28,39 @@
private string _operator;
/// <summary>
+ /// 缂栧彿 0 鏈敵璇� 1 宸茬敵璇� 2 鐢宠瘔鎴愬姛 3 鐢宠瘔澶辫触
+ /// </summary>
+ public int? Shifoushensu { get; set; }
+
+ public string ShifoushensuName
+ {
+ get
+ {
+ if(!Shifoushensu.HasValue || Shifoushensu.Value == 0)
+ {
+ return "鏈敵璇�";
+ }
+ else if ( Shifoushensu.Value == 1)
+ {
+ return "宸茬敵璇�";
+ }
+ else if (Shifoushensu.Value == 2)
+ {
+ return "鐢宠瘔鎴愬姛";
+ }
+ else if (Shifoushensu.Value == 3)
+ {
+ return "鐢宠瘔澶辫触";
+ }
+ else
+ {
+ return "鏈敵璇�";
+ }
+
+ }
+ }
+
+ /// <summary>
/// 缂栧彿
/// </summary>
public int? Keyid
@@ -344,6 +377,11 @@
this.PushMoney = isChange ? MyConvert.ConvertToDecimal(value) : PushMoney;
theValue = this.PushMoney;
}
+ else if ("Shifoushensu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 19)
+ {
+ this.Shifoushensu = isChange ? MyConvert.ConvertToInt32(value) : Shifoushensu;
+ theValue = this.Shifoushensu;
+ }
return theValue;
}
--
Gitblit v1.9.1