|
@@ -4996,32 +4996,7 @@ FROM
|
|
#endregion
|
|
#endregion
|
|
|
|
|
|
#region 团组经理模块 出入境费用
|
|
#region 团组经理模块 出入境费用
|
|
- ///// <summary>
|
|
|
|
- ///// 团组模块 - 出入境费用
|
|
|
|
- ///// </summary>
|
|
|
|
- ///// <returns></returns>
|
|
|
|
- //[HttpPost]
|
|
|
|
- //[ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
|
|
|
|
- //public async Task<IActionResult> SetEnterExitCostCurrencyChange()
|
|
|
|
- //{
|
|
|
|
- // try
|
|
|
|
- // {
|
|
|
|
- // var data = await _enterExitCostRep.SetEnterExitCostCurrencyChange();
|
|
|
|
-
|
|
|
|
- // if (data.Code != 0)
|
|
|
|
- // {
|
|
|
|
- // return Ok(JsonView(false, data.Msg));
|
|
|
|
- // }
|
|
|
|
-
|
|
|
|
- // return Ok(JsonView(true, "查询成功!"));
|
|
|
|
- // }
|
|
|
|
- // catch (Exception ex)
|
|
|
|
- // {
|
|
|
|
- // return Ok(JsonView(false, ex.Message));
|
|
|
|
- // throw;
|
|
|
|
- // }
|
|
|
|
- //}
|
|
|
|
-
|
|
|
|
|
|
+
|
|
/// <summary>
|
|
/// <summary>
|
|
/// 团组模块 - 出入境费用 - 子项 地区更改为 nationalTravelFee 的id
|
|
/// 团组模块 - 出入境费用 - 子项 地区更改为 nationalTravelFee 的id
|
|
/// </summary>
|
|
/// </summary>
|
|
@@ -7103,21 +7078,16 @@ FROM
|
|
[ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
|
|
[ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
|
|
public async Task<IActionResult> PostNationalTravelFeeOperate(NationalTravelFeeOperateDto dto)
|
|
public async Task<IActionResult> PostNationalTravelFeeOperate(NationalTravelFeeOperateDto dto)
|
|
{
|
|
{
|
|
- try
|
|
|
|
- {
|
|
|
|
- var data = await _enterExitCostRep.PostNationalTravelFeeOperate(dto);
|
|
|
|
|
|
|
|
- if (data.Code != 0)
|
|
|
|
- {
|
|
|
|
- return Ok(JsonView(false, data.Msg));
|
|
|
|
- }
|
|
|
|
|
|
+ var data = await _enterExitCostRep.PostNationalTravelFeeOperate(dto);
|
|
|
|
|
|
- return Ok(JsonView(true, "操作成功!", data.Data));
|
|
|
|
- }
|
|
|
|
- catch (Exception ex)
|
|
|
|
|
|
+ if (data.Code != 0)
|
|
{
|
|
{
|
|
- return Ok(JsonView(false, ex.Message));
|
|
|
|
|
|
+ return Ok(JsonView(false, data.Msg));
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ return Ok(JsonView(true, "操作成功!", data.Data));
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|
|
@@ -7128,32 +7098,26 @@ FROM
|
|
[ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
|
|
[ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
|
|
public async Task<IActionResult> PostNationalTravelFeeDel(NationalTravelFeeDelDto dto)
|
|
public async Task<IActionResult> PostNationalTravelFeeDel(NationalTravelFeeDelDto dto)
|
|
{
|
|
{
|
|
- try
|
|
|
|
|
|
+ Grp_NationalTravelFee _nationalTravelFee = new Grp_NationalTravelFee()
|
|
{
|
|
{
|
|
- Grp_NationalTravelFee _nationalTravelFee = new Grp_NationalTravelFee()
|
|
|
|
- {
|
|
|
|
- Id = dto.Id,
|
|
|
|
- DeleteUserId = dto.DeleteUserId,
|
|
|
|
- DeleteTime = DateTime.Now.ToString("yyyy-MM-dd"),
|
|
|
|
- IsDel = 1
|
|
|
|
- };
|
|
|
|
-
|
|
|
|
- var delStatus = await _enterExitCostRep._sqlSugar.Updateable<Grp_NationalTravelFee>(_nationalTravelFee)
|
|
|
|
- .UpdateColumns(it => new { it.DeleteTime, it.DeleteUserId, it.IsDel })
|
|
|
|
- .WhereColumns(it => new { it.Id })
|
|
|
|
- .ExecuteCommandAsync();
|
|
|
|
|
|
+ Id = dto.Id,
|
|
|
|
+ DeleteUserId = dto.DeleteUserId,
|
|
|
|
+ DeleteTime = DateTime.Now.ToString("yyyy-MM-dd"),
|
|
|
|
+ IsDel = 1
|
|
|
|
+ };
|
|
|
|
|
|
- if (delStatus <= 0)
|
|
|
|
- {
|
|
|
|
- return Ok(JsonView(false, "删除失败!"));
|
|
|
|
- }
|
|
|
|
|
|
+ var delStatus = await _enterExitCostRep._sqlSugar.Updateable<Grp_NationalTravelFee>(_nationalTravelFee)
|
|
|
|
+ .UpdateColumns(it => new { it.DeleteTime, it.DeleteUserId, it.IsDel })
|
|
|
|
+ .WhereColumns(it => new { it.Id })
|
|
|
|
+ .ExecuteCommandAsync();
|
|
|
|
|
|
- return Ok(JsonView(true, "操作成功!"));
|
|
|
|
- }
|
|
|
|
- catch (Exception ex)
|
|
|
|
|
|
+ if (delStatus <= 0)
|
|
{
|
|
{
|
|
- return Ok(JsonView(false, ex.Message));
|
|
|
|
|
|
+ return Ok(JsonView(false, "删除失败!"));
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ return Ok(JsonView(true, "操作成功!"));
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|
|
@@ -7867,6 +7831,8 @@ FROM
|
|
|
|
|
|
//消息通知
|
|
//消息通知
|
|
await EnterExitCostMobileOpNotice(dto.DiId, id,dto.CurrUserId);
|
|
await EnterExitCostMobileOpNotice(dto.DiId, id,dto.CurrUserId);
|
|
|
|
+ //汇率信息记录
|
|
|
|
+ await GeneralMethod.RateRecordSave(dto.CurrUserId, id, "出入境费用");
|
|
|
|
|
|
return Ok(JsonView(true));
|
|
return Ok(JsonView(true));
|
|
}
|
|
}
|
|
@@ -8402,6 +8368,47 @@ FROM
|
|
return Ok(JsonView(new { isSelect = dto.IsSelect, itemTotal = itemTotal }));
|
|
return Ok(JsonView(new { isSelect = dto.IsSelect, itemTotal = itemTotal }));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /// <summary>
|
|
|
|
+ /// 团组模块 - 出入境费用-移动端 - 3-6子项删除
|
|
|
|
+ /// </summary>
|
|
|
|
+ /// <returns></returns>
|
|
|
|
+ [HttpPost]
|
|
|
|
+ [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
|
|
|
|
+ public async Task<IActionResult> EnterExitCostMobileSubItemDel(EnterExitCostSubItemDelDto dto)
|
|
|
|
+ {
|
|
|
|
+ var data = await _enterExitCostRep.PostEnterExitCostSubItemDel(dto);
|
|
|
|
+
|
|
|
|
+ if (data.Code != 0)
|
|
|
|
+ {
|
|
|
|
+ return Ok(JsonView(false, data.Msg));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return Ok(JsonView(true, "操作成功!", data.Data));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /// <summary>
|
|
|
|
+ /// 团组模块 - 出入境费用-移动端 - 其他费用删除
|
|
|
|
+ /// </summary>
|
|
|
|
+ /// <param name="dto"></param>
|
|
|
|
+ /// <returns></returns>
|
|
|
|
+ [HttpPost]
|
|
|
|
+ public IActionResult EnterExitCostMobileOtherFeeDel(EnterExitCostSubItemDelDto dto)
|
|
|
|
+ {
|
|
|
|
+ var data = new Grp_DayOtherPrice()
|
|
|
|
+ {
|
|
|
|
+ Id = dto.Id,
|
|
|
|
+ IsDel = 1,
|
|
|
|
+ DeleteUserId = dto.DeleteUserId,
|
|
|
|
+ DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff")
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
+ var del = _sqlSugar.Updateable(data).UpdateColumns(it => new { it.IsDel, it.DeleteUserId, it.DeleteTime }).ExecuteCommand();
|
|
|
|
+
|
|
|
|
+ if (del > 0) return Ok(JsonView(true,"删除成功!"));
|
|
|
|
+
|
|
|
|
+ return Ok(JsonView(false,"删除失败!"));
|
|
|
|
+ }
|
|
|
|
+
|
|
#endregion
|
|
#endregion
|
|
|
|
|
|
#endregion
|
|
#endregion
|