update 完成片区新增
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user