|
@@ -9324,9 +9324,9 @@ FROM
|
|
|
|
|
|
//验证城市归属并给默认值
|
|
|
int provinceId = dto.ProvinceId;
|
|
|
- if (provinceId < 1) provinceId = 1408;
|
|
|
+ if (provinceId < 1) provinceId = 122;
|
|
|
|
|
|
- if (provinceId == 1408) //四川
|
|
|
+ if (provinceId == 122) //四川
|
|
|
{
|
|
|
//三公费用-Word明细类型
|
|
|
var wordTypeData = dataSource
|
|
@@ -10033,7 +10033,7 @@ FROM
|
|
|
int provinceId = dto.ProvinceId,
|
|
|
groupId = dto.DiId;
|
|
|
|
|
|
- if (provinceId < 1) provinceId = 1408;
|
|
|
+ if (provinceId < 1) provinceId = 122;
|
|
|
var info = new Grp_EnterExitCost() { ProvinceId = provinceId, DiId = groupId, CurrencyRemark = currencyStr, CreateUserId = dto.CurrUserId };
|
|
|
|
|
|
var add = await _sqlSugar.Insertable(info).ExecuteCommandAsync();
|
|
@@ -10154,7 +10154,7 @@ FROM
|
|
|
if (dto.DiId < 1) return Ok(JsonView(false, MsgTips.DiId));
|
|
|
if (dto.CurrUserId < 1) return Ok(JsonView(false, MsgTips.UserId));
|
|
|
|
|
|
- if (dto.ProvinceId < 1) dto.ProvinceId = 1408;
|
|
|
+ if (dto.ProvinceId < 1) dto.ProvinceId = 122;
|
|
|
|
|
|
var checkboxInfo = _mapper.Map<Grp_EnterExitCost>(dto);
|
|
|
|
|
@@ -10204,7 +10204,7 @@ FROM
|
|
|
public async Task<IActionResult> EnterExitCostMobileOpSingleCheckbox(EnterExitCostMobileOpSingleCheckboxDto dto)
|
|
|
{
|
|
|
int itemTypeId = dto.ItemType, id = dto.Id, currUserId = dto.CurrUserId, diId = dto.DiId, isSelected = dto.IsSelected, provinceId = dto.ProvinceId;
|
|
|
- if (provinceId < 1) provinceId = 1408;
|
|
|
+ if (provinceId < 1) provinceId = 122;
|
|
|
var itemTypes = new List<int>() { 3, 4, 5, 6, 7 };
|
|
|
|
|
|
if (!_portTypeData.Contains(dto.PortType)) return Ok(JsonView(false, MsgTips.Port));
|
|
@@ -10267,7 +10267,7 @@ FROM
|
|
|
if (dto.DiId < 1) return Ok(JsonView(false, MsgTips.DiId));
|
|
|
if (dto.CurrUserId < 1) return Ok(JsonView(false, MsgTips.UserId));
|
|
|
|
|
|
- if (dto.ProvinceId < 1) dto.ProvinceId = 1408;
|
|
|
+ if (dto.ProvinceId < 1) dto.ProvinceId = 122;
|
|
|
|
|
|
var info = _mapper.Map<Grp_EnterExitCost>(dto);
|
|
|
info.FirstItemRemark = dto.FirstItemRemark;
|
|
@@ -10325,7 +10325,7 @@ FROM
|
|
|
if (!_portTypeData.Contains(dto.PortType)) return Ok(JsonView(false, MsgTips.Port));
|
|
|
if (dto.DiId < 1) return Ok(JsonView(false, MsgTips.DiId));
|
|
|
if (dto.CurrUserId < 1) return Ok(JsonView(false, MsgTips.UserId));
|
|
|
- if (dto.ProvinceId < 1) dto.ProvinceId = 1408;
|
|
|
+ if (dto.ProvinceId < 1) dto.ProvinceId = 122;
|
|
|
|
|
|
var info = _mapper.Map<Grp_EnterExitCost>(dto);
|
|
|
|
|
@@ -10747,11 +10747,11 @@ FROM
|
|
|
var dataSource = await _sqlSugar.SqlQueryable<Sys_SetData>(sql).ToListAsync();
|
|
|
|
|
|
int provinceId = dto.ProvinceId;
|
|
|
- if (provinceId < 1) provinceId = 1408;
|
|
|
+ if (provinceId < 1) provinceId = 122;
|
|
|
List<SetDataInfoView> wordTypeData = new List<SetDataInfoView>();
|
|
|
List<SetDataInfoView> excelTypeData = new List<SetDataInfoView>();
|
|
|
|
|
|
- if (provinceId == 1408) //四川
|
|
|
+ if (provinceId == 122) //四川
|
|
|
{
|
|
|
//三公费用-Word明细类型
|
|
|
wordTypeData = dataSource.Where(it => it.STid == 72)
|
|
@@ -10957,7 +10957,7 @@ FROM
|
|
|
{
|
|
|
if (string.IsNullOrEmpty(dto.DraftName)) return Ok(JsonView(false, "草稿名称为空!"));
|
|
|
if (dto.CurrUserId < 1) return Ok(JsonView(false, MsgTips.UserId));
|
|
|
- if (dto.ProvinceId < 1) dto.ProvinceId = 1408;
|
|
|
+ if (dto.ProvinceId < 1) dto.ProvinceId = 122;
|
|
|
|
|
|
var eecInfo = await _sqlSugar.Queryable<Grp_EnterExitCostDraft>().OrderByDescending(x => x.CreateTime).FirstAsync(it => it.DraftName.Equals(dto.DraftName) && it.IsDel == 0);
|
|
|
if (eecInfo != null) return Ok(JsonView(false, "草稿名称重复!"));
|
|
@@ -11466,7 +11466,7 @@ FROM
|
|
|
int id = dto.DraftId;
|
|
|
if (id <= 0) //add
|
|
|
{
|
|
|
- if (dto.ProvinceId < 1) dto.ProvinceId = 1408;
|
|
|
+ if (dto.ProvinceId < 1) dto.ProvinceId = 122;
|
|
|
|
|
|
var add = await _sqlSugar.Insertable(new Grp_EnterExitCostDraft() { ProvinceId = dto.ProvinceId, CurrencyRemark = currencyStr, CreateUserId = dto.CurrUserId }).ExecuteCommandAsync();
|
|
|
|
|
@@ -11587,7 +11587,7 @@ FROM
|
|
|
if (dto.CurrUserId < 1) return Ok(JsonView(false, MsgTips.UserId));
|
|
|
|
|
|
var checkboxInfo = _mapper.Map<Grp_EnterExitCostDraft>(dto);
|
|
|
- if (dto.ProvinceId < 1) dto.ProvinceId = 1408;
|
|
|
+ if (dto.ProvinceId < 1) dto.ProvinceId = 122;
|
|
|
int id = dto.DraftId;
|
|
|
if (id <= 0) //add
|
|
|
{
|
|
@@ -11638,7 +11638,7 @@ FROM
|
|
|
if (currUserId < 1) return Ok(JsonView(false, MsgTips.UserId));
|
|
|
if (!itemTypes.Contains(itemTypeId)) return Ok(JsonView(false, $"请传入要修改的项类型;3:住宿费; 4:伙食费; 5:公杂费; 6:培训费;7:其他;"));
|
|
|
|
|
|
- if (dto.ProvinceId < 1) dto.ProvinceId = 1408;
|
|
|
+ if (dto.ProvinceId < 1) dto.ProvinceId = 122;
|
|
|
var checkboxInfo = new Grp_EnterExitCostDraft()
|
|
|
{
|
|
|
Id = draftId,
|
|
@@ -11690,7 +11690,7 @@ FROM
|
|
|
if (id < 1) return Ok(JsonView(false, MsgTips.DiId));
|
|
|
if (currUserId < 1) return Ok(JsonView(false, MsgTips.UserId));
|
|
|
|
|
|
- if (dto.ProvinceId < 1) dto.ProvinceId = 1408;
|
|
|
+ if (dto.ProvinceId < 1) dto.ProvinceId = 122;
|
|
|
|
|
|
var info = _mapper.Map<Grp_EnterExitCostDraft>(dto);
|
|
|
info.ProvinceId = dto.ProvinceId;
|
|
@@ -11747,7 +11747,7 @@ FROM
|
|
|
if (id < 1) return Ok(JsonView(false, MsgTips.DiId));
|
|
|
if (dto.CurrUserId < 1) return Ok(JsonView(false, MsgTips.UserId));
|
|
|
|
|
|
- if (dto.ProvinceId < 1) dto.ProvinceId = 1408;
|
|
|
+ if (dto.ProvinceId < 1) dto.ProvinceId = 122;
|
|
|
|
|
|
var info = _mapper.Map<Grp_EnterExitCostDraft>(dto);
|
|
|
info.ProvinceId = dto.ProvinceId;
|