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

督查人员代码合并

This commit is contained in:
夏菊 2025-01-14 09:40:45 +08:00
parent 766b96b2ec
commit 330402c752
11 changed files with 320 additions and 455 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/BLL/SysManage/UserService.cs
View File

@ -238,6 +238,7 @@ namespace BLL
ViceCNProfessionalId = user.ViceCNProfessionalId,
WorkNo = user.WorkNo,
HomePageType = user.HomePageType,
IsInspectionBrigade = user.IsInspectionBrigade
};
db.Sys_User.InsertOnSubmit(newUser);
db.SubmitChanges();
@ -319,6 +320,7 @@ namespace BLL
newUser.ViceCNProfessionalId = user.ViceCNProfessionalId;
newUser.WorkNo = user.WorkNo;
newUser.HomePageType = user.HomePageType;
newUser.IsInspectionBrigade = user.IsInspectionBrigade;
Funs.DB.SubmitChanges();
}
}

32
SGGL/BLL/WebService/CNCECHSSEWebService.cs
View File

@ -3604,6 +3604,38 @@
return responeData.code;
}
#endregion
#region 督查人员推送
public static int PushInspectionBrigadeUser()
{
string baseurl = "/api/InspectionBrigade/SaveInspectionBrigadeUser";
var CollCropCode = BLL.CommonService.GetIsThisUnit()?.CollCropCode;
var userList = from x in Funs.DB.Sys_User
where x.IsInspectionBrigade == true
select new Model.InspectionBrigadeUserItem()
{
UserId = x.UserId,
UserName = x.UserName,
Sex = x.Sex,
Account = x.Account,
Password = x.Password,
IdentityCard = x.IdentityCard,
Telephone = x.Telephone,
CollCropCode = CollCropCode
};
var resultJsonReport = JsonConvert.SerializeObject(userList.ToList());
resultJsonReport = "{\"InspectionBrigadeUserItems\":" + resultJsonReport.Replace("}{", ",") + "}";
var responeData = BLL.ServerService.PushCNCEC(resultJsonReport, baseurl);
return responeData.code;
}
#endregion
}

3
SGGL/FineUIPro.Web/SysManage/UserList.aspx
View File

@ -47,6 +47,9 @@
<f:Button ID="btnImport" ToolTip="导入" Icon="ApplicationAdd" Hidden="true" runat="server"
OnClick="btnImport_Click">
</f:Button>
<f:Button ID="btnUpdata" Text="推送督查人员" Icon="PageSave" runat="server" ConfirmText="确定推送？"
ToolTip="推送" ValidateForms="SimpleForm1" OnClick="btnPush_Click" MarginRight="10px">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>

20
SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs
View File

@ -327,5 +327,25 @@
{
BindGrid();
}
/// <summary>
/// 推送督查人员
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnPush_Click(object sender, EventArgs e)
{
string code = CNCECHSSEWebService.PushInspectionBrigadeUser().ToString();
if (code == "1")
{
ShowNotify("同步成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
return;
}
else
{
Alert.ShowInParent("同步异常，请退出后重试！", MessageBoxIcon.Error);
}
}
}
}

15
SGGL/FineUIPro.Web/SysManage/UserList.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.SysManage {
namespace FineUIPro.Web.SysManage
{
public partial class UserList {
public partial class UserList
{
/// <summary>
/// form1 控件。
@ -111,6 +113,15 @@ namespace FineUIPro.Web.SysManage {
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary>
/// btnUpdata 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnUpdata;
/// <summary>
/// lbtnPro 控件。
/// </summary>

5
SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx
View File

@ -74,6 +74,11 @@
</f:RadioButtonList>
</Items>
</f:FormRow>
<f:FormRow runat="server">
<items>
<f:CheckBox runat="server" Label="是否督查人员" LabelAlign="Right" ID="cbIsInspectionBrigade" />
</items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">

3
SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs
View File

@ -137,6 +137,8 @@ namespace FineUIPro.Web.SysManage
{
this.rblHomePageType.SelectedValue = user.HomePageType;
}
cbIsInspectionBrigade.Checked = user.IsInspectionBrigade ?? false;
}
}
@ -237,6 +239,7 @@ namespace FineUIPro.Web.SysManage
}
}
}
newUser.IsInspectionBrigade = cbIsInspectionBrigade.Checked;
newUser.HomePageType = this.rblHomePageType.SelectedValue;
if (string.IsNullOrEmpty(this.UserId))
{

15
SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.SysManage {
namespace FineUIPro.Web.SysManage
{
public partial class UserListEdit {
public partial class UserListEdit
{
/// <summary>
/// form1 控件。
@ -183,6 +185,15 @@ namespace FineUIPro.Web.SysManage {
/// </remarks>
protected global::FineUIPro.RadioButtonList rblHomePageType;
/// <summary>
/// cbIsInspectionBrigade 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox cbIsInspectionBrigade;
/// <summary>
/// Toolbar1 控件。
/// </summary>

91
SGGL/Model/APIItem/InspectionBrigadeUserItem.cs Normal file
View File

@ -0,0 +1,91 @@
using System;
namespace Model
{
public class InspectionBrigadeUserItem
{
/// <summary>
/// 用户ID
/// </summary>
public string UserId
{
get;
set;
}
/// <summary>
/// 账号
/// </summary>
public string Account
{
get;
set;
}
/// <summary>
/// 密码
/// </summary>
public string Password
{
get;
set;
}
/// <summary>
/// 用户名称
/// </summary>
public string UserName
{
get;
set;
}
/// <summary>
/// 性别
/// </summary>
public string Sex
{
get;
set;
}
/// <summary>
/// 单位ID
/// </summary>
public string UnitId
{
get;
set;
}
/// <summary>
/// 单位名称
/// </summary>
public string UnitName
{
get;
set;
}
/// <summary>
/// 单位社会统一信用代码
/// </summary>
public string CollCropCode
{
get;
set;
}
/// <summary>
/// 身份证
/// </summary>
public string IdentityCard
{
get;
set;
}
/// <summary>
/// 电话
/// </summary>
public string Telephone
{
get;
set;
}
}
}

414
SGGL/Model/Model.cs
View File

@ -1367,9 +1367,6 @@ namespace Model
partial void InsertJDGL_UndergroundPipeCompletion(JDGL_UndergroundPipeCompletion instance);
partial void UpdateJDGL_UndergroundPipeCompletion(JDGL_UndergroundPipeCompletion instance);
partial void DeleteJDGL_UndergroundPipeCompletion(JDGL_UndergroundPipeCompletion instance);
partial void InsertJDGL_WBS(JDGL_WBS instance);
partial void UpdateJDGL_WBS(JDGL_WBS instance);
partial void DeleteJDGL_WBS(JDGL_WBS instance);
partial void InsertJDGL_WeekPlan(JDGL_WeekPlan instance);
partial void UpdateJDGL_WeekPlan(JDGL_WeekPlan instance);
partial void DeleteJDGL_WeekPlan(JDGL_WeekPlan instance);
@ -6349,14 +6346,6 @@ namespace Model
}
}
public System.Data.Linq.Table<JDGL_WBS> JDGL_WBS
{
get
{
return this.GetTable<JDGL_WBS>();
}
}
public System.Data.Linq.Table<JDGL_WeekPlan> JDGL_WeekPlan
{
get
@ -96634,7 +96623,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CertificateNumber", DbType="NVarChar(500)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CertificateNumber", DbType="NVarChar(50)")]
public string CertificateNumber
{
get
@ -219230,333 +219219,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.JDGL_WBS")]
public partial class JDGL_WBS : INotifyPropertyChanging, INotifyPropertyChanged
{
private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
private string _Id;
private string _ProjectId;
private string _ParentId;
private string _ItemName;
private string _ItemNum;
private System.Nullable<System.DateTime> _PlanStart;
private System.Nullable<System.DateTime> _PlanEnd;
private System.Nullable<System.DateTime> _RealityEnd;
private string _PathCode;
private EntityRef<JDGL_WBS> _JDGL_WBS_JDGL_WBS;
private EntityRef<JDGL_WBS> _JDGL_WBS_JDGL_WBS1;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
partial void OnCreated();
partial void OnIdChanging(string value);
partial void OnIdChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
partial void OnParentIdChanging(string value);
partial void OnParentIdChanged();
partial void OnItemNameChanging(string value);
partial void OnItemNameChanged();
partial void OnItemNumChanging(string value);
partial void OnItemNumChanged();
partial void OnPlanStartChanging(System.Nullable<System.DateTime> value);
partial void OnPlanStartChanged();
partial void OnPlanEndChanging(System.Nullable<System.DateTime> value);
partial void OnPlanEndChanged();
partial void OnRealityEndChanging(System.Nullable<System.DateTime> value);
partial void OnRealityEndChanged();
partial void OnPathCodeChanging(string value);
partial void OnPathCodeChanged();
#endregion
public JDGL_WBS()
{
this._JDGL_WBS_JDGL_WBS = default(EntityRef<JDGL_WBS>);
this._JDGL_WBS_JDGL_WBS1 = default(EntityRef<JDGL_WBS>);
OnCreated();
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
public string Id
{
get
{
return this._Id;
}
set
{
if ((this._Id != value))
{
if (this._JDGL_WBS_JDGL_WBS.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnIdChanging(value);
this.SendPropertyChanging();
this._Id = value;
this.SendPropertyChanged("Id");
this.OnIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
public string ProjectId
{
get
{
return this._ProjectId;
}
set
{
if ((this._ProjectId != value))
{
this.OnProjectIdChanging(value);
this.SendPropertyChanging();
this._ProjectId = value;
this.SendPropertyChanged("ProjectId");
this.OnProjectIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ParentId", DbType="NVarChar(50)")]
public string ParentId
{
get
{
return this._ParentId;
}
set
{
if ((this._ParentId != value))
{
this.OnParentIdChanging(value);
this.SendPropertyChanging();
this._ParentId = value;
this.SendPropertyChanged("ParentId");
this.OnParentIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ItemName", DbType="NVarChar(50)")]
public string ItemName
{
get
{
return this._ItemName;
}
set
{
if ((this._ItemName != value))
{
this.OnItemNameChanging(value);
this.SendPropertyChanging();
this._ItemName = value;
this.SendPropertyChanged("ItemName");
this.OnItemNameChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ItemNum", DbType="NVarChar(50)")]
public string ItemNum
{
get
{
return this._ItemNum;
}
set
{
if ((this._ItemNum != value))
{
this.OnItemNumChanging(value);
this.SendPropertyChanging();
this._ItemNum = value;
this.SendPropertyChanged("ItemNum");
this.OnItemNumChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanStart", DbType="DateTime")]
public System.Nullable<System.DateTime> PlanStart
{
get
{
return this._PlanStart;
}
set
{
if ((this._PlanStart != value))
{
this.OnPlanStartChanging(value);
this.SendPropertyChanging();
this._PlanStart = value;
this.SendPropertyChanged("PlanStart");
this.OnPlanStartChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanEnd", DbType="DateTime")]
public System.Nullable<System.DateTime> PlanEnd
{
get
{
return this._PlanEnd;
}
set
{
if ((this._PlanEnd != value))
{
this.OnPlanEndChanging(value);
this.SendPropertyChanging();
this._PlanEnd = value;
this.SendPropertyChanged("PlanEnd");
this.OnPlanEndChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RealityEnd", DbType="DateTime")]
public System.Nullable<System.DateTime> RealityEnd
{
get
{
return this._RealityEnd;
}
set
{
if ((this._RealityEnd != value))
{
this.OnRealityEndChanging(value);
this.SendPropertyChanging();
this._RealityEnd = value;
this.SendPropertyChanged("RealityEnd");
this.OnRealityEndChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PathCode", DbType="NVarChar(50)")]
public string PathCode
{
get
{
return this._PathCode;
}
set
{
if ((this._PathCode != value))
{
this.OnPathCodeChanging(value);
this.SendPropertyChanging();
this._PathCode = value;
this.SendPropertyChanged("PathCode");
this.OnPathCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_WBS_JDGL_WBS", Storage="_JDGL_WBS_JDGL_WBS", ThisKey="Id", OtherKey="Id", IsForeignKey=true)]
public JDGL_WBS JDGL_WBS_JDGL_WBS
{
get
{
return this._JDGL_WBS_JDGL_WBS.Entity;
}
set
{
JDGL_WBS previousValue = this._JDGL_WBS_JDGL_WBS.Entity;
if (((previousValue != value)
|| (this._JDGL_WBS_JDGL_WBS.HasLoadedOrAssignedValue == false)))
{
this.SendPropertyChanging();
if ((previousValue != null))
{
this._JDGL_WBS_JDGL_WBS.Entity = null;
previousValue.JDGL_WBS_JDGL_WBS1 = null;
}
this._JDGL_WBS_JDGL_WBS.Entity = value;
if ((value != null))
{
value.JDGL_WBS_JDGL_WBS1 = this;
this._Id = value.Id;
}
else
{
this._Id = default(string);
}
this.SendPropertyChanged("JDGL_WBS_JDGL_WBS");
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_WBS_JDGL_WBS", Storage="_JDGL_WBS_JDGL_WBS1", ThisKey="Id", OtherKey="Id", IsUnique=true, IsForeignKey=false, DeleteRule="NO ACTION")]
public JDGL_WBS JDGL_WBS_JDGL_WBS1
{
get
{
return this._JDGL_WBS_JDGL_WBS1.Entity;
}
set
{
JDGL_WBS previousValue = this._JDGL_WBS_JDGL_WBS1.Entity;
if (((previousValue != value)
|| (this._JDGL_WBS_JDGL_WBS1.HasLoadedOrAssignedValue == false)))
{
this.SendPropertyChanging();
if ((previousValue != null))
{
this._JDGL_WBS_JDGL_WBS1.Entity = null;
previousValue.JDGL_WBS_JDGL_WBS = null;
}
this._JDGL_WBS_JDGL_WBS1.Entity = value;
if ((value != null))
{
value.JDGL_WBS_JDGL_WBS = this;
}
this.SendPropertyChanged("JDGL_WBS_JDGL_WBS1");
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
protected virtual void SendPropertyChanging()
{
if ((this.PropertyChanging != null))
{
this.PropertyChanging(this, emptyChangingEventArgs);
}
}
protected virtual void SendPropertyChanged(String propertyName)
{
if ((this.PropertyChanged != null))
{
this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.JDGL_WeekPlan")]
public partial class JDGL_WeekPlan : INotifyPropertyChanging, INotifyPropertyChanged
{
@ -260763,10 +260425,10 @@ namespace Model
private string _MeetingHostManOther;
private string _ProjectId;
private string _UnitId;
private string _ProjectId;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -260801,10 +260463,10 @@ namespace Model
partial void OnAttentPersonIdsChanged();
partial void OnMeetingHostManOtherChanging(string value);
partial void OnMeetingHostManOtherChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
partial void OnUnitIdChanging(string value);
partial void OnUnitIdChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
#endregion
public Meeting_CompanySafetyMeeting()
@ -261112,26 +260774,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
public string ProjectId
{
get
{
return this._ProjectId;
}
set
{
if ((this._ProjectId != value))
{
this.OnProjectIdChanging(value);
this.SendPropertyChanging();
this._ProjectId = value;
this.SendPropertyChanged("ProjectId");
this.OnProjectIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
public string UnitId
{
@ -261152,6 +260794,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
public string ProjectId
{
get
{
return this._ProjectId;
}
set
{
if ((this._ProjectId != value))
{
this.OnProjectIdChanging(value);
this.SendPropertyChanging();
this._ProjectId = value;
this.SendPropertyChanged("ProjectId");
this.OnProjectIdChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -280766,7 +280428,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="VarChar(50)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="VarChar(100)")]
public string ProjectName
{
get
@ -359785,6 +359447,8 @@ namespace Model
private string _CompanyProjectId;
private System.Nullable<bool> _IsInspectionBrigade;
private EntitySet<Comprehensive_NCRManagement> _Comprehensive_NCRManagement;
private EntitySet<Comprehensive_PressurePipe> _Comprehensive_PressurePipe;
@ -360599,6 +360263,8 @@ namespace Model
partial void OnHomePageTypeChanged();
partial void OnCompanyProjectIdChanging(string value);
partial void OnCompanyProjectIdChanged();
partial void OnIsInspectionBrigadeChanging(System.Nullable<bool> value);
partial void OnIsInspectionBrigadeChanged();
#endregion
public Sys_User()
@ -362015,6 +361681,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsInspectionBrigade", DbType="Bit")]
public System.Nullable<bool> IsInspectionBrigade
{
get
{
return this._IsInspectionBrigade;
}
set
{
if ((this._IsInspectionBrigade != value))
{
this.OnIsInspectionBrigadeChanging(value);
this.SendPropertyChanging();
this._IsInspectionBrigade = value;
this.SendPropertyChanged("IsInspectionBrigade");
this.OnIsInspectionBrigadeChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_NCRManagement_Sys_User", Storage="_Comprehensive_NCRManagement", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")]
public EntitySet<Comprehensive_NCRManagement> Comprehensive_NCRManagement
{

1
SGGL/Model/Model.csproj
View File

@ -131,6 +131,7 @@
<Compile Include="APIItem\HSSE\PictureItem.cs" />
<Compile Include="APIItem\HSSE\RecityNoticesItem.cs" />
<Compile Include="APIItem\HSSE\SeDinMonthReport4OtherItem.cs" />
<Compile Include="APIItem\InspectionBrigadeUserItem.cs" />
<Compile Include="APIItem\OperationReportDto.cs" />
<Compile Include="APIItem\ProjectGpsPointItem.cs" />
<Compile Include="APIItem\ProjectItem.cs" />