lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC

This commit is contained in:
李鹏飞 2023-07-24 21:05:50 +08:00
parent 1f4b1004d1 9db016519d
commit 0773e912df
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs
View File

@ -87,7 +87,7 @@ namespace BLL
if (!string.IsNullOrEmpty(controlPointType)) if (!string.IsNullOrEmpty(controlPointType))
{ {
string[] types = controlPointType.Split(','); string[] types = controlPointType.Split(',');
q = q.Where(e=> types.Contains(e.ControlPointType)); q = q.Where(e => types.Contains(e.ControlPointType));
} }
if (UnitWorkId != "0") if (UnitWorkId != "0")
{ {
@ -155,8 +155,8 @@ namespace BLL
/// <param name="startRowIndex"></param> /// <param name="startRowIndex"></param>
/// <param name="maximumRows"></param> /// <param name="maximumRows"></param>
/// <returns></returns> /// <returns></returns>
public static int GetListCount(string projectId, string name, string startDate, string endDate) public static int GetListCount(string projectId, string name, string startDate, string endDate)
{ {
return count; return count;
} }
public static DataSet GetListData(string projectId, string name, string startDate, string endDate, int startRowIndex, int maximumRows) public static DataSet GetListData(string projectId, string name, string startDate, string endDate, int startRowIndex, int maximumRows)
@ -196,13 +196,13 @@ namespace BLL
dataTable.Columns.Add(row.ToString()); dataTable.Columns.Add(row.ToString());
} }
data.Tables.Add(dataTable); data.Tables.Add(dataTable);
for (int i = startRowIndex; i <= (startRowIndex + maximumRows)&&i<dataSet.Tables[0].Rows.Count; i++) for (int i = startRowIndex; i <= (startRowIndex + maximumRows) && i < dataSet.Tables[0].Rows.Count; i++)
{ {
var row = dataTable.NewRow(); var row = dataTable.NewRow();
row["AcceptanceCheckMan"] = dataSet.Tables[0].Rows[i]["AcceptanceCheckMan"]; row["AcceptanceCheckMan"] = dataSet.Tables[0].Rows[i]["AcceptanceCheckMan"];
row["SunNumber"] = dataSet.Tables[0].Rows[i]["SunNumber"]; row["SunNumber"] = dataSet.Tables[0].Rows[i]["SunNumber"];
row["OneStatisticsSunNumber"] = dataSet.Tables[0].Rows[i]["OneStatisticsSunNumber"]; row["OneStatisticsSunNumber"] = dataSet.Tables[0].Rows[i]["OneStatisticsSunNumber"];
row["OneStatistics"] = dataSet.Tables[0].Rows[i]["OneStatistics"].ToString() +"%"; row["OneStatistics"] = dataSet.Tables[0].Rows[i]["OneStatistics"].ToString() + "%";
dataTable.Rows.Add(row); dataTable.Rows.Add(row);
} }
return data; return data;
@ -377,7 +377,8 @@ namespace BLL
/// <summary> /// <summary>
/// 根据id修改验收日期和是否一次合格 /// 根据id修改验收日期和是否一次合格
/// </summary> /// </summary>
public static void UpdateByInspectionManagementId(Model.ProcessControl_InspectionManagement inspectionManagement) { public static void UpdateByInspectionManagementId(Model.ProcessControl_InspectionManagement inspectionManagement)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
Model.ProcessControl_InspectionManagement newInspectionManagement = db.ProcessControl_InspectionManagement.FirstOrDefault(e => e.InspectionId == inspectionManagement.InspectionId); Model.ProcessControl_InspectionManagement newInspectionManagement = db.ProcessControl_InspectionManagement.FirstOrDefault(e => e.InspectionId == inspectionManagement.InspectionId);
@ -385,6 +386,11 @@ namespace BLL
{ {
newInspectionManagement.InspectionDate = inspectionManagement.InspectionDate; newInspectionManagement.InspectionDate = inspectionManagement.InspectionDate;
newInspectionManagement.IsOnceQualified = inspectionManagement.IsOnceQualified; newInspectionManagement.IsOnceQualified = inspectionManagement.IsOnceQualified;
if (newInspectionManagement.IsOnceQualified == false)
{
newInspectionManagement.UnqualifiedReason = inspectionManagement.UnqualifiedReason;
}
newInspectionManagement.InspectionCode = inspectionManagement.InspectionCode;
db.SubmitChanges(); db.SubmitChanges();
} }
} }

13
SGGL/WebAPI/Controllers/CQMS/InspectionManagementController.cs
View File

@ -25,6 +25,8 @@ namespace WebAPI.Controllers.CQMS
try try
{ {
InspectionManagementService.UpdateByInspectionManagementId(model); InspectionManagementService.UpdateByInspectionManagementId(model);
//上传附件
SaveAttachFile(model.InspectionId + "R", BLL.Const.InspectionNoticeMenuId, model.AttachUrl);
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -35,5 +37,16 @@ namespace WebAPI.Controllers.CQMS
return responeData; return responeData;
} }
#endregion #endregion
public static void SaveAttachFile(string dataId, string menuId, string url)
{
Model.ToDoItem toDoItem = new Model.ToDoItem
{
MenuId = menuId,
DataId = dataId,
UrlStr = url,
};
APIUpLoadFileService.SaveAttachUrl(toDoItem);
}
} }
} }