|
@@ -1352,15 +1352,11 @@ ORDER BY
|
|
|
var isDefualtVal = true;
|
|
|
if (provinceId > 0)
|
|
|
{
|
|
|
- Console.WriteLine(item.Id);
|
|
|
- if (item.Id == 2778)
|
|
|
+ var parentId = FindParentIdByChildId(provCityDatas, provinceId);
|
|
|
+ if (parentId != null)
|
|
|
{
|
|
|
- var parentId = FindParentIdByChildId(provCityDatas, provinceId);
|
|
|
- if (parentId != null)
|
|
|
- {
|
|
|
- isDefualtVal = false;
|
|
|
- item.ProvinceId = (int)parentId;
|
|
|
- }
|
|
|
+ isDefualtVal = false;
|
|
|
+ item.ProvinceId = (int)parentId;
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1374,6 +1370,61 @@ ORDER BY
|
|
|
return groupDatas;
|
|
|
}
|
|
|
|
|
|
+ /// <summary>
|
|
|
+ /// 获取单组名称并验证出入境费用明细是否填写
|
|
|
+ /// </summary>
|
|
|
+ /// <param name="dto"></param>
|
|
|
+ /// <returns></returns>
|
|
|
+ public async Task<EnterExitCostGroupNameView> EnterExitCostGroupNameInfoAsync(int groupId)
|
|
|
+ {
|
|
|
+ var groupSql = string.Format(@$"SELECT
|
|
|
+ Id,
|
|
|
+ TeamName GroupName,
|
|
|
+ CityId ProvinceId,
|
|
|
+ CASE
|
|
|
+ WHEN (
|
|
|
+ SELECT
|
|
|
+ COUNT(*)
|
|
|
+ FROM
|
|
|
+ Grp_EnterExitCost
|
|
|
+ WHERE
|
|
|
+ IsDel = 0
|
|
|
+ AND DiId = di.Id
|
|
|
+ ) > 0 THEN 'false'
|
|
|
+ ELSE 'true'
|
|
|
+ END AS [IsNull]
|
|
|
+FROM
|
|
|
+ Grp_DelegationInfo di
|
|
|
+WHERE
|
|
|
+ di.Isdel = 0
|
|
|
+ And Id = {0} ", groupId);
|
|
|
+
|
|
|
+ var groupData = await _sqlSugar.SqlQueryable<EnterExitCostGroupNameView>(groupSql).FirstAsync();
|
|
|
+ var provCityDatas = await ProvinceCityBasicSource();
|
|
|
+ if (provCityDatas.Any() && groupData != null)
|
|
|
+ {
|
|
|
+ var provinceId = groupData.ProvinceId;
|
|
|
+ var isDefualtVal = true;
|
|
|
+ if (provinceId > 0)
|
|
|
+ {
|
|
|
+ var parentId = FindParentIdByChildId(provCityDatas, provinceId);
|
|
|
+ if (parentId != null)
|
|
|
+ {
|
|
|
+ isDefualtVal = false;
|
|
|
+ groupData.ProvinceId = (int)parentId;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (isDefualtVal)
|
|
|
+ {
|
|
|
+ groupData.ProvinceId = 122; //默认四川
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return groupData;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
/// <summary>
|
|
|
/// 递归地遍历树状结构,查找子项的父类 Id。
|
|
|
/// </summary>
|