yuanrf 1 day ago
parent
commit
4bd1094a21

+ 23 - 6
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -16539,7 +16539,7 @@ FROM
             {
             {
                 var currencys = await EnterExitCostMobileGetCurrencyInit();
                 var currencys = await EnterExitCostMobileGetCurrencyInit();
                 int addId = await _sqlSugar.Insertable(new Grp_EnterExitCost() { DiId = diId, CreateUserId = currUserId, CurrencyRemark = JsonConvert.SerializeObject(currencys) }).ExecuteReturnIdentityAsync();
                 int addId = await _sqlSugar.Insertable(new Grp_EnterExitCost() { DiId = diId, CreateUserId = currUserId, CurrencyRemark = JsonConvert.SerializeObject(currencys) }).ExecuteReturnIdentityAsync();
-                
+
                 parentId = addId;
                 parentId = addId;
             }
             }
 
 
@@ -18255,7 +18255,7 @@ FROM
             {
             {
                 var currencys = await EnterExitCostDraftMobileGetCurrencyInit();
                 var currencys = await EnterExitCostDraftMobileGetCurrencyInit();
                 int addId = await _sqlSugar.Insertable(new Grp_EnterExitCostDraft() { CreateUserId = currUserId, CurrencyRemark = JsonConvert.SerializeObject(currencys) }).ExecuteReturnIdentityAsync();
                 int addId = await _sqlSugar.Insertable(new Grp_EnterExitCostDraft() { CreateUserId = currUserId, CurrencyRemark = JsonConvert.SerializeObject(currencys) }).ExecuteReturnIdentityAsync();
-                
+
                 parentId = addId;
                 parentId = addId;
             }
             }
 
 
@@ -32071,13 +32071,28 @@ ORDER BY
             var isGM = GM.Contains(Dto.UserId);
             var isGM = GM.Contains(Dto.UserId);
             var ConferenceAffairsCost = _sqlSugar.Queryable<Grp_ConferenceAffairsCost>()
             var ConferenceAffairsCost = _sqlSugar.Queryable<Grp_ConferenceAffairsCost>()
                                                  .Where(x => x.IsDel == 0)
                                                  .Where(x => x.IsDel == 0)
-                                                 .Select<ConferenceAffairsCostView>()
                                                  .First(x => x.Diid == di.Id);
                                                  .First(x => x.Diid == di.Id);
 
 
             if (ConferenceAffairsCost == null)
             if (ConferenceAffairsCost == null)
             {
             {
-                ConferenceAffairsCost = new ConferenceAffairsCostView();
-                ConferenceAffairsCost.Diid = di.Id;
+                //插入主表数据
+                ConferenceAffairsCost = new Grp_ConferenceAffairsCost()
+                {
+                    Diid = di.Id,
+                    CreateTime = DateTime.Now,
+                    CreateUserId = Dto.UserId,
+                    IsDel = 0,
+                    AllocationAmount = 0,
+                    AllocationCurrency = 836,
+                    AllocationRate = 0,
+                    AllocationGroupId = di.Id,
+                    CostAll = 0,
+                    BaoJiaAll = 0,
+                    MostCurr = 836,
+                    Remark = "",
+                    City = "",
+                };
+                ConferenceAffairsCost.Id = _sqlSugar.Insertable(ConferenceAffairsCost).ExecuteReturnIdentity();
             }
             }
 
 
             #region 权限校验
             #region 权限校验
@@ -32116,9 +32131,11 @@ ORDER BY
                 ConferenceAffairsCostChi[i - 1].Index = i;
                 ConferenceAffairsCostChi[i - 1].Index = i;
             }
             }
 
 
+            var ConferenceAffairsCostMap = _mapper.Map<ConferenceAffairsCostView>(ConferenceAffairsCost);
+
             var backData = new
             var backData = new
             {
             {
-                ConferenceAffairsCost,
+                ConferenceAffairsCost = ConferenceAffairsCostMap,
                 ConferenceAffairsCostChi,
                 ConferenceAffairsCostChi,
                 typeData,
                 typeData,
                 groupList,
                 groupList,

+ 1 - 0
OASystem/OASystem.Domain/AutoMappers/_baseMappingProfile.cs

@@ -408,6 +408,7 @@ namespace OASystem.Domain.AutoMappers
 
 
             #region 会务成本
             #region 会务成本
             CreateMap<ConferenceAffairsCostView, Grp_ConferenceAffairsCost>();
             CreateMap<ConferenceAffairsCostView, Grp_ConferenceAffairsCost>();
+            CreateMap<Grp_ConferenceAffairsCost, ConferenceAffairsCostView>();
             CreateMap<ConferenceAffairsCostChildView, Grp_ConferenceAffairsCostChild>();
             CreateMap<ConferenceAffairsCostChildView, Grp_ConferenceAffairsCostChild>();
             CreateMap<ConferenceAffairsCostChildExpandView, Grp_ConferenceAffairsCostChild>();
             CreateMap<ConferenceAffairsCostChildExpandView, Grp_ConferenceAffairsCostChild>();
             #endregion
             #endregion