zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并天辰 作业票

Browse Source
This commit is contained in:
李超
2023-06-10 12:00:41 +08:00
parent 1836f816cf
commit c4bcf04d74
72 changed files with 16423 additions and 2139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/WebAPI/Controllers/HSSE/LicenseController.cs
+60 -5
View File
@@ -26,9 +26,9 @@ namespace WebAPI.Controllers
/// <returns></returns>
public Model.ResponeData getLicenseDataList(string strMenuId, string projectId, string unitId, string states, int pageIndex)
{
var responeData = new Model.ResponeData();
var responeData = new Model.ResponeData();
try
{
{
var getDataList = APILicenseDataService.getLicenseDataList(strMenuId, projectId, unitId, states);
int pageCount = getDataList.Count;
if (pageCount > 0 && pageIndex > 0)
@@ -61,8 +61,13 @@ namespace WebAPI.Controllers
var responeData = new Model.ResponeData();
try
{
var getDataList = APILicenseDataService.getLicenseDataListByStates(projectId, unitId, states, pageIndex);
int pageCount = APILicenseDataService.getLicenseDataStatesCount;
var getDataList = APILicenseDataService.getLicenseDataListByStates(projectId, unitId, states);
int pageCount = getDataList.Count;
if (pageCount > 0 && pageIndex > 0)
{
getDataList = (from x in getDataList.Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize)
select x).ToList();
}
responeData.data = new { pageCount, getDataList };
}
catch (Exception ex)
@@ -224,6 +229,35 @@ namespace WebAPI.Controllers
}
#endregion
#region 撤回作业票当前步骤
/// <summary>
/// 删除作业票步骤
/// </summary>
/// <param name="flowOperateId">审核步骤ID</param>
/// <returns></returns>
[HttpGet]
public Model.ResponeData cancleLicenseFlowOperate(string strMenuId, string dataId, string userId)
{
var responeData = new Model.ResponeData();
try
{
responeData.message = APILicenseDataService.cancleLicenseFlowOperate(strMenuId, dataId, userId);
if (!string.IsNullOrEmpty(responeData.message))
{
responeData.code = 0;
}
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 删除作业票步骤
/// <summary>
/// 删除作业票步骤
@@ -269,8 +303,29 @@ namespace WebAPI.Controllers
return responeData;
}
#endregion
#region 获取作业票审核步骤下步分支
/// <summary>
/// 获取作业票审核步骤下步分支
/// </summary>
/// <param name="flowOperateId">审核步骤ID</param>
/// <returns></returns>
public Model.ResponeData getFinishLicenseFlowOperateGroupList(string dataId)
{
var responeData = new Model.ResponeData();
try
{
responeData.data = APILicenseDataService.getFinishLicenseFlowOperateGroupList(dataId);
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
#region 重申请保存作业票信息
return responeData;
}
#endregion
#region 重申请保存作业票信息getLicenseDataById
/// <summary>
/// 重申请保存作业票信息
/// </summary>