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

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

This commit is contained in:
李鹏飞 2023-03-03 10:46:22 +08:00
parent 1a8b21b64f bc2e80097e
commit ffc4cb849e
36 changed files with 319 additions and 3738 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
DataBase/版本日志/SGGLDB_V2022-012-12-001.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2022-012-12-001.sql
View File

0
DataBase/版本日志/SGGLDB_V2022-12-14.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2022-12-14.sql
View File

0
DataBase/版本日志/SGGLDB_V2022-12-25-001.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2022-12-25-001.sql
View File

0
DataBase/版本日志/SGGLDB_V2022-12-26_001.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2022-12-26_001.sql
View File

0
DataBase/版本日志/SGGLDB_V2023-01-03_001.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2023-01-03_001.sql
View File

0
DataBase/版本日志/SGGLDB_V2023-01-04_gaofei_迁移集团子公司功能脚本.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2023-01-04_gaofei_迁移集团子公司功能脚本.sql
View File

0
DataBase/版本日志/SGGLDB_V2023-01-29_gaofei_迁移五张报表功能脚本.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2023-01-29_gaofei_迁移五张报表功能脚本.sql
View File

0
DataBase/版本日志/SGGLDB_V2023-02-13_gaofei.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2023-02-13_gaofei.sql
View File

0
DataBase/版本日志/SGGLDB_V2023-02-14.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2023-02-14.sql
View File

0
DataBase/版本日志/SGGLDB_V2023-02-17.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2023-02-17.sql
View File

0
DataBase/版本日志/SGGLDB_V2023-02-20.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2023-02-20.sql
View File

0
DataBase/版本日志/SGGLDB_V2023-02-21.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2023-02-21.sql
View File

0
DataBase/版本日志/SGGLDB_V2023-02-22_gaofei.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2023-02-22_gaofei.sql
View File

0
DataBase/版本日志/SGGLDB_V2023-02-23_gaofei.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2023-02-23_gaofei.sql
View File

0
DataBase/版本日志/SGGLDB_V2023-02-28.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2023-02-28.sql
View File

6
SGGL/BLL/Person/Person_PersonsService.cs
View File

@ -46,7 +46,7 @@ namespace BLL
/// <param name="personType">人员类型</param>
/// <param name="Grid1"></param>
/// <returns></returns>
public static IEnumerable getListData(string unitId, string departId, string projetcId, string name, string idCard, string isPost, string personType, Grid Grid1)
public static IEnumerable getListData(string unitId, string departId, string projetcId, string name, string idCard, string isPost, string personType,string account, Grid Grid1)
{
IQueryable<Model.Person_Persons> getDataList = getDataLists.OrderBy(x => x.UnitId).ThenBy(x => x.DepartId);
if (!string.IsNullOrEmpty(unitId) && unitId != Const._Null)
@ -73,6 +73,10 @@ namespace BLL
{
getDataList = getDataList.Where(e => e.PersonName.Contains(name));
}
if (!string.IsNullOrEmpty(account))
{
getDataList = getDataList.Where(e => e.Account.Contains(account));
}
if (!string.IsNullOrEmpty(idCard))
{
getDataList = getDataList.Where(e => e.IdentityCard.Contains(idCard));

151
SGGL/BLL/ZHGL/RealName/SynchroSetService.cs
View File

@ -256,10 +256,13 @@ namespace BLL
Success = Success,
Code = Code,
Message = Message,
PushTime = DateTime.Now,
ReturnData = ReturnData,
PushContent = PushContent,
PushTime = DateTime.Now,
};
if (Code != "200")
{
newLog.ReturnData = ReturnData;
newLog.PushContent = PushContent;
}
db.RealName_PushLog.InsertOnSubmit(newLog);
db.SubmitChanges();
}
@ -890,6 +893,7 @@ namespace BLL
var getCollTeam = (from x in Funs.DB.ProjectData_TeamGroup
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
join z in Funs.DB.RealName_Project on y.ContractNo equals z.ProCode
join p in Funs.DB.Project_ProjectUnit on new { x.UnitId, x.ProjectId } equals new { p.UnitId, p.ProjectId }
join u in Funs.DB.Base_Unit on x.UnitId equals u.UnitId
join s in Funs.DB.SitePerson_Person on x.GroupLeaderId equals s.PersonId into jonPerson
from s in jonPerson.DefaultIfEmpty()
@ -897,6 +901,7 @@ namespace BLL
&& (proCode == null || y.ContractNo == proCode)
&& u.CollCropCode != null && u.CollCropCode != ""
&& z.JTproCode != null
&& p.UnitType != Const.ProjectUnitType_3 && p.UnitType != Const.ProjectUnitType_4
select new
{
proCode = z.JTproCode,
@ -1027,6 +1032,7 @@ namespace BLL
x.RealNameAddTime,
x.RealNameUpdateTime,
x.PersonId,
x.SitePersonId,
}).Take(200).ToList();
if (getData.Count() > 0)
{
@ -1067,7 +1073,7 @@ namespace BLL
{
foreach (var item in getData)
{
var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.PersonId == item.PersonId);
var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.SitePersonId == item.SitePersonId);
if (getPerson != null)
{
if (!getPerson.RealNameAddTime.HasValue)
@ -1160,6 +1166,7 @@ namespace BLL
x.RealNameAddTime,
x.RealNameUpdateTime,
x.PersonId,
x.SitePersonId,
}).ToList();
if (getData.Count() > 0)
{
@ -1200,7 +1207,7 @@ namespace BLL
{
foreach (var item in getData)
{
var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.PersonId == item.PersonId);
var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.SitePersonId == item.SitePersonId);
if (getPerson != null)
{
if (!getPerson.RealNameAddTime.HasValue)
@ -1226,7 +1233,7 @@ namespace BLL
}
InsertRealNamePushLog(null, proCode, "推送人员数据", sucess, code, mess, data, pushContent);
if (data.Contains("已存在") || mess.Contains("已存在"))
if (data.Contains("已存在") || mess.Contains("已存在") || mess.Contains("重合") || data.Contains("重合"))
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
@ -1234,7 +1241,133 @@ namespace BLL
{
if (data.Contains(item.idcardNumber) || mess.Contains(item.idcardNumber))
{
var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.PersonId == item.PersonId);
var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.SitePersonId == item.SitePersonId);
if (getPerson != null)
{
if (!getPerson.RealNameAddTime.HasValue)
{
getPerson.RealNameAddTime = DateTime.Now;
}
db.SubmitChanges();
}
}
}
}
}
}
else
{
mess = "没有符合条件的数据！";
}
return mess;
}
catch (Exception ex)
{
ErrLogInfo.WriteLog(ex, "推送人员数据", "SynchroSetService.PushPersons");
return "推送人员异常";
}
}
/// <summary>
/// 推送人员数据
/// </summary>
/// <returns></returns>
public static string PushPersonsByIdentityCardUpdate(string proCode, string identityCard)
{
try
{
string mess = string.Empty;
string sucess = string.Empty;
string code = string.Empty;
string data = string.Empty;
string pushContent = string.Empty;
string contenttype = "application/json;charset=unicode";
var getData = (from x in Funs.DB.SitePerson_Person
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
join Persons in Funs.DB.Person_Persons on x.IdentityCard equals Persons.IdentityCard
join z in Funs.DB.RealName_Project on y.ContractNo equals z.ProCode
join v in Funs.DB.ProjectData_TeamGroup on x.TeamGroupId equals v.TeamGroupId
join w in Funs.DB.Base_WorkPost on x.WorkPostId equals w.WorkPostId
where x.IdentityCard == identityCard && y.ContractNo == proCode
&& v.TeamId.HasValue
&& z.JTproCode != null
select new
{
name = x.PersonName,
idcardType = "SHENFEN_ZHENGJIAN",
idcardNumber = x.IdentityCard,
proCode = z.JTproCode,
teamId = v.TeamId,
userType = ((w.PostType == "1" || w.PostType == "4") ? "LAB_USER_MANAGE" : "LAB_USER_BULIDER"),
workType = w.WorkPostCode,
isLeave = x.OutTime.HasValue ? "Y" : "N",
entryTime = x.InTime.HasValue ? string.Format("{0:yyyy-MM-dd}", x.InTime) : null,
exitTime = x.OutTime.HasValue ? string.Format("{0:yyyy-MM-dd}", x.OutTime) : null,
x.RealNameAddTime,
x.RealNameUpdateTime,
x.PersonId,
x.SitePersonId,
}).ToList();
if (getData.Count() > 0)
{
string returndata = string.Empty;
Hashtable newToken = new Hashtable
{
{ "token", getaccess_token(proCode) }
};
var updatelistObject = new
{
list = getData.Select(x => new { x.name, x.idcardType, x.idcardNumber, x.proCode, x.teamId, x.userType, x.workType, x.isLeave, x.entryTime, x.exitTime })
};
pushContent = JsonConvert.SerializeObject(updatelistObject);
returndata = BLL.APIGetHttpService.OutsideHttp(Funs.RealNameApiUrl + "/foreignApi/accept/updatePersons", "POST", contenttype, newToken, JsonConvert.SerializeObject(updatelistObject));
if (!string.IsNullOrEmpty(returndata))
{
JObject obj = JObject.Parse(returndata);
mess = obj["message"].ToString();
code = obj["code"].ToString();
sucess = obj["success"].ToString();
data = obj["data"].ToString();
if (obj["success"] != null && Convert.ToBoolean(obj["success"].ToString()))
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
foreach (var item in getData)
{
var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.SitePersonId == item.SitePersonId);
if (getPerson != null)
{
if (!getPerson.RealNameAddTime.HasValue)
{
getPerson.RealNameAddTime = DateTime.Now;
}
getPerson.RealNameUpdateTime = DateTime.Now;
db.SubmitChanges();
}
}
}
}
else
{
if (mess.Contains("token无效"))
{
getaccess_token_New(proCode);
}
}
}
InsertRealNamePushLog(null, proCode, "推送人员数据", sucess, code, mess, data, pushContent);
if (data.Contains("已存在") || mess.Contains("已存在") || mess.Contains("重合") || data.Contains("重合"))
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
foreach (var item in getData)
{
if (data.Contains(item.idcardNumber) || mess.Contains(item.idcardNumber))
{
var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.SitePersonId == item.SitePersonId);
if (getPerson != null)
{
if (!getPerson.RealNameAddTime.HasValue)
@ -1293,6 +1426,7 @@ namespace BLL
x.RealNameUpdateTime,
name = x.PersonName,
x.PersonId,
x.SitePersonId,
});
if (getData.Count() > 0)
{
@ -1322,7 +1456,7 @@ namespace BLL
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.PersonId == itemData.PersonId);
var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.SitePersonId == itemData.SitePersonId);
if (getPerson != null)
{
if (!getPerson.RealNameAddTime.HasValue)
@ -1635,6 +1769,7 @@ namespace BLL
x.RealNameAddTime,
x.RealNameUpdateTime,
x.PersonId,
x.SitePersonId,
}).ToList();
if (getData.Count() > 0)
{

2
SGGL/FineUIPro.Web/CQMS/Plan/MainPlanEdit.aspx.cs
View File

@ -53,7 +53,7 @@ namespace FineUIPro.Web.CQMS.Plan
this.rblIsAgree.Hidden = true;
this.drpPerson.DataTextField = "PersonName";
this.drpPerson.DataValueField = "PersonId";
this.drpPerson.DataSource = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.IsOffice == true select x).ToList();
this.drpPerson.DataSource = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId select x).ToList();
this.drpPerson.DataBind();
Funs.FineUIPleaseSelect(this.drpPerson);
if (!string.IsNullOrEmpty(MainPlanId))

2
SGGL/FineUIPro.Web/CQMS/Plan/SubPlanEdit.aspx
View File

@ -45,7 +45,7 @@
<f:FormRow>
<Items>
<f:TextBox ID="txtProjectName" runat="server" Readonly="true" Label="项目名称" LabelAlign="Right"
MaxLength="50" >
>
</f:TextBox>
<f:TextBox ID="txtCode" runat="server" Required="true" ShowRedStar="true" Label="编号" LabelAlign="Right" MaxLength="50" LabelWidth="120px">
</f:TextBox>

2
SGGL/FineUIPro.Web/CQMS/Plan/SubPlanView.aspx
View File

@ -45,7 +45,7 @@
<f:FormRow>
<Items>
<f:TextBox ID="txtProjectName" runat="server" Readonly="true" Label="项目名称" LabelAlign="Right"
MaxLength="50">
>
</f:TextBox>
<f:TextBox ID="txtCode" runat="server" Required="true" Readonly="true" ShowRedStar="true" Label="编号" LabelAlign="Right"
MaxLength="50" LabelWidth="120px">

3665
SGGL/FineUIPro.Web/ErrLog.txt
View File

File diff suppressed because it is too large Load Diff

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -12848,7 +12848,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>0</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:8899/</IISUrl>
<IISUrl>http://localhost:2087/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>

2
SGGL/FineUIPro.Web/Person/CompanyPerson.aspx.cs
View File

@ -39,7 +39,7 @@ namespace FineUIPro.Web.Person
private void BindGrid()
{
var getData = Person_PersonsService.getListData(Const.UnitId_SEDIN, this.drpDepart.SelectedValue, this.drpProject.SelectedValue,
this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue,this.drpPersonType.SelectedValue, Grid1);
this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, null, Grid1);
Grid1.RecordCount = Person_PersonsService.count;
Grid1.DataSource = getData;
Grid1.DataBind();

2
SGGL/FineUIPro.Web/Person/DepartPerson.aspx.cs
View File

@ -90,7 +90,7 @@ namespace FineUIPro.Web.Person
private void BindGrid()
{
var getData = Person_PersonsService.getListData(Const.UnitId_SEDIN, Const.Depart_constructionId, this.drpProject.SelectedValue,
this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, Grid1);
this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, null, Grid1);
Grid1.RecordCount = Person_PersonsService.count;
Grid1.DataSource = getData;
Grid1.DataBind();

1
SGGL/FineUIPro.Web/Person/PersonLib.aspx
View File

@ -35,6 +35,7 @@
</f:DropDownList>
<f:TextBox runat="server" ID="txtPersonName" EmptyText="按姓名查询" ></f:TextBox>
<f:TextBox runat="server" ID="txtIdCard" EmptyText="按身份证查询" ></f:TextBox>
<f:TextBox runat="server" ID="txtAccount" EmptyText="按账号查询" ></f:TextBox>
<f:DropDownList runat="server" ID="drpIsPost" EnableEdit="true"
LabelAlign="Right" EmptyText="请选择人员状态" AutoPostBack="true" OnSelectedIndexChanged="btSearch_Click">
</f:DropDownList>

2
SGGL/FineUIPro.Web/Person/PersonLib.aspx.cs
View File

@ -43,7 +43,7 @@ namespace FineUIPro.Web.Person
private void BindGrid()
{
var getData = Person_PersonsService.getListData(this.drpUnit.SelectedValue, this.drpDepart.SelectedValue, this.drpProject.SelectedValue,
this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, Grid1);
this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, this.txtAccount.Text.Trim(), Grid1);
Grid1.RecordCount = Person_PersonsService.count;
Grid1.DataSource = getData;
Grid1.DataBind();

9
SGGL/FineUIPro.Web/Person/PersonLib.aspx.designer.cs generated
View File

@ -104,6 +104,15 @@ namespace FineUIPro.Web.Person
/// </remarks>
protected global::FineUIPro.TextBox txtIdCard;
/// <summary>
/// txtAccount 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtAccount;
/// <summary>
/// drpIsPost 控件。
/// </summary>

2
SGGL/FineUIPro.Web/ZHGL/Plan/MainPlanEdit.aspx.cs
View File

@ -51,7 +51,7 @@ namespace FineUIPro.Web.ZHGL.Plan
this.rblIsAgree.Hidden = true;
this.drpPerson.DataTextField = "PersonName";
this.drpPerson.DataValueField = "PersonId";
this.drpPerson.DataSource = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.IsOffice == true select x).ToList();
this.drpPerson.DataSource = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId select x).ToList();
this.drpPerson.DataBind();
Funs.FineUIPleaseSelect(this.drpPerson);
if (!string.IsNullOrEmpty(MainPlanId))

2
SGGL/FineUIPro.Web/ZHGL/RealName/BasicData.aspx
View File

@ -22,7 +22,7 @@
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1" />
<f:Panel ID="Panel2" runat="server" ShowHeader="false" ShowBorder="false" ColumnWidth="100%" MarginRight="5px">
<Items>
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="550px" ShowBorder="true"
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" ShowBorder="true" Height="650px"
TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server"
ActiveTabIndex="0">
<Tabs>

5
SGGL/FineUIPro.Web/ZHGL/RealName/SynchroRecord.aspx
View File

@ -31,6 +31,9 @@
</f:DatePicker>
<f:DatePicker ID="txtEndDate" runat="server" Label="结束日期" LabelWidth="80px" Width="220px">
</f:DatePicker>
<f:DropDownList runat="server" Width="320px" ID="drpProject" EnableEdit="true" Label="项目"
LabelWidth="60px" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpProject_SelectedIndexChanged">
</f:DropDownList>
<f:TextBox runat="server" ID="txtConet" EmptyText="请输入查询条件" Width="220px"></f:TextBox>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSearch" runat="server" Icon="SystemSearch" ToolTip="查询" OnClick="btnSearch_Click">
@ -38,6 +41,8 @@
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
<f:Button ID="btnDele" runat="server" Icon="Delete" ToolTip="清理同步记录" OnClick="btnDele_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>

30
SGGL/FineUIPro.Web/ZHGL/RealName/SynchroRecord.aspx.cs
View File

@ -5,6 +5,7 @@ using System.Data;
using System.Data.SqlClient;
using System.Text;
using AspNet = System.Web.UI.WebControls;
using System.Linq;
namespace FineUIPro.Web.ZHGL.RealName
{
@ -22,6 +23,12 @@ namespace FineUIPro.Web.ZHGL.RealName
Funs.DropDownPageSize(this.ddlPageSize);
this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
ProjectService.InitAllProjectShortNameDropDownList(this.drpProject, this.CurrUser.PersonId, true);
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{
this.drpProject.SelectedValue = this.CurrUser.LoginProjectId;
this.drpProject.Readonly = true;
}
this.GridBind();
}
}
@ -46,6 +53,11 @@ namespace FineUIPro.Web.ZHGL.RealName
strSql += " AND PushTime < @EndDate";
listStr.Add(new SqlParameter("@EndDate", Funs.GetNewDateTime(this.txtEndDate.Text).Value.AddDays(1)));
}
if (this.drpProject.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpProject.SelectedValue))
{
strSql += " AND ProjectId = @ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
}
if (!string.IsNullOrEmpty(this.txtConet.Text))
{
strSql += " AND (Success LIKE @name OR Message LIKE @name OR ReturnData LIKE @name)";
@ -154,5 +166,23 @@ namespace FineUIPro.Web.ZHGL.RealName
this.GridBind();
}
#endregion
protected void drpProject_SelectedIndexChanged(object sender, EventArgs e)
{
GridBind();
}
protected void btnDele_Click(object sender, EventArgs e)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var getRealName_PushLog = from x in db.RealName_PushLog select x;
if (getRealName_PushLog.Count() > 0)
{
db.RealName_PushLog.DeleteAllOnSubmit(getRealName_PushLog);
db.SubmitChanges();
}
}
}
}
}

56
SGGL/FineUIPro.Web/ZHGL/RealName/SynchroRecord.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.ZHGL.RealName {
public partial class SynchroRecord {
namespace FineUIPro.Web.ZHGL.RealName
{
public partial class SynchroRecord
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@ -56,7 +58,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtStartDate 控件。
/// </summary>
@ -65,7 +67,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStartDate;
/// <summary>
/// txtEndDate 控件。
/// </summary>
@ -74,7 +76,16 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndDate;
/// <summary>
/// drpProject 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProject;
/// <summary>
/// txtConet 控件。
/// </summary>
@ -83,7 +94,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtConet;
/// <summary>
/// btnSearch 控件。
/// </summary>
@ -92,7 +103,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSearch;
/// <summary>
/// btnOut 控件。
/// </summary>
@ -101,7 +112,16 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// btnDele 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDele;
/// <summary>
/// labNumber 控件。
/// </summary>
@ -110,7 +130,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label labNumber;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@ -119,7 +139,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@ -128,7 +148,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>

8
SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx
View File

@ -41,11 +41,15 @@
</f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="90% 10%">
<f:FormRow ColumnWidths="80% 6% 6% 7%">
<Items>
<f:TextArea ID="txtIdentityCard" runat="server" Label="身份证号码" LabelWidth="120px">
</f:TextArea>
<f:Button ID="btnPushData" Icon="Accept" runat="server" Text="提交" ToolTip="多身份证用逗号（,）隔开；或直接复制日志中错误提示信息。" OnClick="btnPushData_Click">
<f:Button ID="btnPushData" Icon="Accept" runat="server" Text="提交" ToolTip="多身份证用逗号（,）隔开；或直接复制日志中错误提示信息。"
OnClick="btnPushData_Click">
</f:Button>
<f:Button ID="btnPushUpdate" Icon="Accept" runat="server" Text="更新" ToolTip="多身份证用逗号（,）隔开；或直接复制日志中错误提示信息。"
OnClick="btnPushUpdate_Click">
</f:Button>
<f:Button ID="btnDelete" Icon="Delete" runat="server" Text="删除"
ToolTip="删除这些身份证号码对应的实名制考勤,多身份证用逗号（,）隔开。" OnClick="btnDelete_Click">

28
SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs
View File

@ -287,7 +287,33 @@ namespace FineUIPro.Web.ZHGL.RealName
}
}
}
protected void btnPushUpdate_Click(object sender, EventArgs e)
{
string message = string.Empty;
string idText = this.txtIdentityCard.Text.Trim();
if (!string.IsNullOrEmpty(idText))
{
string proCode = ProjectService.GetContractNoByProjectId(this.drpProject.SelectedValue);
var getRProjects = Funs.DB.RealName_Project.FirstOrDefault(x => x.ProCode == proCode);
if (getRProjects != null && !string.IsNullOrEmpty(getRProjects.ProCode))
{
var getList = returnCardList();
if (getList != null && getList.Count > 0)
{
foreach (var item in getList)
{
message += ("项目" + getRProjects.ProCode + "更新" + BLL.SynchroSetService.PushPersonsByIdentityCardUpdate(getRProjects.ProCode, item) ?? "");
}
ShowNotify(message, MessageBoxIcon.Information);
}
}
else
{
ShowNotify("当前项目还没有与实名制对接！", MessageBoxIcon.Information);
}
}
}
protected void btnDelete_Click(object sender, EventArgs e)
{
var getList = returnCardList();
@ -637,5 +663,7 @@ namespace FineUIPro.Web.ZHGL.RealName
ShowNotify("操作完成！" + count.ToString() + "条", MessageBoxIcon.Success);
}
}
}
}

75
SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.ZHGL.RealName {
public partial class SynchroSet {
namespace FineUIPro.Web.ZHGL.RealName
{
public partial class SynchroSet
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtapiUrl 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtapiUrl;
/// <summary>
/// txtUserName 控件。
/// </summary>
@ -56,7 +58,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtUserName;
/// <summary>
/// txtword 控件。
/// </summary>
@ -65,7 +67,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtword;
/// <summary>
/// txtclientId 控件。
/// </summary>
@ -74,7 +76,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtclientId;
/// <summary>
/// txtintervaltime 控件。
/// </summary>
@ -83,7 +85,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtintervaltime;
/// <summary>
/// txtIdentityCard 控件。
/// </summary>
@ -92,7 +94,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtIdentityCard;
/// <summary>
/// btnPushData 控件。
/// </summary>
@ -101,7 +103,16 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPushData;
/// <summary>
/// btnPushUpdate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPushUpdate;
/// <summary>
/// btnDelete 控件。
/// </summary>
@ -110,7 +121,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDelete;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -119,7 +130,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnConnect 控件。
/// </summary>
@ -128,7 +139,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnConnect;
/// <summary>
/// btnSave 控件。
/// </summary>
@ -137,7 +148,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// drpProject 控件。
/// </summary>
@ -146,7 +157,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProject;
/// <summary>
/// btnCompany 控件。
/// </summary>
@ -155,7 +166,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnCompany;
/// <summary>
/// btnProCollCompany 控件。
/// </summary>
@ -164,7 +175,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnProCollCompany;
/// <summary>
/// btnCollTeam 控件。
/// </summary>
@ -173,7 +184,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnCollTeam;
/// <summary>
/// btnPersons 控件。
/// </summary>
@ -182,7 +193,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPersons;
/// <summary>
/// btnAttendance 控件。
/// </summary>
@ -191,7 +202,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttendance;
/// <summary>
/// btnDataProcess 控件。
/// </summary>
@ -200,7 +211,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDataProcess;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@ -209,7 +220,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// lbProjectInfo 控件。
/// </summary>
@ -218,7 +229,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbProjectInfo;
/// <summary>
/// btnCanelUpdate 控件。
/// </summary>
@ -227,7 +238,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnCanelUpdate;
/// <summary>
/// btnupdatePersonsExitTime 控件。
/// </summary>
@ -236,7 +247,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnupdatePersonsExitTime;
/// <summary>
/// btnAllPushData 控件。
/// </summary>
@ -245,7 +256,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAllPushData;
/// <summary>
/// btnUpdate 控件。
/// </summary>
@ -254,7 +265,7 @@ namespace FineUIPro.Web.ZHGL.RealName {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnUpdate;
/// <summary>
/// btnKQ 控件。
/// </summary>

5
SGGL/WebAPI/WebAPI.csproj
View File

@ -50,9 +50,8 @@
<DocumentationFile>bin\WebAPI.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Aspose.Words, Version=10.5.0.0, Culture=neutral, PublicKeyToken=fa9a48344f15a022, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>bin\Aspose.Words.dll</HintPath>
<Reference Include="Aspose.Words">
<HintPath>..\FineUIPro\Reference BLL\Aspose.Words.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">