From b8c2edb43cf778ca0203a3a592815aeeb6bcdcde Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 10 七月 2023 21:42:39 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/项目管理/项目阶段/Gy_ProjectStageController.cs |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/Gy_ProjectStageController.cs" "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/Gy_ProjectStageController.cs"
index e9a40f5..18bcc3f 100644
--- "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/Gy_ProjectStageController.cs"
+++ "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/Gy_ProjectStageController.cs"
@@ -837,7 +837,7 @@
             public int RowID;
             public int HEmpID;
             public string HEmpName;
-            public int HIsPM;
+            public bool HIsPM;
             public double HRate;
             public double HAvgMoney;
             public double HCountMoney;
@@ -943,6 +943,8 @@
                 string HRemark = mainList[0].HRemark;
                 string HMaker = mainList[0].HMaker;
                 string HMakerDate = mainList[0].HMakerDate;
+                string HUpdater = mainList[0].HUpdater;
+                string HUpdaterDate = mainList[0].HUpdaterDate;
 
 
                 if (OperationType == 2)
@@ -1007,8 +1009,8 @@
                         "',HBillNo = '" + HBillNo +
                         "',HBillStatus = " + HBillStatus +
                         ",HRemark = '" + HRemark +
-                        "',HMaker = '" + HMaker +
-                        "',HMakeDate = '" + HMakerDate +
+                        "',HUpdater = '" + HUpdater +
+                        "',HUpdateDate = '" + HUpdaterDate +
                         "',HProNumber = '" + HProNumber +
                         "',HProjectStageID = " + HProjectStageID +
                         ",HStageNote = '" + HStageNote +
@@ -1070,7 +1072,7 @@
 
                 int HEntryID = i;
                 int HEmpID = oSub.HEmpID;
-                int HIsPM = oSub.HIsPM;
+                int HIsPM = oSub.HIsPM?1:0;
                 double HRate = oSub.HRate;
                 double HAvgMoney = oSub.HAvgMoney;
                 double HCountMoney = oSub.HCountMoney;

--
Gitblit v1.9.1