|
@@ -4,6 +4,7 @@ using OASystem.API.OAMethodLib.ALiYun;
|
|
using OASystem.API.OAMethodLib.ExcelOutput;
|
|
using OASystem.API.OAMethodLib.ExcelOutput;
|
|
using OASystem.Domain.Common;
|
|
using OASystem.Domain.Common;
|
|
using OASystem.Domain.Dtos.Business;
|
|
using OASystem.Domain.Dtos.Business;
|
|
|
|
+using OASystem.Domain.Dtos.Financial;
|
|
using OASystem.Domain.Dtos.Groups;
|
|
using OASystem.Domain.Dtos.Groups;
|
|
using OASystem.Domain.Entities.Business;
|
|
using OASystem.Domain.Entities.Business;
|
|
using OASystem.Domain.Entities.Groups;
|
|
using OASystem.Domain.Entities.Groups;
|
|
@@ -118,25 +119,30 @@ namespace OASystem.API.Controllers
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[HttpPost]
|
|
[HttpPost]
|
|
[ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
|
|
[ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
|
|
- public async Task<IActionResult> PostGroupTeamRateByDiIdAndCTableId(int portType, int diId,int CTbale)
|
|
|
|
|
|
+ public async Task<IActionResult> PostGroupTeamRateByDiIdAndCTableId(GeneralTeamRateInfoDto dto)
|
|
{
|
|
{
|
|
try
|
|
try
|
|
{
|
|
{
|
|
- if (diId == 0)
|
|
|
|
|
|
+ if (dto == null)
|
|
|
|
+ {
|
|
|
|
+ return Ok(JsonView(false, "请输入参数!"));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (dto.DiId == 0)
|
|
{
|
|
{
|
|
return Ok(JsonView(false, "请输入正确的团组Id!"));
|
|
return Ok(JsonView(false, "请输入正确的团组Id!"));
|
|
}
|
|
}
|
|
- if (CTbale == 0)
|
|
|
|
|
|
+ if (dto.CTbale == 0)
|
|
{
|
|
{
|
|
return Ok(JsonView(false, "请输入正确的业务类型(CTable)Id!"));
|
|
return Ok(JsonView(false, "请输入正确的业务类型(CTable)Id!"));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
- if (portType == 1 || portType == 2 || portType == 3 )
|
|
|
|
|
|
+ if (dto.PortType == 1 || dto.PortType == 2 || dto.PortType == 3 )
|
|
{
|
|
{
|
|
string teamRateInfoSql = string.Format(@"Select sd.Name,tr.* From Grp_TeamRate tr
|
|
string teamRateInfoSql = string.Format(@"Select sd.Name,tr.* From Grp_TeamRate tr
|
|
Left Join Sys_SetData sd On sd.IsDel=0 And sd.STid=16 And tr.CTable = sd.Id
|
|
Left Join Sys_SetData sd On sd.IsDel=0 And sd.STid=16 And tr.CTable = sd.Id
|
|
- Where tr.IsDel = 0 And tr.DiId = {0} And tr.CTable = {1}", diId,CTbale);
|
|
|
|
|
|
+ Where tr.IsDel = 0 And tr.DiId = {0} And tr.CTable = {1}", dto.DiId,dto.CTbale);
|
|
|
|
|
|
var teamRateInfo = await _teamRateRep._sqlSugar.SqlQueryable<TeamRateInfoView>(teamRateInfoSql).ToListAsync();
|
|
var teamRateInfo = await _teamRateRep._sqlSugar.SqlQueryable<TeamRateInfoView>(teamRateInfoSql).ToListAsync();
|
|
|
|
|