diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs index e25f16e..6c89f24 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs @@ -1,39 +1,40 @@ -using APT.BaseData.Domain.Entities.FM; +using APT.BaseData.Domain.Entities; +using APT.BaseData.Domain.Entities.FM; +using APT.BaseData.Domain.Entities.OP; using APT.BaseData.Domain.Enums; -using APT.BaseData.Domain.Entities; +using APT.BaseData.Domain.Enums.PF; using APT.BaseData.Domain.IServices; +using APT.BaseData.Domain.IServices.FM; +using APT.Infrastructure.Api; using APT.Infrastructure.Core; +using APT.Migrations; +using APT.MS.Domain.Entities.BI; +using APT.MS.Domain.Entities.BS; using APT.MS.Domain.Entities.FO; +using APT.MS.Domain.Entities.HM; +using APT.MS.Domain.Entities.SC.PT; +using APT.MS.Domain.Entities.SE; +using APT.MS.Domain.Enums; using APT.Utility; +using APT.WebApi.Models; +using Castle.Core.Internal; +using Google.Protobuf.Collections; +using ICSharpCode.SharpZipLib.Core; +using InfluxData.Net.InfluxDb.Enums; using Microsoft.AspNetCore.Mvc; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.Extensions.Logging; +using MySqlX.XDevAPI.Common; +using NPOI.SS.Formula.Functions; +using NPOI.Util; +using Org.BouncyCastle.Utilities; using System; using System.Collections.Generic; -using System.Linq; -using APT.BaseData.Domain.IServices.FM; -using APT.MS.Domain.Entities.HM; -using APT.MS.Domain.Enums; using System.Drawing; -using APT.MS.Domain.Entities.BS; -using APT.MS.Domain.Entities.SC.PT; -using Castle.Core.Internal; -using ICSharpCode.SharpZipLib.Core; -using APT.MS.Domain.Entities.SE; -using APT.BaseData.Domain.Enums.PF; -using APT.MS.Domain.Entities.BI; -using Google.Protobuf.Collections; -using InfluxData.Net.InfluxDb.Enums; -using NPOI.Util; -using APT.BaseData.Domain.Entities.OP; -using APT.Migrations; -using APT.Infrastructure.Api; -using Org.BouncyCastle.Utilities; +using System.Linq; using System.Linq.Expressions; -using MySqlX.XDevAPI.Common; using System.Threading.Tasks; -using NPOI.SS.Formula.Functions; -using APT.WebApi.Models; -using Microsoft.Extensions.Logging; -using Microsoft.CodeAnalysis.CSharp.Syntax; +using static NPOI.HSSF.Util.HSSFColor; namespace APT.PP.WebApi.Controllers.Api.PP { @@ -2763,11 +2764,104 @@ namespace APT.PP.WebApi.Controllers.Api.PP return true; }); - } - + } + #endregion + + /// + /// 每天更新人员及班组管理表 + /// + /// + /// + [HttpPost, Route("UpdateTeamInfoSync")] + public JsonActionResult UpdateTeamInfoSync([FromBody] KeywordFilter filter) + { + return SafeExecute(() => + { + try + { + var teamLists = new List(); + var teamPersonLists = new List(); + var teamPersonIds = new List(); + var departs = this.GetEntities(t => t.ENABLE_STATUS == 0 && t.CATEGORY == FMCATEGORY.ACTURE && t.DEPARTMENT_TYPE == (int)FMDepartmentType.Class,new BaseFilter(filter.OrgId)); + var departIds = departs.Select(t => t.ID).ToList(); + var teams = this.GetEntities(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId)); + var teamPersons = this.GetEntities< T_FM_TEAM_PERSON> (t =>true, new BaseFilter(filter.OrgId)); + var users = this.GetEntities(t => t.ENABLE_STATUS == 0 && t.DEPARTMENT_ID != null && departIds.Contains((Guid)t.DEPARTMENT_ID),new BaseFilter(filter.OrgId)); + if (departIds != null && departIds.Any()) + { + foreach (var item in departIds) + { + var departInfo = departs.FirstOrDefault(t => t.ID == item); + var userInfo = users.FirstOrDefault(t => t.ID == departInfo?.USER_ID); + var persons = users.Where(t => t.DEPARTMENT_ID == item && t.PERSON_ID != null).ToList(); + var teamInfo = teams.FirstOrDefault(t => t.DEPARTMENT_ID == item); + if (teamInfo == null) + { + T_FM_TEAM team = new T_FM_TEAM(); + team.ORG_ID = filter.OrgId; + team.CHARGE_PERSON_ID = userInfo?.ID; + team.NAME = departInfo.NAME; + team.ENABLE_STATUS = 0; + team.DEPARTMENT_ID = item; + teamLists.Add(team); + if (persons != null && persons.Any()) + { + foreach (var per in persons) + { + T_FM_TEAM_PERSON person = new T_FM_TEAM_PERSON(); + person.ORG_ID = filter.OrgId; + person.TEAM_ID = team.ID; + person.PERSON_ID = (Guid)per.PERSON_ID; + teamPersonLists.Add(person); + } + } + } + else + { + teamInfo.CHARGE_PERSON_ID = userInfo?.ID; + teamLists.Add(teamInfo); + var personIds = teamPersons.Where(t => t.TEAM_ID == teamInfo.ID).Select(m=>m.PERSON_ID).ToList(); + if (persons != null && persons.Any()) + { + foreach (var per in persons) + { + if (!personIds.Contains((Guid)per.PERSON_ID)) + { + T_FM_TEAM_PERSON person = new T_FM_TEAM_PERSON(); + person.ORG_ID = filter.OrgId; + person.TEAM_ID = teamInfo.ID; + person.PERSON_ID = (Guid)per.PERSON_ID; + teamPersonLists.Add(person); + } + } + } + var deletePersonIds = users.Where(t => personIds.Contains((Guid)t.PERSON_ID) && t.DEPARTMENT_ID != teamInfo.DEPARTMENT_ID).Select(m=>m.PERSON_ID).ToList(); + teamPersonIds = teamPersons.Where(t => deletePersonIds.Contains(t.PERSON_ID)).Select(m => m.ID).ToList(); + } + } + } + UnifiedCommit(() => + { + if (teamLists != null && teamLists.Any()) + BantchSaveEntityNoCommit(teamLists); + if (teamPersonLists != null && teamPersonLists.Any()) + BantchSaveEntityNoCommit(teamPersonLists); + if (teamPersonIds != null && teamPersonIds.Any()) + BantchDeleteEntityNoCommit(teamPersonIds); + }); + } + catch (Exception ex) + { + if (!string.IsNullOrEmpty(ex.StackTrace)) + throw new Exception("错误日志:[StackTrace]" + ex.StackTrace); + else + throw new Exception("【" + HttpContext.Request.Path + "】错误日志:[Message]" + ex.Message); + } - + return true; + }); + } } public class RiskInfo diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskAreaController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskAreaController.cs index 7ce8628..6c9a69b 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskAreaController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskAreaController.cs @@ -1,4 +1,5 @@ -using APT.Infrastructure.Core; +using APT.BaseData.Domain.Entities; +using APT.Infrastructure.Core; using APT.MS.Domain.Entities.HM; using APT.MS.Domain.Entities.SK; using APT.MS.Domain.Enums; @@ -6,8 +7,8 @@ using APT.Utility; using Microsoft.AspNetCore.Mvc; using System; using System.Collections.Generic; -using System.Linq.Expressions; using System.Linq; +using System.Linq.Expressions; namespace APT.SK.WebApi.Controllers.Api { @@ -85,6 +86,34 @@ namespace APT.SK.WebApi.Controllers.Api result.Data = info.Data; result.IsSuccessful = info.IsSuccessful; }); + } + /// + /// 根据主键删除数据 + /// + /// 主键ID + /// + [HttpGet, Route("SKDelete")] + public JsonActionResult SKDelete(string id) + { + return SafeExecute(() => + { + if (string.IsNullOrEmpty(id)) + this.ThrowError("060010"); + var area = this.GetEntity(id); + var areas = new List(); + if (area != null) + { + area.IS_DELETED = true; + areas.Add(area); + } + UnifiedCommit(() => + { + if (area != null) + this.BantchUpdateEntity_noneBase(areas); + + }); + return true; + }); } } } \ No newline at end of file