Skip to content

P
performance
Commit 43e9ea87 by ruyun.zhang
Options

下载BUG修复

parent b8299bfe
Showing with 389 additions and 7 deletions
performance/Performance.Api/wwwroot/Performance.Api.xml
...@@ -544,22 +544,24 @@ ...@@ -544,22 +544,24 @@
<param name="datas"></param> <param name="datas"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.AttendanceController.DeptCompute(System.Int32,System.String,System.String)"> <member name="M:Performance.Api.Controllers.AttendanceController.DeptCompute(System.Int32,System.String,System.String,System.String)">
<summary> <summary>
科室考勤上报录入结果统计 科室考勤上报录入结果统计
</summary> </summary>
<param name="allotId">绩效月ID</param> <param name="allotId">绩效月ID</param>
<param name="unitType">核算组别</param> <param name="unitType">核算组别</param>
<param name="accountingUnit">核算单元</param> <param name="accountingUnit">核算单元</param>
<param name="searchTxet">工号/姓名</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.AttendanceController.DownloadDeptCompute(System.Int32,System.String,System.String)"> <member name="M:Performance.Api.Controllers.AttendanceController.DownloadDeptCompute(System.Int32,System.String,System.String,System.String)">
<summary> <summary>
科室考勤上报录入结果统计下载 科室考勤上报录入结果统计下载
</summary> </summary>
<param name="allotId">绩效月ID</param> <param name="allotId">绩效月ID</param>
<param name="unitType">核算组别</param> <param name="unitType">核算组别</param>
<param name="accountingUnit">核算单元</param> <param name="accountingUnit">核算单元</param>
<param name="searchTxet">工号/姓名</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.AttendanceController.DeptSubmit(System.Int32,System.String,System.Collections.Generic.List{Performance.DtoModels.Request.AttendanceDept})"> <member name="M:Performance.Api.Controllers.AttendanceController.DeptSubmit(System.Int32,System.String,System.Collections.Generic.List{Performance.DtoModels.Request.AttendanceDept})">
...@@ -589,25 +591,55 @@ ...@@ -589,25 +591,55 @@
<param name="audit"></param> <param name="audit"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.AttendanceController.DeptDetail(System.Int32,System.String,System.String)"> <member name="M:Performance.Api.Controllers.AttendanceController.DeptDetail(System.Int32,System.String,System.String,System.String)">
<summary> <summary>
科室考勤上报结果详情 科室考勤上报结果详情
</summary> </summary>
<param name="allotId">绩效月ID</param> <param name="allotId">绩效月ID</param>
<param name="unitType">核算组别</param> <param name="unitType">核算组别</param>
<param name="accountingUnit">核算单元</param> <param name="accountingUnit">核算单元</param>
<param name="searchTxet">工号/姓名</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.AttendanceController.DeptDetailDownload(System.Int32,System.String,System.String,System.String)"> <member name="M:Performance.Api.Controllers.AttendanceController.DeptDetailDownload(System.Int32,System.String,System.String,System.String,System.String)">
<summary> <summary>
科室考勤上报结果详情下载 科室考勤上报结果详情下载
</summary> </summary>
<param name="allotId">绩效月ID</param> <param name="allotId">绩效月ID</param>
<param name="unitType">核算组别</param> <param name="unitType">核算组别</param>
<param name="accountingUnit">核算单元</param> <param name="accountingUnit">核算单元</param>
<param name="searchTxet">工号/姓名</param>
<param name="fileName"></param> <param name="fileName"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.AttendanceController.DeptReport(System.Int32,System.String,System.String,System.String)">
<summary>
科室考勤上报汇总统计
</summary>
<param name="allotId">绩效月ID</param>
<param name="unitType">核算组别</param>
<param name="accountingUnit">核算单元</param>
<param name="searchTxet">工号/姓名</param>
<returns></returns>
<exception cref="T:Performance.DtoModels.PerformanceException"></exception>
</member>
<member name="M:Performance.Api.Controllers.AttendanceController.DeptReportRefresh(System.Int32)">
<summary>
科室考勤上报汇总数据刷新
</summary>
<param name="allotId"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.AttendanceController.DownloadDeptReport(System.Int32,System.String,System.String,System.String)">
<summary>
科室考勤上报汇总统计下载
</summary>
<param name="allotId">绩效月ID</param>
<param name="unitType">核算组别</param>
<param name="accountingUnit">核算单元</param>
<param name="searchTxet">工号/姓名</param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.BudgetController.Query(Performance.DtoModels.Request.BudgetRequest)"> <member name="M:Performance.Api.Controllers.BudgetController.Query(Performance.DtoModels.Request.BudgetRequest)">
<summary> <summary>
预算管理查询（包含金额、占比） 预算管理查询（包含金额、占比）
......
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
...@@ -3363,6 +3363,76 @@ ...@@ -3363,6 +3363,76 @@
是否附带上次绩效 0 不附带 1 附带 是否附带上次绩效 0 不附带 1 附带
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.AttendanceDeptReport.Code">
<summary>
核算单元编码
</summary>
</member>
<member name="P:Performance.DtoModels.AttendanceDeptReport.AllotID">
<summary>
</summary>
</member>
<member name="P:Performance.DtoModels.AttendanceDeptReport.UnitType">
<summary>
核算组别
</summary>
</member>
<member name="P:Performance.DtoModels.AttendanceDeptReport.AccountingUnit">
<summary>
核算单元
</summary>
</member>
<member name="P:Performance.DtoModels.AttendanceDeptReport.Department">
<summary>
科室名称
</summary>
</member>
<member name="P:Performance.DtoModels.AttendanceDeptReport.PersonnelNumber">
<summary>
工号
</summary>
</member>
<member name="P:Performance.DtoModels.AttendanceDeptReport.PersonnelName">
<summary>
姓名
</summary>
</member>
<member name="P:Performance.DtoModels.AttendanceDeptReport.PermanentStaff">
<summary>
人员系数
</summary>
</member>
<member name="P:Performance.DtoModels.AttendanceDeptReport.BeginDate">
<summary>
在科开始时间
</summary>
</member>
<member name="P:Performance.DtoModels.AttendanceDeptReport.EndDate">
<summary>
在科结束时间
</summary>
</member>
<member name="P:Performance.DtoModels.AttendanceDeptReport.AttendanceDays">
<summary>
出勤天数
</summary>
</member>
<member name="P:Performance.DtoModels.AttendanceDeptReportItem.Value">
<summary>
请假天数
</summary>
</member>
<member name="P:Performance.DtoModels.AttendanceDeptReportItem.Title">
<summary>
考勤类型
</summary>
</member>
<member name="P:Performance.DtoModels.AttendanceDeptReportItem.Remark">
<summary>
备注
</summary>
</member>
<member name="P:Performance.DtoModels.AttendanceStatistics.Code"> <member name="P:Performance.DtoModels.AttendanceStatistics.Code">
<summary> <summary>
核算单元编码 核算单元编码
......
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
...@@ -6203,6 +6203,81 @@ ...@@ -6203,6 +6203,81 @@
01日 01日
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept_report.HospitalId">
<summary>
医院Id
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept_report.AllotId">
<summary>
绩效Id
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept_report.Code">
<summary>
核算单元编码
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept_report.UnitType">
<summary>
人员类别
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept_report.AccountingUnit">
<summary>
核算单元
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept_report.PersonnelNumber">
<summary>
工号
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept_report.PersonnelName">
<summary>
姓名
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept_report.PermanentStaff">
<summary>
人员系数
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept_report.BeginDate">
<summary>
在科开始时间
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept_report.EndDate">
<summary>
在科结束时间
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept_report.WorkFullDays">
<summary>
全勤天数
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept_report.AttendanceDays">
<summary>
出勤天数
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept_report.DeductionDays">
<summary>
核减天数
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept_report.NoDeductionDays">
<summary>
不核减天数
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept_report.CreateTime">
<summary>
创建时间
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_issue.HospitalId"> <member name="P:Performance.EntityModels.Entity.per_attendance_issue.HospitalId">
<summary> <summary>
医院Id 医院Id
......
performance/Performance.DtoModels/Response/AttendanceDeptReport.cs 0 → 100644
using System;
using System.Collections.Generic;
namespace Performance.DtoModels
{
public class AttendanceDeptReport
{
/// <summary>
/// 核算单元编码
/// </summary>
public string Code { get; set; }
/// <summary>
///
/// </summary>
public int AllotID { get; set; }
/// <summary>
/// 核算组别
/// </summary>
public string UnitType { get; set; }
/// <summary>
/// 核算单元
/// </summary>
public string AccountingUnit { get; set; }
/// <summary>
/// 科室名称
/// </summary>
public string Department { get; set; }
/// <summary>
/// 工号
/// </summary>
public string PersonnelNumber { get; set; }
/// <summary>
/// 姓名
/// </summary>
public string PersonnelName { get; set; }
/// <summary>
/// 人员系数
/// </summary>
public decimal? PermanentStaff { get; set; }
/// <summary>
/// 在科开始时间
/// </summary>
public DateTime BeginDate { get; set; }
/// <summary>
/// 在科结束时间
/// </summary>
public DateTime EndDate { get; set; }
public List<AttendanceDeptReportItem> Detial { get; set; }
/// <summary>
/// 出勤天数
/// </summary>
public int AttendanceDays { get; set; }
}
public class AttendanceDeptReportItem
{
/// <summary>
/// 请假天数
/// </summary>
public object Value { get; set; }
/// <summary>
/// 考勤类型
/// </summary>
public string Title { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
}
}
performance/Performance.EntityModels/Context/PerformanceDbContext.cs
...@@ -255,6 +255,7 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options) ...@@ -255,6 +255,7 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
public virtual DbSet<sys_version> sys_version { get; set; } public virtual DbSet<sys_version> sys_version { get; set; }
public virtual DbSet<per_attendance> per_attendance { get; set; } public virtual DbSet<per_attendance> per_attendance { get; set; }
public virtual DbSet<per_attendance_dept> per_attendance_dept { get; set; } public virtual DbSet<per_attendance_dept> per_attendance_dept { get; set; }
public virtual DbSet<per_attendance_dept_report> per_attendance_dept_report { get; set; }
public virtual DbSet<per_attendance_issue> per_attendance_issue { get; set; } public virtual DbSet<per_attendance_issue> per_attendance_issue { get; set; }
public virtual DbSet<per_attendance_type> per_attendance_type { get; set; } public virtual DbSet<per_attendance_type> per_attendance_type { get; set; }
public virtual DbSet<per_attendance_vacation> per_attendance_vacation { get; set; } public virtual DbSet<per_attendance_vacation> per_attendance_vacation { get; set; }
......
performance/Performance.EntityModels/Entity/per_attendance_dept_report.cs 0 → 100644
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels.Entity
{
[Table("per_attendance_dept_report")]
public class per_attendance_dept_report
{
[Key]
public int Id { get; set; }
/// <summary>
/// 医院Id
/// </summary>
public int HospitalId { get; set; }
/// <summary>
/// 绩效Id
/// </summary>
public int AllotId { get; set; }
/// <summary>
/// 核算单元编码
/// </summary>
public string Code { get; set; }
/// <summary>
/// 人员类别
/// </summary>
public string UnitType { get; set; }
/// <summary>
/// 核算单元
/// </summary>
public string AccountingUnit { get; set; }
/// <summary>
/// 工号
/// </summary>
public string PersonnelNumber { get; set; }
/// <summary>
/// 姓名
/// </summary>
public string PersonnelName { get; set; }
/// <summary>
/// 人员系数
/// </summary>
public decimal? PermanentStaff { get; set; }
/// <summary>
/// 在科开始时间
/// </summary>
public DateTime? BeginDate { get; set; }
/// <summary>
/// 在科结束时间
/// </summary>
public DateTime? EndDate { get; set; }
/// <summary>
/// 全勤天数
/// </summary>
public int WorkFullDays { get; set; }
/// <summary>
/// 出勤天数
/// </summary>
public int AttendanceDays { get; set; }
/// <summary>
/// 核减天数
/// </summary>
public int DeductionDays { get; set; }
/// <summary>
/// 不核减天数
/// </summary>
public int NoDeductionDays { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime? CreateTime { get; set; }
}
}
performance/Performance.Repository/Repository/PerforPerAttendanceDeptReportRepository.cs 0 → 100644
using Performance.EntityModels;
using Performance.EntityModels.Entity;
namespace Performance.Repository.Repository
{
public partial class PerforPerAttendanceDeptReportRepository : PerforRepository<per_attendance_dept_report>
{
/// <summary>
/// per_attendance Repository
/// </summary>
public PerforPerAttendanceDeptReportRepository(PerformanceDbContext context) : base(context)
{
}
}
}
performance/Performance.Services/DapperService.cs
...@@ -441,8 +441,7 @@ public int UpdateAllotStates(int allotId, int states, string remark, int generat ...@@ -441,8 +441,7 @@ public int UpdateAllotStates(int allotId, int states, string remark, int generat
/// <param name="allotId"></param> /// <param name="allotId"></param>
/// <param name="unitType"></param> /// <param name="unitType"></param>
/// <param name="accountingUnit"></param> /// <param name="accountingUnit"></param>
/// <param name="personnelName"></param> /// <param name="personnelNameOrNumber"></param>
/// <param name="personnelNumber"></param>
/// <returns></returns> /// <returns></returns>
public IEnumerable<dynamic> QueryAttendanceIssue(int allotId, List<string> unitType, string accountingUnit, string personnelNameOrNumber) public IEnumerable<dynamic> QueryAttendanceIssue(int allotId, List<string> unitType, string accountingUnit, string personnelNameOrNumber)
{ {
...@@ -470,7 +469,52 @@ public IEnumerable<dynamic> QueryAttendanceIssue(int allotId, List<string> unitT ...@@ -470,7 +469,52 @@ public IEnumerable<dynamic> QueryAttendanceIssue(int allotId, List<string> unitT
{ {
sql += " and (personnelNumber like @personnelNameOrNumber or personnelName like @personnelNameOrNumber)"; sql += " and (personnelNumber like @personnelNameOrNumber or personnelName like @personnelNameOrNumber)";
parameters.Add("@personnelNameOrNumber", $"%{personnelNameOrNumber}%"); parameters.Add("@personnelNameOrNumber", $"%{personnelNameOrNumber}%");
} }
return connection.Query(sql, parameters, commandTimeout: 60 * 60);
}
}
catch (Exception ex)
{
_logger.LogError($"SQL执行异常：{ex}");
throw;
}
}
/// <summary>
/// 查询考勤下发绩效视图(运行视图定义)
/// </summary>
/// <param name="allotId"></param>
/// <param name="unitType"></param>
/// <param name="accountingUnit"></param>
/// <param name="personnelNameOrNumber"></param>
/// <returns></returns>
public IEnumerable<dynamic> QueryAttendanceDeptReport(int allotId, string unitType, string accountingUnit, string personnelNameOrNumber)
{
try
{
using (var connection = new MySqlConnection(_options.Value.PerformanceConnectionString))
{
if (connection.State != ConnectionState.Open) connection.Open();
string sql = $@"select * from view_attendance_dept where allotID = @allotId";
DynamicParameters parameters = new DynamicParameters();
parameters.Add("@allotId", allotId);
if (unitType?.Any() == true)
{
sql += " and unitType = @unitType";
parameters.Add("@unitType", unitType);
}
if (!string.IsNullOrEmpty(accountingUnit))
{
sql += " and accountingUnit = @accountingUnit";
parameters.Add("@accountingUnit", accountingUnit);
}
if (!string.IsNullOrEmpty(personnelNameOrNumber))
{
sql += " and (personnelNumber like @personnelNameOrNumber or personnelName like @personnelNameOrNumber)";
parameters.Add("@personnelNameOrNumber", $"%{personnelNameOrNumber}%");
}
return connection.Query(sql, parameters, commandTimeout: 60 * 60); return connection.Query(sql, parameters, commandTimeout: 60 * 60);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment