|
@@ -251,29 +251,38 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
{"翻译费", "I/F"},
|
|
|
};
|
|
|
|
|
|
- //获取成本选中
|
|
|
- var checkTopArr = _checkRep.GetCheckBoxsByDiid(grpCarOp.DiId);
|
|
|
var checkedItem = new List<string>();
|
|
|
- if (checkTopArr.Count > 0)
|
|
|
+
|
|
|
+ if (string.IsNullOrWhiteSpace(grpCarOp.SelectCheck))
|
|
|
{
|
|
|
- var FindTop = checkTopArr.Find(x => x.CbType == "Top");
|
|
|
- if (FindTop != null)
|
|
|
+ //获取成本选中
|
|
|
+ var checkTopArr = _checkRep.GetCheckBoxsByDiid(grpCarOp.DiId);
|
|
|
+ if (checkTopArr.Count > 0)
|
|
|
{
|
|
|
- var selectName = FindTop.CbValues.Split(',').ToList<string>();
|
|
|
- foreach (var soureKey in soureDic.Keys)
|
|
|
+ var FindTop = checkTopArr.Find(x => x.CbType == "Top");
|
|
|
+ if (FindTop != null)
|
|
|
{
|
|
|
- var find = selectName.Find(x => x == soureDic[soureKey]);
|
|
|
- if (find == null)
|
|
|
- {
|
|
|
- var Lindex = carTouristGuides.FindIndex(x=>x.SidName == soureKey);
|
|
|
- //carTouristGuides.RemoveRange(Lindex, day + 1);
|
|
|
- } else
|
|
|
+ var selectName = FindTop.CbValues.Split(',').ToList<string>();
|
|
|
+ foreach (var soureKey in soureDic.Keys)
|
|
|
{
|
|
|
- checkedItem.Add(soureKey);
|
|
|
+ var find = selectName.Find(x => x == soureDic[soureKey]);
|
|
|
+ if (find == null)
|
|
|
+ {
|
|
|
+ var Lindex = carTouristGuides.FindIndex(x => x.SidName == soureKey);
|
|
|
+ //carTouristGuides.RemoveRange(Lindex, day + 1);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ checkedItem.Add(soureKey);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ else
|
|
|
+ {
|
|
|
+ checkedItem = grpCarOp.SelectCheck.Split(",").ToList<string>();
|
|
|
+ }
|
|
|
|
|
|
var data = new
|
|
|
{
|
|
@@ -606,6 +615,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
CId = dto.Currency,
|
|
|
ServiceQuotedPrice = c.PayMoney,
|
|
|
OrbitalPrivateTransfer = dto.OrbitalPrivateTransfer,
|
|
|
+ SelectCheck = string.Join(',', dto.SelectCheck)
|
|
|
+
|
|
|
}).ExecuteCommandAsync();
|
|
|
|
|
|
if (CarTouristGuideCTable == 0)
|
|
@@ -618,6 +629,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
}
|
|
|
catch (Exception ex)
|
|
|
{
|
|
|
+ RollbackTran();
|
|
|
return result = new Result() { Code = -2, Msg = "未知错误" };
|
|
|
}
|
|
|
return result;
|