(增加)会务物料、物料清单【Bus_ConfItemListInfo、Bus_ConfItemInfo】;

(修改)流程管控返回视图字段优化

OASystem/EntitySync/Program.cs

@@ -1,4 +1,5 @@
 using OASystem.Domain.Entities;
+using OASystem.Domain.Entities.Business;
 using OASystem.Domain.Entities.Customer;
 using OASystem.Domain.Entities.Groups;
 using OASystem.Domain.Entities.Resource;
@@ -83,11 +84,12 @@ db.CodeFirst.SetStringDefaultLength(50).BackupTable().InitTables(new Type[]
     //typeof(Crm_DeleClient)
     //typeof(Crm_NewClientData)
 
-    typeof(Crm_ClientDataAndUser),
-    typeof(Crm_ClientDataAndBusiness),
+    //typeof(Crm_ClientDataAndUser),
+    //typeof(Crm_ClientDataAndBusiness),
     
     //typeof(Res_ItemDetailInfo),
     //typeof(Res_ItemVendor)
-    typeof(Res_CountryFeeCost)
+    typeof(Bus_ConfItemInfo)
+    //typeof(Res_CountryFeeCost)
 });
 Console.WriteLine("数据库结构同步完成!");

OASystem/OASystem.Api/Controllers/BusinessController.cs

@@ -51,7 +51,7 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostConfItemList(int ConfId)
         {
-
+            
 
             return Ok(JsonView(false));
         }

OASystem/OASystem.Domain/Entities/Business/Bus_ConfItemInfo.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Business
+{
+    /// <summary>
+    /// 会务采购物品
+    /// </summary>
+    [SugarTable("Bus_ConfItem")]
+    public class Bus_ConfItemInfo : EntityBase
+    {
+        /// <summary>
+        /// 物料编号
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int ItemId { get; set; }
+        /// <summary>
+        /// 清单Id
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int ConfListId { get; set; }
+        /// <summary>
+        /// 采购数量
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int Count { get; set; }
+        /// <summary>
+        /// 本次采购金额
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(9,2)")]
+        public decimal CurrCost { get; set; }
+        /// <summary>
+        /// 操作备注
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(500)")]
+        public string OpRemark { get; set; }
+    }
+}

OASystem/OASystem.Domain/Entities/Business/Bus_ConfItemListInfo.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Business
+{
+    [SugarTable("Bus_ConfItemList")]
+    public class Bus_ConfItemListInfo : EntityBase
+    {
+        /// <summary>
+        /// 团组(会议)编号
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int Diid { get; set; }
+        /// <summary>
+        /// 总计成本
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
+        public decimal TotalCost { get; set; }
+
+    }
+}

OASystem/OASystem.Domain/ViewModels/Business/Bus_ConfItemListView.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.ViewModels.Business
+{
+    public class Bus_ConfItemListView
+    {
+        public int MyProperty { get; set; }
+    }
+}

OASystem/OASystem.Domain/ViewModels/Groups/Grp_ScheduleDetailView.cs

@@ -37,6 +37,7 @@ namespace OASystem.Domain.ViewModels.Groups
         public string Remark { get; set; }
         public int Exception { get; set; }
         public int Level { get; set; }
+        public int StepStatus { get; set; }
         public List<Grp_ScheduleDetailView> ChildList { get; set; }
     }
 }

OASystem/OASystem.Infrastructure/Repositories/Groups/GrpScheduleRepository.cs

@@ -105,6 +105,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 temp.Remark = item.Remark;
                 temp.Root = item.ParentStep;
                 temp.Step = item.Step;
+                temp.StepStatus = item.StepStatus;
 
                 List<Grp_ScheduleDetailInfo> tempLv3List = LV3List.Where(s => s.ParentStep == item.Step).ToList();
                 List<Grp_ScheduleDetailView> tempChildList = new List<Grp_ScheduleDetailView>();
@@ -124,6 +125,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         temp2.Remark = item2.Remark;
                         temp2.Root = item2.ParentStep;
                         temp2.Step = item2.Step;
+                        temp2.StepStatus = item2.StepStatus;
                         tempChildList.Add(temp2);
                     }
                 }