lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
高飞
2026-03-26 14:44:30 +08:00
parent 58f23e59d1
commit 3ea6859aa4
8 changed files with 112 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/WebService/CNCECHSSEWebService.cs
+39
View File
@@ -1,5 +1,6 @@
namespace BLL
{
using Model;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
//using System.Net.Http.Headers;
@@ -2052,6 +2053,44 @@
}
#endregion
#region 集团督查检查驳回整改
/// <summary>
/// 集团督查检查驳回整改
/// </summary>
/// <param name="data"></param>
/// <returns></returns>
public static ResponeData RejectRectify(DCGLCheckRectifyReject data)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var respone = new ResponeData();
var rectifItem = db.DCGL_Check_CheckRectifyItem.FirstOrDefault(x => x.CheckRectifyItemId == data.CheckRectifyItemId);
rectifItem.RealEndDate = null;
rectifItem.Verification = data.Reason;
db.SubmitChanges();
var rectify = db.DCGL_Check_CheckRectify.FirstOrDefault(x => x.CheckRectifyId == rectifItem.CheckRectifyId);
if (rectify != null)
{
var getNoUpdateItem = db.DCGL_Check_CheckRectifyItem.FirstOrDefault(x => x.CheckRectifyId == rectifItem.CheckRectifyId && !x.RealEndDate.HasValue);
if (getNoUpdateItem == null)
{
rectify.HandleState = "3";
}
else
{
rectify.HandleState = "2";
}
db.SubmitChanges();
}
return respone;
}
}
#endregion
#region 督查大队：重点工程项目质量专项整治行动开展情况台账上报
/// <summary>
SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx
+4 -1
View File
@@ -125,7 +125,7 @@
<f:TemplateField ColumnID="tfImageUrl2" MinWidth="120px" HeaderText="整改后" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="tfImageUrl2" runat="server" Text='<%# ConvertImaUrlByImage(Eval("CheckRectifyItemId")) %>'></asp:Label>
<asp:Label ID="lbImageUrl2" runat="server" Text='<%# ConvertImaUrlByImage(Eval("CheckRectifyItemId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:WindowField TextAlign="Center" Width="80px" WindowID="WindowAtt" HeaderText="上传整改" Text="上传照片"
@@ -172,6 +172,9 @@
</f:TextArea>
</Editor>
</f:RenderField>
<f:RenderField Width="120px" ColumnID="Verification" DataField="Verification" FieldType="String"
HeaderTextAlign="Center" TextAlign="Center" HeaderText="驳回整改原因">
</f:RenderField>
<f:RenderField Width="1px" ColumnID="CheckRectifyItemId" DataField="CheckRectifyItemId"
FieldType="String" HeaderText="主键" Hidden="true" HeaderTextAlign="Center">
</f:RenderField>
SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs
+2 -2
View File
@@ -164,7 +164,7 @@ namespace FineUIPro.Web.DCGL.ServerCheck
{
newCheckRectifyItem.RealEndDate = item.RealEndDate;
newCheckRectifyItem.OrderEndPerson = item.OrderEndPerson;
//newCheckRectifyItem.Verification = item.Verification;
newCheckRectifyItem.Verification = null;
BLL.DCGLCheckRectifyItemService.UpdateCheckRectifyItem(newCheckRectifyItem);
}
}
@@ -319,7 +319,7 @@ namespace FineUIPro.Web.DCGL.ServerCheck
}
if (column.ColumnID == "tfImageUrl2")
{
html = (row.FindControl("tfImageUrl2") as AspNet.Label).Text;
html = (row.FindControl("lbImageUrl2") as AspNet.Label).Text;
}
sb.AppendFormat("<td>{0}</td>", html);
}
SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.designer.cs
Generated
+2 -2
View File
@@ -159,13 +159,13 @@ namespace FineUIPro.Web.DCGL.ServerCheck
protected global::System.Web.UI.WebControls.Label lbImageUrl1;
/// <summary>
/// tfImageUrl2 控件。
/// lbImageUrl2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label tfImageUrl2;
protected global::System.Web.UI.WebControls.Label lbImageUrl2;
/// <summary>
/// txtOrderEndPerson 控件。
SGGL/Model/APIItem/HSSE/DCGLCheckRectifyReject.cs
+24
View File
@@ -0,0 +1,24 @@
using Model;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Model
{
/// <summary>
/// 督查检查驳回整改
/// </summary>
public class DCGLCheckRectifyReject
{
public string UnitId { get; set; }
public string ProjectId { get; set; }
public string CheckRectifyId { get; set; }
public string CheckRectifyItemId { get; set; }
public string NoticeItemId { get; set; }
/// <summary>
/// 驳回描述
/// </summary>
public string Reason { get; set; }
}
}
SGGL/Model/Model.csproj
+1
View File
@@ -115,6 +115,7 @@
<Compile Include="APIItem\CQMS\SpotCheckItem.cs" />
<Compile Include="APIItem\CQMS\ToDoModel.cs" />
<Compile Include="APIItem\CQMS\TreeNode.cs" />
<Compile Include="APIItem\HSSE\DCGLCheckRectifyReject.cs" />
<Compile Include="APIItem\HSSE\EmergencyProcessItem.cs" />
<Compile Include="APIItem\HSSE\EmergencyTeamItem.cs" />
<Compile Include="APIItem\HSSE\EquipmentQualityItem.cs" />
SGGL/WebAPI/Controllers/HSSE/DCGLCheckRectifyController.cs
+39
View File
@@ -0,0 +1,39 @@
using BLL;
using Model;
using Mvc.Controllers;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Web.Http;
namespace WebAPI.Controllers
{
/// <summary>
/// 督查检查整改
/// </summary>
public class DCGLCheckRectifyController : ApiController
{
/// <summary>
/// 集团驳回督查检查整改
/// </summary>
/// <param name="data"></param>
/// <returns></returns>
[HttpPost]
public Model.ResponeData RejectRectify([FromBody] DCGLCheckRectifyReject data)
{
var responeData = new Model.ResponeData();
try
{
responeData = CNCECHSSEWebService.RejectRectify(data);
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
}
}
SGGL/WebAPI/WebAPI.csproj
+1
View File
@@ -196,6 +196,7 @@
<Compile Include="Controllers\HJGL\PreDesign\PackagingManageController.cs" />
<Compile Include="Controllers\HJGL\PreDesign\PipelineComponentController.cs" />
<Compile Include="Controllers\HJGL\PreDesign\TrainNumberManageController.cs" />
<Compile Include="Controllers\HSSE\DCGLCheckRectifyController.cs" />
<Compile Include="Controllers\HTGL\HTGLPersonController.cs" />
<Compile Include="Controllers\Person\PersonCheckController.cs" />
<Compile Include="Controllers\CQMS\CheckEquipmentController.cs" />