|
|
@@ -16539,7 +16539,7 @@ FROM
|
|
|
{
|
|
|
var currencys = await EnterExitCostMobileGetCurrencyInit();
|
|
|
int addId = await _sqlSugar.Insertable(new Grp_EnterExitCost() { DiId = diId, CreateUserId = currUserId, CurrencyRemark = JsonConvert.SerializeObject(currencys) }).ExecuteReturnIdentityAsync();
|
|
|
-
|
|
|
+
|
|
|
parentId = addId;
|
|
|
}
|
|
|
|
|
|
@@ -18255,7 +18255,7 @@ FROM
|
|
|
{
|
|
|
var currencys = await EnterExitCostDraftMobileGetCurrencyInit();
|
|
|
int addId = await _sqlSugar.Insertable(new Grp_EnterExitCostDraft() { CreateUserId = currUserId, CurrencyRemark = JsonConvert.SerializeObject(currencys) }).ExecuteReturnIdentityAsync();
|
|
|
-
|
|
|
+
|
|
|
parentId = addId;
|
|
|
}
|
|
|
|
|
|
@@ -32071,13 +32071,28 @@ ORDER BY
|
|
|
var isGM = GM.Contains(Dto.UserId);
|
|
|
var ConferenceAffairsCost = _sqlSugar.Queryable<Grp_ConferenceAffairsCost>()
|
|
|
.Where(x => x.IsDel == 0)
|
|
|
- .Select<ConferenceAffairsCostView>()
|
|
|
.First(x => x.Diid == di.Id);
|
|
|
|
|
|
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 权限校验
|
|
|
@@ -32116,9 +32131,11 @@ ORDER BY
|
|
|
ConferenceAffairsCostChi[i - 1].Index = i;
|
|
|
}
|
|
|
|
|
|
+ var ConferenceAffairsCostMap = _mapper.Map<ConferenceAffairsCostView>(ConferenceAffairsCost);
|
|
|
+
|
|
|
var backData = new
|
|
|
{
|
|
|
- ConferenceAffairsCost,
|
|
|
+ ConferenceAffairsCost = ConferenceAffairsCostMap,
|
|
|
ConferenceAffairsCostChi,
|
|
|
typeData,
|
|
|
groupList,
|