ewide/zsxt_nbzs_h5
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add 任务管理列表

Browse Source 
update
This commit is contained in:
ky_yusj
2021-06-01 17:42:29 +08:00
parent 10000884c7 8749b3a769
commit 141f3c15fd
20 changed files with 812 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Api/Ewide.Application/Enum/ZoneRole.cs → Api/Ewide.Application/Enum/HouseManagerRole.cs
View File

@@ -6,8 +6,23 @@ using System.Threading.Tasks;
namespace Ewide.Application
{
public enum ZoneRole
public enum HouseManagerRole
{
/// <summary>
/// 市住建部门
/// </summary>
CityManager,
/// <summary>
/// 区住建部门
/// </summary>
AreaManager,
/// <summary>
/// 街道管理员
/// </summary>
RoadManager,
/// <summary>
/// 片区监管员
/// </summary>

2
Api/Ewide.Application/Ewide.Application.xml
View File

@@ -544,7 +544,7 @@
片区监管员
</summary>
</member>
<member name="F:Ewide.Application.ZoneRole.HouseSecurityManager">
<member name="F:Ewide.Application.HouseManagerRole.HouseSecurityManager">
<summary>
房屋安全管理员
</summary>

4
Api/Ewide.Application/Service/HouseSafety/HouseMember/HouseMemberService.cs
View File

@@ -265,7 +265,7 @@ WHERE 1=1";
var roleIds = await _sysUserRoleRep.DetachedEntities.Where(p => userIds.Contains(p.SysUserId)).Select(p => p.SysRoleId).ToListAsync();
var _sysRoleRep = Db.GetRepository<SysRole>();
var isExistZoneManager = await _sysRoleRep.DetachedEntities.AnyAsync(p => roleIds.Contains(p.Id) && p.Code == System.Enum.GetName(ZoneRole.ZoneManager).ToUnderScoreCase());
var isExistZoneManager = await _sysRoleRep.DetachedEntities.AnyAsync(p => roleIds.Contains(p.Id) && p.Code == System.Enum.GetName(HouseManagerRole.ZoneManager).ToUnderScoreCase());
// 存在片区监管员，返回安全员, 否则返回监管员
if (isExistZoneManager)
{
@@ -282,7 +282,7 @@ WHERE 1=1";
[NonAction]
private async Task<List<SysRole>> GetRoleRange()
{
var codes = System.Enum.GetNames(typeof(ZoneRole)).Select(p => p.ToUnderScoreCase());
var codes = System.Enum.GetNames(typeof(HouseManagerRole)).Select(p => p.ToUnderScoreCase());
var _sysRoleRep = Db.GetRepository<SysRole>();
var roles = await _sysRoleRep.DetachedEntities.Where(p => codes.Contains(p.Code)).ToListAsync();

28
Api/Ewide.Application/Service/HouseSafety/HouseSelector/HouseSelectorService.cs
View File

@@ -58,15 +58,13 @@ LEFT JOIN sys_area_code RA ON RA.AdCode = SUBSTR(CA.AdCode,1,9)
LEFT JOIN sys_area_code AA ON AA.AdCode = SUBSTR(CA.AdCode,1,6)
LEFT JOIN bs_house_member_relation HM ON HC.Id = HM.HouseCodeId
INNER JOIN (SELECT * FROM sys_emp WHERE Id = @UserId) E ON HC.ZoneId = E.OrgId
WHERE 1=1
AND HM.Id IS NULL
AND HC.Address LIKE @Address
AND HC.HouseCode LIKE @HouseCode";
return await _dapperRep.QueryPageData(sql, input, param: new
WHERE HM.Id IS NULL";
return await _dapperRep.QueryPageDataDynamic(sql, input, param: new
{
input.UserId,
Address = "%" + input.Address + "%",
HouseCode = "%" + input.HouseCode + "%"
input.UserId
}, filterFields: new[] {
nameof(BsHouseCode.Address) ,
nameof(BsHouseCode.CreatedTime)
});
}
@@ -85,15 +83,13 @@ LEFT JOIN bs_house_projectinfo Proj ON Proj.Id=HC.ProjectId
LEFT JOIN sys_area_code CA ON CA.Code = Proj.AreaCode
LEFT JOIN sys_area_code RA ON RA.AdCode = SUBSTR(CA.AdCode,1,9)
LEFT JOIN sys_area_code AA ON AA.AdCode = SUBSTR(CA.AdCode,1,6)
INNER JOIN (SELECT * FROM bs_house_member_relation WHERE SysUserId = @UserId) HM ON HC.Id = HM.HouseCodeId
WHERE 1=1
AND HC.Address LIKE @Address
AND HC.HouseCode LIKE @HouseCode";
return await _dapperRep.QueryPageData(sql, input, param: new
INNER JOIN (SELECT * FROM bs_house_member_relation WHERE SysUserId = @UserId) HM ON HC.Id = HM.HouseCodeId";
return await _dapperRep.QueryPageDataDynamic(sql, input, param: new
{
input.UserId,
Address = "%" + input.Address + "%",
HouseCode = "%" + input.HouseCode + "%"
input.UserId
}, filterFields: new[] {
nameof(BsHouseCode.Address) ,
nameof(BsHouseCode.CreatedTime)
});
}

67
Api/Ewide.Application/Service/HouseSafety/HouseZone/HouseZoneService.cs
View File

@@ -1,10 +1,12 @@
using Ewide.Core;
using Ewide.Core.Service;
using Furion.DatabaseAccessor;
using Furion.DependencyInjection;
using Furion.DynamicApiController;
using Furion.FriendlyException;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
@@ -18,15 +20,22 @@ namespace Ewide.Application.Service
[ApiDescriptionSettings(Name = "HouseZone", Order = 180)]
public class HouseZoneService : IHouseZoneService, IDynamicApiController, ITransient
{
private readonly IUserManager _userManager;
private readonly IRepository<SysOrg> _sysOrgRep;
private readonly IRepository<SysEmp> _sysEmpRep;
private readonly ISysOrgService _sysOrgService;
public HouseZoneService(
IRepository<SysOrg> sysOrgRep,
IRepository<SysEmp> sysEmpRep
IUserManager userManager,
IRepository<SysOrg> sysOrgRep,
IRepository<SysEmp> sysEmpRep,
ISysOrgService sysOrgService
)
{
_userManager = userManager;
_sysOrgRep = sysOrgRep;
_sysEmpRep = sysEmpRep;
_sysOrgService = sysOrgService;
}
/// <summary>
@@ -57,7 +66,7 @@ namespace Ewide.Application.Service
/// </summary>
/// <param name="userId"></param>
/// <returns></returns>
[HttpGet("houseZone/getByUser")]
[HttpGet("/houseZone/getByUser")]
public async Task<string> GetZoneByUser([FromQuery][Required(ErrorMessage = "用户Id不能为空")] string userId)
{
var data = await _sysEmpRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id == userId);
@@ -66,5 +75,57 @@ namespace Ewide.Application.Service
if(org == null) throw Oops.Oh("用户不在片区中");
return org.Id;
}
[HttpGet("/houseZone/autoIncrement")]
public async Task<dynamic> AutoIncrement([FromQuery] string code)
{
var road = await _sysOrgRep.DetachedEntities.FirstOrDefaultAsync(p => p.AreaCode == code);
if (road == null) throw Oops.Oh("组织机构错误");
return await AutoIncrement(road);
}
[NonAction]
public async Task<dynamic> AutoIncrement(SysOrg road)
{
var maxZone = (await _sysOrgRep.DetachedEntities.Where(p => p.Pid == road.Id && p.Type == (int)OrgType.片区).MaxAsync(p => p.Code)) ?? "000";
return Convert.ToInt32(maxZone[^3..]) + 1;
}
[HttpPost("/houseZone/add")]
public async Task AddZone(AddOrgInput input)
{
/*
* 区县市限定所属区域/上级机构是否为当前区
* 街道自动获取所属区域/上级机构
* 自动生成唯一编码, 街道Code+三位编号
*
* 机构类型默认为片区
*/
var org = await _userManager.GetUserOrgInfo();
var areaManager = Enum.GetName(HouseManagerRole.AreaManager).ToUnderScoreCase();
var roadManager = Enum.GetName(HouseManagerRole.RoadManager).ToUnderScoreCase();
var roles = await _userManager.GetUserRoleList();
if (roles.Any(p => p.Code == areaManager))
{
var road = await _sysOrgRep.DetachedEntities.FirstOrDefaultAsync(p => p.AreaCode == input.AreaCode);
if (!road.Pids.Contains(org.Id)) throw Oops.Oh("组织机构错误");
input.Pid = road.Id;
input.Code = road.Code + (await AutoIncrement(road)).ToString().PadLeft(3, '0');
}
else if (roles.Any(p => p.Code == roadManager))
{
input.Pid = org.Id;
input.AreaCode = org.AreaCode;
input.Code = org.Code + (await AutoIncrement(org)).ToString().PadLeft(3, '0');
}
input.Type = (int)OrgType.片区;
await _sysOrgService.AddOrg(input);
}
}
}

57
Api/Ewide.Core/Ewide.Core.xml
View File

@@ -2739,7 +2739,12 @@
获取用户信息
</summary>
<param name="userId"></param>
<param name="tracking"></param>
<returns></returns>
</member>
<member name="M:Ewide.Core.UserManager.CheckUserAsync">
<summary>
获取用户信息
</summary>
<returns></returns>
</member>
<member name="M:Ewide.Core.UserManager.GetUserEmpInfo(System.String)">
@@ -2749,6 +2754,51 @@
<param name="userId"></param>
<returns></returns>
</member>
<member name="M:Ewide.Core.UserManager.GetUserEmpInfo">
<summary>
获取用户员工信息
</summary>
<returns></returns>
</member>
<member name="M:Ewide.Core.UserManager.GetUserOrgInfo(System.String)">
<summary>
获取用户部门信息
</summary>
<param name="userId"></param>
<returns></returns>
</member>
<member name="M:Ewide.Core.UserManager.GetUserOrgInfo">
<summary>
获取用户部门信息
</summary>
<returns></returns>
</member>
<member name="M:Ewide.Core.UserManager.GetUserRoleIdList(System.String)">
<summary>
获取用户角色Id列表
</summary>
<param name="userId"></param>
<returns></returns>
</member>
<member name="M:Ewide.Core.UserManager.GetUserRoleIdList">
<summary>
获取用户角色Id列表
</summary>
<returns></returns>
</member>
<member name="M:Ewide.Core.UserManager.GetUserRoleList(System.String)">
<summary>
获取用户角色列表
</summary>
<param name="userId"></param>
<returns></returns>
</member>
<member name="M:Ewide.Core.UserManager.GetUserRoleList">
<summary>
获取用户角色列表
</summary>
<returns></returns>
</member>
<member name="T:Ewide.Core.OAuth.OAuthConfig">
<summary>
OAuth配置---此结构方便拓展
@@ -5607,6 +5657,11 @@
值
</summary>
</member>
<member name="P:Ewide.Core.Service.OrgTreeNode.Type">
<summary>
类型
</summary>
</member>
<member name="P:Ewide.Core.Service.OrgTreeNode.Weight">
<summary>
排序，越小优先级越高

2
Api/Ewide.Core/Extension/PageExtensions.cs
View File

@@ -33,7 +33,7 @@ namespace Ewide.Core.Extension
var hasSort = type.GetProperty("Sort") != null;
var hasCreatedTime = type.GetProperty("CreatedTime") != null;
var defaultField = hasCreatedTime ? "CreatedTime" : hasSort ? "Sort" : hasId ? "Id" : "";
var defaultField = hasSort ? "Sort" : hasCreatedTime ? "CreatedTime" : hasId ? "Id" : "";
// 排序优先级 创建时间->序号->ID
var orderStr = string.IsNullOrEmpty(defaultField) ? "" : defaultField + (descSort ? " Desc" : " Asc");

10
Api/Ewide.Core/Manager/IUserManager.cs
View File

@@ -11,11 +11,15 @@ namespace Ewide.Core
SysUser User { get; }
string UserId { get; }
Task<SysUser> CheckUserAsync();
Task<SysUser> CheckUserAsync(string userId);
Task<SysEmp> GetUserEmpInfo();
Task<SysUser> CheckUserAsync();
Task<SysEmp> GetUserEmpInfo(string userId);
Task<List<string>> GetUserRoleIdList();
Task<SysEmp> GetUserEmpInfo();
Task<SysOrg> GetUserOrgInfo(string userId);
Task<SysOrg> GetUserOrgInfo();
Task<List<string>> GetUserRoleIdList(string userId);
Task<List<string>> GetUserRoleIdList();
Task<List<SysRole>> GetUserRoleList(string userId);
Task<List<SysRole>> GetUserRoleList();
}
}

63
Api/Ewide.Core/Manager/UserManager.cs
View File

@@ -18,6 +18,7 @@ namespace Ewide.Core
private readonly IRepository<SysRole> _sysRoleRep;
private readonly IRepository<SysUserRole> _sysUserRoleRep;
private readonly IRepository<SysEmp> _sysEmpRep; // 员工表
private readonly IRepository<SysOrg> _sysOrgRep;
private readonly IHttpContextAccessor _httpContextAccessor;
public string UserId
@@ -50,12 +51,14 @@ namespace Ewide.Core
IRepository<SysRole> sysRoleRep,
IRepository<SysUserRole> sysUserRoleRep,
IRepository<SysEmp> sysEmpRep,
IRepository<SysOrg> sysOrgRep,
IHttpContextAccessor httpContextAccessor)
{
_sysUserRep = sysUserRep;
_sysRoleRep = sysRoleRep;
_sysUserRoleRep = sysUserRoleRep;
_sysEmpRep = sysEmpRep;
_sysOrgRep = sysOrgRep;
_httpContextAccessor = httpContextAccessor;
}
@@ -63,7 +66,6 @@ namespace Ewide.Core
/// 获取用户信息
/// </summary>
/// <param name="userId"></param>
/// <param name="tracking"></param>
/// <returns></returns>
public async Task<SysUser> CheckUserAsync(string userId)
{
@@ -71,6 +73,10 @@ namespace Ewide.Core
return user ?? throw Oops.Oh(ErrorCode.D1002);
}
/// <summary>
/// 获取用户信息
/// </summary>
/// <returns></returns>
public async Task<SysUser> CheckUserAsync()
{
return await CheckUserAsync(UserId);
@@ -87,20 +93,75 @@ namespace Ewide.Core
return emp ?? throw Oops.Oh(ErrorCode.D1002);
}
/// <summary>
/// 获取用户员工信息
/// </summary>
/// <returns></returns>
public async Task<SysEmp> GetUserEmpInfo()
{
return await GetUserEmpInfo(UserId);
}
/// <summary>
/// 获取用户部门信息
/// </summary>
/// <param name="userId"></param>
/// <returns></returns>
public async Task<SysOrg> GetUserOrgInfo(string userId)
{
var emp = await GetUserEmpInfo(userId);
var org = await _sysOrgRep.FirstOrDefaultAsync(u => u.Id == emp.OrgId, false);
return org ?? throw Oops.Oh(ErrorCode.D1002);
}
/// <summary>
/// 获取用户部门信息
/// </summary>
/// <returns></returns>
public async Task<SysOrg> GetUserOrgInfo()
{
return await GetUserOrgInfo(UserId);
}
/// <summary>
/// 获取用户角色Id列表
/// </summary>
/// <param name="userId"></param>
/// <returns></returns>
public async Task<List<string>> GetUserRoleIdList(string userId)
{
var roleIds = await _sysUserRoleRep.DetachedEntities.Where(u => u.SysUserId == userId).Select(u => u.SysRoleId).ToListAsync();
return roleIds;
}
/// <summary>
/// 获取用户角色Id列表
/// </summary>
/// <returns></returns>
public async Task<List<string>> GetUserRoleIdList()
{
return await GetUserRoleIdList(UserId);
}
/// <summary>
/// 获取用户角色列表
/// </summary>
/// <param name="userId"></param>
/// <returns></returns>
public async Task<List<SysRole>> GetUserRoleList(string userId)
{
var roleIds = await GetUserRoleIdList(userId);
var roles = await _sysRoleRep.DetachedEntities.Where(u => roleIds.Contains(u.Id)).ToListAsync();
return roles;
}
/// <summary>
/// 获取用户角色列表
/// </summary>
/// <returns></returns>
public async Task<List<SysRole>> GetUserRoleList()
{
return await GetUserRoleList(UserId);
}
}
}

5
Api/Ewide.Core/Service/Org/Dto/OrgTreeNode.cs
View File

@@ -28,6 +28,11 @@ namespace Ewide.Core.Service
/// </summary>
public string Value { get; set; }
/// <summary>
/// 类型
/// </summary>
public int Type { get; set; }
/// <summary>
/// 排序，越小优先级越高
/// </summary>

25
Api/Ewide.Core/Service/Org/SysOrgService.cs
View File

@@ -125,12 +125,10 @@ namespace Ewide.Core.Service
[HttpPost("/sysOrg/add")]
public async Task AddOrg(AddOrgInput input)
{
if (!string.IsNullOrEmpty(input.Code))
{
var isExist = await _sysOrgRep.DetachedEntities.AnyAsync(u => u.Code == input.Code);
if (isExist)
throw Oops.Oh(ErrorCode.D2002);
}
var isExist = await _sysOrgRep.DetachedEntities
.AnyAsync(u => (u.Pid == input.Pid && u.Name == input.Name) || (!string.IsNullOrEmpty(input.Code) && u.Code == input.Code));
if (isExist)
throw Oops.Oh(ErrorCode.D2002);
if (!_userManager.SuperAdmin)
{
@@ -239,12 +237,10 @@ namespace Ewide.Core.Service
if (!_userManager.SuperAdmin && (dataScopes.Count < 1 || !dataScopes.Contains(sysOrg.Id)))
throw Oops.Oh(ErrorCode.D2003);
if (!string.IsNullOrEmpty(input.Code))
{
var isExist = await _sysOrgRep.DetachedEntities.AnyAsync(u => u.Code == input.Code && u.Id != sysOrg.Id);
if (isExist)
throw Oops.Oh(ErrorCode.D2002);
}
var isExist = await _sysOrgRep.DetachedEntities
.AnyAsync(u => ((u.Pid == input.Pid && u.Name == input.Name) || (!string.IsNullOrEmpty(input.Code) && u.Code == input.Code)) && u.Id != sysOrg.Id);
if (isExist)
throw Oops.Oh(ErrorCode.D2002);
// 如果名称有变化，则修改对应员工的机构相关信息
if (!sysOrg.Name.Equals(input.Name))
@@ -309,6 +305,7 @@ namespace Ewide.Core.Service
Id = u.Id,
ParentId = u.Pid,
Title = u.Name,
Type = u.Type,
Value = u.Id.ToString(),
Weight = u.Sort
}).ToListAsync();
@@ -361,9 +358,9 @@ namespace Ewide.Core.Service
{
var org = await _sysOrgRep.FirstOrDefaultAsync(o => o.Id == orgId);
if (dataScopeType == (int)DataScopeType.AREA_WITH_CHILD)
return await _sysOrgRep.DetachedEntities.Where(p => p.AreaCode.StartsWith(org.Code)).Select(p => p.Id).ToListAsync();
return await _sysOrgRep.DetachedEntities.Where(p => p.AreaCode.StartsWith(org.AreaCode)).Select(p => p.Id).ToListAsync();
if (dataScopeType == (int)DataScopeType.AREA)
return await _sysOrgRep.DetachedEntities.Where(p => p.AreaCode == org.Code).Select(p => p.Id).ToListAsync();
return await _sysOrgRep.DetachedEntities.Where(p => p.AreaCode == org.AreaCode).Select(p => p.Id).ToListAsync();
return new List<string>();
}
public async Task<List<string>> GetAreaDataScopeIdListWithoutChildrenArea(string areaNumberCode)

5
Api/Ewide.Core/Service/User/SysUserDataScopeService.cs
View File

@@ -75,9 +75,8 @@ namespace Ewide.Core.Service
List<string> areaDataScopeIdList = new List<string>();
foreach (var areaNumberCode in areaList)
{
areaDataScopeIdList.AddRange(await _sysOrgRep.DetachedEntities.Where(p => p.AreaCode == areaNumberCode).Select(p => p.Id).ToListAsync());
}
//用户自定义的组织权限
areaDataScopeIdList.AddRange(await _sysOrgRep.DetachedEntities.Where(p => p.AreaCode.StartsWith(areaNumberCode)).Select(p => p.Id).ToListAsync());
} //用户自定义的组织权限
var orgIdList = await _sysUserDataScopeRep.DetachedEntities
.Where(u => u.SysUserId == userId)
.Select(u => u.SysOrgId).ToListAsync();