diff --git a/antis-ncc-admin/.env.development b/antis-ncc-admin/.env.development index bd6266d..2f8e237 100644 --- a/antis-ncc-admin/.env.development +++ b/antis-ncc-admin/.env.development @@ -1,5 +1,6 @@ # 开发 VUE_CLI_BABEL_TRANSPILE_MODULES = true -VUE_APP_BASE_API = 'http://lvqian.antissoft.com' +# VUE_APP_BASE_API = 'http://lvqian.antissoft.com' +VUE_APP_BASE_API = 'http://localhost:2011' VUE_APP_BASE_WSS = 'ws://192.168.110.45:2011/websocket' diff --git a/antis-ncc-admin/src/api/extend/salaryCalculation.js b/antis-ncc-admin/src/api/extend/salaryCalculation.js index 0dd37a4..77ce7a3 100644 --- a/antis-ncc-admin/src/api/extend/salaryCalculation.js +++ b/antis-ncc-admin/src/api/extend/salaryCalculation.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 保存金三角开卡业绩统计数据 export function saveGoldTriangleStatistics(statisticsMonth) { return request({ - url: '/api/Extend/LqStatistics/save-gold-triangle-statistics', + url: '/api/Extend/LqStatistics/save-gold-triangle-stats', method: 'POST', data: { statisticsMonth } }) @@ -12,7 +12,7 @@ export function saveGoldTriangleStatistics(statisticsMonth) { // 保存健康师个人开单业绩统计数据 export function savePersonalPerformanceStatistics(statisticsMonth) { return request({ - url: '/api/Extend/LqStatistics/save-personal-performance-statistics', + url: '/api/Extend/LqStatistics/save-personal-performance-stats', method: 'POST', data: { statisticsMonth } }) @@ -21,7 +21,7 @@ export function savePersonalPerformanceStatistics(statisticsMonth) { // 保存科技部开单业绩统计数据 export function saveTechPerformanceStatistics(statisticsMonth) { return request({ - url: '/api/Extend/LqStatistics/save-tech-performance-statistics', + url: '/api/Extend/LqStatistics/save-tech-performance-stats', method: 'POST', data: { statisticsMonth } }) diff --git a/antis-ncc-admin/src/utils/define.js b/antis-ncc-admin/src/utils/define.js index 63c75ae..0b81f74 100644 --- a/antis-ncc-admin/src/utils/define.js +++ b/antis-ncc-admin/src/utils/define.js @@ -1,7 +1,7 @@ // 开发环境接口配置 // JAVA Boot版本对应后端接口地址 // JAVA Cloud对应网关地址 -const APIURl = 'http://localhost:8061' +const APIURl = 'http://localhost:2011' module.exports = { APIURl: APIURl, diff --git a/antis-ncc-admin/src/views/salaryCalculation/index.vue b/antis-ncc-admin/src/views/salaryCalculation/index.vue index 61d6ca8..d52a753 100644 --- a/antis-ncc-admin/src/views/salaryCalculation/index.vue +++ b/antis-ncc-admin/src/views/salaryCalculation/index.vue @@ -1,199 +1,349 @@ + \ No newline at end of file diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatistics/SalaryStatisticsInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatistics/SalaryStatisticsInput.cs new file mode 100644 index 0000000..d3787f8 --- /dev/null +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatistics/SalaryStatisticsInput.cs @@ -0,0 +1,17 @@ +using System.ComponentModel.DataAnnotations; + +namespace NCC.Extend.Entitys.Dto.LqStatistics +{ + /// + /// 工资统计输入参数 + /// + public class SalaryStatisticsInput + { + /// + /// 统计月份(YYYYMM格式) + /// + [Required(ErrorMessage = "统计月份不能为空")] + [StringLength(6, MinimumLength = 6, ErrorMessage = "统计月份格式错误,请使用YYYYMM格式")] + public string StatisticsMonth { get; set; } + } +} diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs index 0ad0d63..c905dc6 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs @@ -1211,14 +1211,16 @@ namespace NCC.Extend.LqStatistics /// 成功保存统计数据 /// 参数错误 /// 服务器内部错误 - [HttpPost("save-gold-triangle-statistics")] - public async Task SaveGoldTriangleStatistics(string statisticsMonth) + [HttpPost("save-gold-triangle-stats")] + public async Task SaveGoldTriangleStatistics([FromBody] SalaryStatisticsInput input) { - if (string.IsNullOrEmpty(statisticsMonth) || statisticsMonth.Length != 6) + if (input == null || string.IsNullOrEmpty(input.StatisticsMonth) || input.StatisticsMonth.Length != 6) { throw NCCException.Oh("统计月份格式错误,请使用YYYYMM格式"); } + var statisticsMonth = input.StatisticsMonth; + try { // 使用数据库聚合方式,直接在数据库中完成所有统计计算 @@ -1389,14 +1391,16 @@ namespace NCC.Extend.LqStatistics /// 成功保存统计数据 /// 参数错误 /// 服务器内部错误 - [HttpPost("save-personal-performance-statistics")] - public async Task SavePersonalPerformanceStatistics(string statisticsMonth) + [HttpPost("save-personal-performance-stats")] + public async Task SavePersonalPerformanceStatistics([FromBody] SalaryStatisticsInput input) { - if (string.IsNullOrEmpty(statisticsMonth) || statisticsMonth.Length != 6) + if (input == null || string.IsNullOrEmpty(input.StatisticsMonth) || input.StatisticsMonth.Length != 6) { throw NCCException.Oh("统计月份格式错误,请使用YYYYMM格式"); } + var statisticsMonth = input.StatisticsMonth; + try { // 使用数据库聚合方式,直接在数据库中完成所有统计计算 @@ -1662,14 +1666,16 @@ namespace NCC.Extend.LqStatistics /// 成功保存统计数据 /// 参数错误 /// 服务器内部错误 - [HttpPost("save-tech-performance-statistics")] - public async Task SaveTechPerformanceStatistics(string statisticsMonth) + [HttpPost("save-tech-performance-stats")] + public async Task SaveTechPerformanceStatistics([FromBody] SalaryStatisticsInput input) { - if (string.IsNullOrEmpty(statisticsMonth) || statisticsMonth.Length != 6) + if (input == null || string.IsNullOrEmpty(input.StatisticsMonth) || input.StatisticsMonth.Length != 6) { throw NCCException.Oh("统计月份格式错误,请使用YYYYMM格式"); } + var statisticsMonth = input.StatisticsMonth; + try { // 使用数据库聚合方式,只统计开单业绩(开卡流水)