diff --git a/DOAN.Admin.WebApi/Controllers/MES/group/GroupPersonSkillMatrixController.cs b/DOAN.Admin.WebApi/Controllers/MES/group/GroupPersonSkillMatrixController.cs new file mode 100644 index 0000000..3a71622 --- /dev/null +++ b/DOAN.Admin.WebApi/Controllers/MES/group/GroupPersonSkillMatrixController.cs @@ -0,0 +1,108 @@ +using Microsoft.AspNetCore.Mvc; +using DOAN.Model.MES.group; +using DOAN.Model.MES.group.Dto; +using DOAN.Service.group.IService; +using DOAN.Admin.WebApi.Filters; + +//创建时间：2024-08-12 +namespace DOAN.Admin.WebApi.Controllers +{ + /// + /// 人员技能矩阵图 + /// + [Verify] + [Route("mes/groupManagement/GroupPersonSkillMatrix")] + public class GroupPersonSkillMatrixController : BaseController + { + /// + /// 人员技能矩阵图接口 + /// + private readonly IGroupPersonSkillMatrixService _GroupPersonSkillMatrixService; + + public GroupPersonSkillMatrixController(IGroupPersonSkillMatrixService GroupPersonSkillMatrixService) + { + _GroupPersonSkillMatrixService = GroupPersonSkillMatrixService; + } + + /// + /// 查询人员技能矩阵图列表 + /// + /// + /// + [HttpGet("list")] + [ActionPermissionFilter(Permission = "groupManagement:grouppersonskillmatrix:list")] + public IActionResult QueryGroupPersonSkillMatrix([FromQuery] GroupPersonSkillMatrixQueryDto parm) + { + var response = _GroupPersonSkillMatrixService.GetList(parm); + return SUCCESS(response); + } + + + /// + /// 查询人员技能矩阵图详情 + /// + /// + /// + [HttpGet("{Id}")] + [ActionPermissionFilter(Permission = "groupManagement:grouppersonskillmatrix:query")] + public IActionResult GetGroupPersonSkillMatrix(string Id) + { + var response = _GroupPersonSkillMatrixService.GetInfo(Id); + + var info = response.Adapt(); + return SUCCESS(info); + } + + /// + /// 添加人员技能矩阵图 + /// + /// + [HttpPost] + [ActionPermissionFilter(Permission = "groupManagement:grouppersonskillmatrix:add")] + [Log(Title = "人员技能矩阵图", BusinessType = BusinessType.INSERT)] + public IActionResult AddGroupPersonSkillMatrix([FromBody] GroupPersonSkillMatrixDto parm) + { + var modal = parm.Adapt().ToCreate(HttpContext); + + var response = _GroupPersonSkillMatrixService.AddGroupPersonSkillMatrix(modal); + + return SUCCESS(response); + } + + /// + /// 更新人员技能矩阵图 + /// + /// + [HttpPut] + [ActionPermissionFilter(Permission = "groupManagement:grouppersonskillmatrix:edit")] + [Log(Title = "人员技能矩阵图", BusinessType = BusinessType.UPDATE)] + public IActionResult UpdateGroupPersonSkillMatrix([FromBody] GroupPersonSkillMatrixDto parm) + { + var modal = parm.Adapt().ToUpdate(HttpContext); + var response = _GroupPersonSkillMatrixService.UpdateGroupPersonSkillMatrix(modal); + + return ToResponse(response); + } + + /// + /// 删除人员技能矩阵图 + /// + /// + [HttpDelete("{ids}")] + [ActionPermissionFilter(Permission = "groupManagement:grouppersonskillmatrix:delete")] + [Log(Title = "人员技能矩阵图", BusinessType = BusinessType.DELETE)] + public IActionResult DeleteGroupPersonSkillMatrix(string ids) + { + int[] idsArr = Tools.SpitIntArrary(ids); + if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); } + + var response = _GroupPersonSkillMatrixService.Delete(idsArr); + + return ToResponse(response); + } + + + + + } +} \ No newline at end of file diff --git a/DOAN.Admin.WebApi/DataProtection/key-26118b0d-b472-4603-9c7c-6882b3acb8d9.xml b/DOAN.Admin.WebApi/DataProtection/key-26118b0d-b472-4603-9c7c-6882b3acb8d9.xml new file mode 100644 index 0000000..442dfa3 --- /dev/null +++ b/DOAN.Admin.WebApi/DataProtection/key-26118b0d-b472-4603-9c7c-6882b3acb8d9.xml @@ -0,0 +1,16 @@ + + + 2024-08-12T06:14:54.3041032Z + 2024-08-14T03:44:20.6307352Z + 2024-11-10T06:14:53.9862227Z + + + + + + + Yrzn06EqoMRXvV+cO3XK6M+PFfMrzwaHrZ7QnlbOx2bhWX6iqZtwB1TvcEvfLWqQFq35OVWMDGcNjjxAMNfq0Q== + + + + \ No newline at end of file diff --git a/DOAN.Model/MES/group/Dto/GroupPersonSkillMatrixDto.cs b/DOAN.Model/MES/group/Dto/GroupPersonSkillMatrixDto.cs new file mode 100644 index 0000000..7e2577e --- /dev/null +++ b/DOAN.Model/MES/group/Dto/GroupPersonSkillMatrixDto.cs @@ -0,0 +1,41 @@ +using System.ComponentModel.DataAnnotations; + +namespace DOAN.Model.MES.group.Dto +{ + /// + /// 人员技能矩阵图查询对象 + /// + public class GroupPersonSkillMatrixQueryDto : PagerInfo + { + } + + /// + /// 人员技能矩阵图输入输出对象 + /// + public class GroupPersonSkillMatrixDto + { + [Required(ErrorMessage = "雪花不能为空")] + public string Id { get; set; } + + public string SkillName { get; set; } + + public string Image { get; set; } + + public string Vedio { get; set; } + + public string Remark { get; set; } + + public int? Status { get; set; } + + public string CreatedBy { get; set; } + + public DateTime? CreatedTime { get; set; } + + public string UpdatedBy { get; set; } + + public DateTime? UpdatedTime { get; set; } + + + + } +} \ No newline at end of file diff --git a/DOAN.Model/MES/group/GroupPersonSkillMatrix.cs b/DOAN.Model/MES/group/GroupPersonSkillMatrix.cs new file mode 100644 index 0000000..14bba43 --- /dev/null +++ b/DOAN.Model/MES/group/GroupPersonSkillMatrix.cs @@ -0,0 +1,66 @@ +namespace DOAN.Model.MES.group +{ + /// + /// 人员技能矩阵图 + /// + [SugarTable("group_person_skill_matrix")] + public class GroupPersonSkillMatrix + { + /// + /// 雪花 + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = false)] + public string Id { get; set; } + + /// + /// 技能名称 + /// + [SugarColumn(ColumnName = "skill_name")] + public string SkillName { get; set; } + + /// + /// 教学图片 + /// + public string Image { get; set; } + + /// + /// 教学视频 + /// + public string Vedio { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + /// + /// 状态 + /// + public int? Status { get; set; } + + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "cREATED_BY")] + public string CreatedBy { get; set; } + + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "cREATED_TIME")] + public DateTime? CreatedTime { get; set; } + + /// + /// 更新人 + /// + [SugarColumn(ColumnName = "uPDATED_BY")] + public string UpdatedBy { get; set; } + + /// + /// 更新时间 + /// + [SugarColumn(ColumnName = "uPDATED_TIME")] + public DateTime? UpdatedTime { get; set; } + + } +} \ No newline at end of file diff --git a/DOAN.Model/MES/group/GroupRelPersonSkill.cs b/DOAN.Model/MES/group/GroupRelPersonSkill.cs new file mode 100644 index 0000000..d852ac7 --- /dev/null +++ b/DOAN.Model/MES/group/GroupRelPersonSkill.cs @@ -0,0 +1,57 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DOAN.Model.MES.group +{ + /// + /// 人员与技能关联表 + /// + [SugarTable("group_rel_person_skill")] + public class GroupRelPersonSkill + { + /// + /// 技能id + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_skill_id")] + public string FkSkillId { get; set; } + + /// + /// 人员id + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_person_id")] + public string FkPersonId { get; set; } + + /// + /// 评分 + /// + public int? Score { get; set; } + + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "cREATED_TIME")] + public DateTime? CreatedTime { get; set; } + + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "cREATED_BY")] + public string CreatedBy { get; set; } + + /// + /// 更新人 + /// + [SugarColumn(ColumnName = "uPDATED_BY")] + public string UpdatedBy { get; set; } + + /// + /// 更新时间 + /// + [SugarColumn(ColumnName = "uPDATED_TIME")] + public DateTime? UpdatedTime { get; set; } + + } +} \ No newline at end of file diff --git a/DOAN.Model/MES/group/GroupRelWorkstationSkill.cs b/DOAN.Model/MES/group/GroupRelWorkstationSkill.cs new file mode 100644 index 0000000..e4a2cbb --- /dev/null +++ b/DOAN.Model/MES/group/GroupRelWorkstationSkill.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DOAN.Model.MES.group +{ + /// + /// 工位与技能关联表 + /// + [SugarTable("group_rel_workstation_skill")] + public class GroupRelWorkstationSkill + { + /// + /// 技能id + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_skill_id")] + public string FkSkillId { get; set; } + + /// + /// 工位id + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_workstation_id")] + public int FkWorkstationId { get; set; } + + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "cREATED_BY")] + public string CreatedBy { get; set; } + + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "cREATED_TIME")] + public DateTime? CreatedTime { get; set; } + + /// + /// 更新人 + /// + [SugarColumn(ColumnName = "uPDATED_BY")] + public string UpdatedBy { get; set; } + + /// + /// 更新时间 + /// + [SugarColumn(ColumnName = "uPDATED_TIME")] + public DateTime? UpdatedTime { get; set; } + + } +} \ No newline at end of file diff --git a/DOAN.Service/MES/group/GroupPersonService.cs b/DOAN.Service/MES/group/GroupPersonService.cs index 0e05f16..0c67c6f 100644 --- a/DOAN.Service/MES/group/GroupPersonService.cs +++ b/DOAN.Service/MES/group/GroupPersonService.cs @@ -10,7 +10,7 @@ using DOAN.Repository; using DOAN.Service.group.IService; using System.Linq; -namespace DOAN.Service.Business +namespace DOAN.Service.group { /// /// 人员Service业务层处理 diff --git a/DOAN.Service/MES/group/GroupPersonSkillMatrixService.cs b/DOAN.Service/MES/group/GroupPersonSkillMatrixService.cs new file mode 100644 index 0000000..eb19b4c --- /dev/null +++ b/DOAN.Service/MES/group/GroupPersonSkillMatrixService.cs @@ -0,0 +1,86 @@ +using System; +using SqlSugar; +using Infrastructure.Attribute; +using Infrastructure.Extensions; +using DOAN.Model; +using DOAN.Model.Dto; +using DOAN.Model.MES.group; +using DOAN.Model.MES.group.Dto; +using DOAN.Repository; +using DOAN.Service.group.IService; +using System.Linq; + +namespace DOAN.Service.group +{ + /// + /// 人员技能矩阵图Service业务层处理 + /// + [AppService(ServiceType = typeof(IGroupPersonSkillMatrixService), ServiceLifetime = LifeTime.Transient)] + public class GroupPersonSkillMatrixService : BaseService, IGroupPersonSkillMatrixService + { + /// + /// 查询人员技能矩阵图列表 + /// + /// + /// + public PagedInfo GetList(GroupPersonSkillMatrixQueryDto parm) + { + var predicate = Expressionable.Create(); + + var response = Queryable() + .Where(predicate.ToExpression()) + .ToPage(parm); + + return response; + } + + + /// + /// 获取详情 + /// + /// + /// + public GroupPersonSkillMatrix GetInfo(string Id) + { + var response = Queryable() + .Where(x => x.Id == Id) + .First(); + + return response; + } + + /// + /// 添加人员技能矩阵图 + /// + /// + /// + public GroupPersonSkillMatrix AddGroupPersonSkillMatrix(GroupPersonSkillMatrix model) + { + return Context.Insertable(model).ExecuteReturnEntity(); + } + + /// + /// 修改人员技能矩阵图 + /// + /// + /// + public int UpdateGroupPersonSkillMatrix(GroupPersonSkillMatrix model) + { + //var response = Update(w => w.Id == model.Id, it => new GroupPersonSkillMatrix() + //{ + // SkillName = model.SkillName, + // Image = model.Image, + // Vedio = model.Vedio, + // Remark = model.Remark, + // Status = model.Status, + // CreatedBy = model.CreatedBy, + // CreatedTime = model.CreatedTime, + // UpdatedBy = model.UpdatedBy, + // UpdatedTime = model.UpdatedTime, + //}); + //return response; + return Update(model, true); + } + + } +} \ No newline at end of file diff --git a/DOAN.Service/MES/group/IService/IGroupPersonSkillMatrixService.cs b/DOAN.Service/MES/group/IService/IGroupPersonSkillMatrixService.cs new file mode 100644 index 0000000..e708f2e --- /dev/null +++ b/DOAN.Service/MES/group/IService/IGroupPersonSkillMatrixService.cs @@ -0,0 +1,24 @@ +using System; +using DOAN.Model; +using DOAN.Model.Dto; +using DOAN.Model.MES.group; +using DOAN.Model.MES.group.Dto; +using System.Collections.Generic; + +namespace DOAN.Service.group.IService +{ + /// + /// 人员技能矩阵图service接口 + /// + public interface IGroupPersonSkillMatrixService : IBaseService + { + PagedInfo GetList(GroupPersonSkillMatrixQueryDto parm); + + GroupPersonSkillMatrix GetInfo(string Id); + + GroupPersonSkillMatrix AddGroupPersonSkillMatrix(GroupPersonSkillMatrix parm); + + int UpdateGroupPersonSkillMatrix(GroupPersonSkillMatrix parm); + + } +}