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-06-13 16:37:08 +08:00
parent 118d222bf6 7a2a8ffb93
commit 924a95f531
37 changed files with 805 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
DataBase/版本日志/SGGLDB_V2023-06-13.sql
View File

@ -1,6 +1,3 @@
ALTER VIEW [dbo].[View_HJGL_WeldJoint]
AS
SELECT jot.[ProjectId] --ÏîÄ¿Id
@ -167,3 +164,37 @@ LEFT JOIN dbo.HJGL_Batch_PointBatch point ON point.PointBatchId = pointItem.Poin
GO
ALTER TABLE CostGoods_CostManage ADD NextManId nvarchar(50) null
go
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'下一步办理人ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CostGoods_CostManage', @level2type=N'COLUMN',@level2name=N'NextManId'
GO
--获取当前人项目级待办事项
CREATE PROCEDURE [dbo].[Sp_Project_GetToDoItems]
@projectId NVARCHAR(50)=NULL,
@personId NVARCHAR(200)=NULL
AS
/*获取当前人本部待办事项*/
BEGIN
SELECT CostManageId AS DataId
,'HSE费用申请' AS MenuName
,('HSE费用申请'+ CONVERT(varchar(100),CostManage.CostManageDate, 23)+'待处理。') AS Content
,PersonId
,persons.PersonName
,CostManage.CostManageDate AS DataTime
,CONVERT(varchar(100),CostManage.CostManageDate, 23) AS DataTimeStr
,(CASE WHEN CostManage.States = '0' THEN '../HSSE/CostGoods/CostManageEdit.aspx?CostManageId='+CostManageId
ELSE '../HSSE/CostGoods/CostManageAudit.aspx?CostManageId='+CostManageId END)AS PCUrl
FROM CostGoods_CostManage AS CostManage
LEFT JOIN Person_Persons AS persons ON CostManage.NextManId= persons.PersonId
WHERE CostManage.ProjectId=@projectId AND (CostManage.States = '0' or CostManage.States='1' )
AND CostManage.NextManId =@personId
ORDER BY DataTime DESC
END
GO
ALTER TABLE Project_ProjectUnit ADD IsSynchro BIT NULL
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'与实名制同步' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_ProjectUnit', @level2type=N'COLUMN',@level2name=N'IsSynchro'
GO

5
DataBase/版本日志/SGGLDB_V2023-06-13修改明细.txt Normal file
View File

@ -0,0 +1,5 @@
--ADD BY YangHongwei 2023-06-13
1、新增项目级消息待办页面功能。
2、新增项目单位是否同步实名制设置功能。
3、优化考试合格自动生成卡号功能。
--END

9
DataBase/菜单初始化脚本/1-11待办（Menu_ToDo）.sql Normal file
View File

@ -0,0 +1,9 @@
--delete from Sys_ButtonToMenu where MenuId in (select MenuId from Sys_Menu where MenuType='Menu_ToDo')
--go
--delete from Sys_Menu where MenuType='Menu_ToDo'
--go
--HSSE待办
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
VALUES('AEBFEC10-DD23-4E95-A684-B291A681A5E8','待办信息','SysManage/ProjectToDo.aspx',10,'0','Menu_ToDo',0,0,1)
GO

5
SGGL/BLL/Common/Const.cs
View File

@ -749,6 +749,11 @@
/// </summary>
public const string Menu_PDigData = "Menu_PDigData";
/// <summary>
/// 消息
/// </summary>
public const string Menu_ToDo = "Menu_ToDo";
#endregion
#region 考勤方式定义

4
SGGL/BLL/HSSE/CostGoods/CostManageService.cs
View File

@ -70,7 +70,8 @@ namespace BLL
SubProject = costManage.SubProject,
States = costManage.States,
CompileMan = costManage.CompileMan,
CompileDate = costManage.CompileDate
CompileDate = costManage.CompileDate,
NextManId= costManage.NextManId,
};
db.CostGoods_CostManage.InsertOnSubmit(newCostManage);
@ -105,6 +106,7 @@ namespace BLL
newCostManage.States = costManage.States;
newCostManage.CompileMan = costManage.CompileMan;
newCostManage.CompileDate = costManage.CompileDate;
newCostManage.NextManId = costManage.NextManId;
db.SubmitChanges();
}
}

2
SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs
View File

@ -223,7 +223,7 @@ namespace BLL
/// 监理 业主 不进入
var getPUnit = db.Project_ProjectUnit.FirstOrDefault(x => x.ProjectId == newPersonInOut.ProjectId && x.UnitId == newPersonInOut.UnitId);
if (getPUnit.UnitType != Const.ProjectUnitType_3 && getPUnit.UnitType != Const.ProjectUnitType_4)
if (getPUnit.UnitType != Const.ProjectUnitType_3 && getPUnit.UnitType != Const.ProjectUnitType_4 && getPUnit.IsSynchro == true)
{
string proCode = ProjectService.GetContractNoByProjectId(newPersonInOut.ProjectId);
var getRealNameP = db.RealName_Project.FirstOrDefault(x => x.ProCode == proCode);

3
SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs
View File

@ -1,6 +1,7 @@
using FineUIPro;
using Microsoft.SqlServer.Dts.Runtime;
using Model;
using NPOI.HSSF.Record.Aggregates;
using NPOI.SS.Formula.PTG;
using System;
using System.Collections;
@ -641,7 +642,7 @@ namespace BLL
var getMaxCarNo = Funs.DB.SitePerson_Person.Where(x => x.ProjectId == projectId && x.CardNo.Contains(prefix)).Max(x => x.CardNo);
if (!string.IsNullOrEmpty(getMaxCarNo) && getMaxCarNo.Length > 5)
{
var getInt = Funs.GetNewInt(Funs.GetSubStr(getMaxCarNo, 5));
var getInt = Funs.GetNewInt(getMaxCarNo.Substring(getMaxCarNo.Length-5));
if (getInt.HasValue)
{
cardNo = SQLHelper.RunProcNewId("SpGetNewNumber", "SitePerson_Person", "CardNo", getSitePerson.ProjectId, prefix);

26
SGGL/BLL/OpenService/GetDataService.cs
View File

@ -510,25 +510,35 @@ namespace BLL
/// <summary>
///
/// </summary>
public static void SendCarNo()
public static int SendCarNo(string projectId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
int count = 0;
var getPersons = from x in db.SitePerson_Person
where x.States == Const.State_1 && x.CardNo == null
where x.States == Const.State_1 && x.CardNo == null && x.ProjectId == projectId
select x;
foreach (var item in getPersons)
{
var isNull = db.EduTrain_TrainRecordDetail.FirstOrDefault(x => x.PersonId == item.PersonId);
if (isNull != null) ////未参加过培训的人员
var isNull = db.EduTrain_TrainRecordDetail.FirstOrDefault(x => x.PersonId == item.PersonId && x.CheckResult ==true);
if (isNull != null) ////参加过培训的人员
{
item.CardNo = SQLHelper.RunProcNewId("SpGetNewNumber", "SitePerson_Person", "CardNo", item.ProjectId, UnitService.GetUnitCodeByUnitId(item.UnitId));
string prefix = UnitService.GetUnitCodeByUnitId(item.UnitId) + "-";
var getMaxCarNo = db.SitePerson_Person.Where(x => x.ProjectId == item.ProjectId && x.CardNo.Contains(prefix)).Max(x => x.CardNo);
if (!string.IsNullOrEmpty(getMaxCarNo) && getMaxCarNo.Length > 5)
{
var getInt = Funs.GetNewInt(getMaxCarNo.Substring(getMaxCarNo.Length - 5));
if (getInt.HasValue)
{
item.CardNo = SQLHelper.RunProcNewId("SpGetNewNumber", "SitePerson_Person", "CardNo", item.ProjectId, prefix);
db.SubmitChanges();
}
count++;
}
}
}
}
return count;
}
}
}
}

6
SGGL/BLL/ProjectData/ProjectService.cs
View File

@ -337,10 +337,10 @@
}
}
var pcount = from x in db.Sys_Log
where x.ProjectId != null && x.OperationTime > DateTime.Now.AddDays(-3)
var pcount = (from x in db.Sys_Log
where x.ProjectId != null && x.OperationTime > DateTime.Now.AddDays(-2)
group x by x.ProjectId into g
select new { g.First().ProjectId, count = g.Count() };
select new { g.First().ProjectId, count = g.Count() }).Distinct();
List<Model.Base_Project> getList = new List<Base_Project>();
if (getProjects.Count() > 0)

2
SGGL/BLL/ProjectData/ProjectUnitService.cs
View File

@ -78,6 +78,7 @@
PlanCostB = projectUnit.PlanCostB,
ContractRange = projectUnit.ContractRange,
RealNamePushTime = projectUnit.RealNamePushTime,
IsSynchro = projectUnit.IsSynchro,
};
db.Project_ProjectUnit.InsertOnSubmit(newProjectUnit);
db.SubmitChanges();
@ -100,6 +101,7 @@
newProjectUnit.PlanCostB = projectUnit.PlanCostB;
newProjectUnit.ContractRange = projectUnit.ContractRange;
newProjectUnit.RealNamePushTime = projectUnit.RealNamePushTime;
newProjectUnit.IsSynchro = projectUnit.IsSynchro;
db.SubmitChanges();
}
}

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

@ -762,7 +762,7 @@ namespace BLL
&& x.UnitType != null
&& (proCode == null || y.ContractNo == proCode)
&& u.CollCropCode != null && u.CollCropCode != ""
&& z.JTproCode != null
&& z.JTproCode != null && x.IsSynchro == true
select new
{
unitId = x.UnitId,
@ -900,7 +900,7 @@ namespace BLL
where z.ProCode != null && !x.RealNamePushTime.HasValue && x.TeamTypeId != null
&& (proCode == null || y.ContractNo == proCode)
&& u.CollCropCode != null && u.CollCropCode != ""
&& z.JTproCode != null
&& z.JTproCode != null && p.IsSynchro == true
&& p.UnitType != Const.ProjectUnitType_3 && p.UnitType != Const.ProjectUnitType_4
select new
{
@ -997,7 +997,7 @@ namespace BLL
&& y.ContractNo == proCode && v.TeamId.HasValue
&& ((type == Const.BtnModify && !x.RealNameUpdateTime.HasValue && x.RealNameAddTime.HasValue)
|| (type != Const.BtnModify && !x.RealNameAddTime.HasValue && x.States == Const.State_1 && Persons.HeadImage.Length > 0))
&& p.UnitType != Const.ProjectUnitType_3 && p.UnitType != Const.ProjectUnitType_4
&& p.UnitType != Const.ProjectUnitType_3 && p.UnitType != Const.ProjectUnitType_4 && p.IsSynchro == true
&& z.JTproCode != null
select new
{
@ -1517,12 +1517,13 @@ namespace BLL
join z in Funs.DB.RealName_Project on x.ProCode equals z.ProCode
join v in Funs.DB.ProjectData_TeamGroup on p.TeamGroupId equals v.TeamGroupId
join r in Funs.DB.RealName_CollTeam on v.TeamId equals r.TeamId
join pu in Funs.DB.Project_ProjectUnit on new { x.UnitId, x.ProjectId } equals new { pu.UnitId, pu.ProjectId }
where x.IdcardNumber != null && x.ChangeTime.HasValue
&& (proCode == null || x.ProCode == proCode)
&& v.TeamId.HasValue && r.TeamId.HasValue
&& p.States == Const.State_1
&& !x.RealNamePushTime.HasValue
&& z.JTproCode != null
&& z.JTproCode != null && pu.IsSynchro == true
orderby x.ChangeTime descending
select new
{
@ -1735,7 +1736,8 @@ namespace BLL
join z in db.RealName_Project on y.ContractNo equals z.ProCode
join v in db.ProjectData_TeamGroup on x.TeamGroupId equals v.TeamGroupId
join w in db.Base_WorkPost on x.WorkPostId equals w.WorkPostId
where personList.Contains(x.PersonId) && z.JTproCode != null
join p in db.Project_ProjectUnit on new { x.UnitId, x.ProjectId } equals new { p.UnitId, p.ProjectId }
where personList.Contains(x.PersonId) && z.JTproCode != null && p.IsSynchro == true
select new
{
name = x.PersonName,

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

@ -330,6 +330,7 @@
</Content>
<Content Include="common\Menu_TeamWork.xml" />
<Content Include="common\Menu_TestRun.xml" />
<Content Include="common\Menu_ToDo.xml" />
<Content Include="common\Menu_ZHGL.xml" />
<Content Include="common\themes.aspx" />
<Content Include="AttachFile\EditOffice.aspx" />
@ -1502,6 +1503,7 @@
<Content Include="SHIYE\InformationProject\SafetyBriefing.aspx" />
<Content Include="SHIYE\InformationProject\SafetyBriefingEdit.aspx" />
<Content Include="SysManage\OutputValueProject.aspx" />
<Content Include="SysManage\ProjectToDo.aspx" />
<Content Include="ZHGL\DataIn\AccidentCauseReportBar.aspx" />
<Content Include="ZHGL\DataIn\AccidentCauseReportBarIn.aspx" />
<Content Include="ZHGL\DataIn\AccidentCauseReportImport.aspx" />
@ -12953,6 +12955,13 @@
<Compile Include="SysManage\SysConstSet.aspx.designer.cs">
<DependentUpon>SysConstSet.aspx</DependentUpon>
</Compile>
<Compile Include="SysManage\ProjectToDo.aspx.cs">
<DependentUpon>ProjectToDo.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SysManage\ProjectToDo.aspx.designer.cs">
<DependentUpon>ProjectToDo.aspx</DependentUpon>
</Compile>
<Compile Include="SysManage\Unit.aspx.cs">
<DependentUpon>Unit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@ -13870,7 +13879,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>0</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:1541/</IISUrl>
<IISUrl>http://localhost:8667/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>

5
SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageAudit.aspx.cs
View File

@ -197,6 +197,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
isAgree = false;
NowFlow.Opinion = this.rblIsAgree.SelectedItem.Text + "，"+ this.txtOpinion.Text;
getCost.States = BLL.Const.State_0;
getCost.NextManId = getCost.CompileMan;
BLL.CostManageService.UpdateCostManage(getCost);
CostManageService.updateOpenCostManageFlowOperate(this.CostManageId);
}
@ -208,9 +209,13 @@ namespace FineUIPro.Web.HSSE.CostGoods
{
NextFlow.OperaterId = this.drpNextMan.SelectedValue;
BLL.CostManageService.updateCostManageFlowOperate(NextFlow);
getCost.NextManId = this.drpNextMan.SelectedValue;
BLL.CostManageService.UpdateCostManage(getCost);
}
else
{
getCost.NextManId = null;
getCost.States = BLL.Const.State_2;
BLL.CostManageService.UpdateCostManage(getCost);
}

5
SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx.cs
View File

@ -313,6 +313,11 @@ namespace FineUIPro.Web.HSSE.CostGoods
if (type == Const.BtnSubmit)
{
costManage.States = BLL.Const.State_1;
costManage.NextManId = this.drpNextMan.SelectedValue;
}
else
{
costManage.NextManId = costManage.CompileMan;
}
var getCost= CostManageService.GetCostManageById(this.CostManageId);

2
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx
View File

@ -109,6 +109,8 @@
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
<f:Button ID="btnQR" ToolTip="批量生成二维码" Icon="TableRefresh" runat="server" OnClick="btnQR_Click">
</f:Button>
<f:Button ID="btnRefresh" ToolTip="刷卡号" Icon="ArrowRefresh" runat="server" Hidden="true" OnClick="btnRefresh_Click">
</f:Button>
</Items>
</f:Toolbar>

10
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
View File

@ -70,6 +70,10 @@ namespace FineUIPro.Web.HSSE.SitePerson
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
BLL.WorkPostService.InitWorkPostDropDownList(this.drpPost, true);
this.InitTreeMenu();//加载树
if (this.CurrUser.PersonId == Const.hfnbdId || this.CurrUser.PersonId == Const.sysglyId)
{
this.btnRefresh.Hidden = false;
}
}
}
@ -726,5 +730,11 @@ namespace FineUIPro.Web.HSSE.SitePerson
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../../Person/ProjectPersonView.aspx?SitePersonId={0}", this.SitePersonId, "查看 - ")));
}
}
protected void btnRefresh_Click(object sender, EventArgs e)
{
int count = GetDataService.SendCarNo(this.ProjectId);
Alert.ShowInTop("刷新完成"+ count.ToString()+"条。", MessageBoxIcon.Success);
}
}
}

9
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.designer.cs generated
View File

@ -248,6 +248,15 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// </remarks>
protected global::FineUIPro.Button btnQR;
/// <summary>
/// btnRefresh 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnRefresh;
/// <summary>
/// lbIsPost 控件。
/// </summary>

12
SGGL/FineUIPro.Web/ProjectData/ProjectUnit.aspx
View File

@ -12,14 +12,12 @@
word-break: break-all;
}
.f-grid-row.red
{
.f-grid-row.red {
background-color: #FF7575;
background-image: none;
}
.fontred
{
.fontred {
color: #FF7575;
background-image: none;
}
@ -44,7 +42,8 @@
EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:TextBox runat="server" Label="单位名称" ID="txtUnitName" EmptyText="输入查询条件"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"></f:TextBox>
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px">
</f:TextBox>
<f:Label runat="server" Label="说明" CssClass="fontred" Text="请双击填报单位类型" LabelAlign="right"></f:Label>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSelect" Text="新增" Icon="Add" Hidden="true" runat="server"
@ -80,6 +79,9 @@
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="出场时间"
HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:CheckBoxField Width="100px" SortField="IsSynchro" RenderAsStaticField="true" DataField="IsSynchro"
HeaderText="同步实名制" HeaderTextAlign="Center" TextAlign="Center">
</f:CheckBoxField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

3
SGGL/FineUIPro.Web/ProjectData/ProjectUnit.aspx.cs
View File

@ -48,7 +48,8 @@ namespace FineUIPro.Web.ProjectData
{
if (this.drpProject.Items.Count() > 0)
{
string strSql = @"SELECT ProjectUnit.ProjectUnitId,ProjectUnit.ProjectId,Project.ProjectCode,Project.ProjectName,ProjectUnit.UnitId,Unit.UnitCode,Unit.UnitName,ProjectUnit.UnitType,sysConst.ConstText AS UnitTypeName,ProjectUnit.InTime,ProjectUnit.OutTime "
string strSql = @"SELECT ProjectUnit.ProjectUnitId,ProjectUnit.ProjectId,Project.ProjectCode,Project.ProjectName,ProjectUnit.UnitId,Unit.UnitCode,Unit.UnitName
,ProjectUnit.UnitType,sysConst.ConstText AS UnitTypeName,ProjectUnit.InTime,ProjectUnit.OutTime,ProjectUnit.IsSynchro "
+ @" FROM Project_ProjectUnit AS ProjectUnit "
+ @" LEFT JOIN Base_Project AS Project ON ProjectUnit.ProjectId = Project.ProjectId "
+ @" LEFT JOIN Base_Unit AS Unit ON ProjectUnit.UnitId = Unit.UnitId "

11
SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx
View File

@ -68,6 +68,11 @@
<f:DatePicker runat="server" Label="出场时间" ID="txtOutTime"></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:CheckBox runat="server" ID="ckIsSynchro" Label="是否同步实名制"></f:CheckBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox ID="nbPlanCostA" NoDecimal="false" NoNegative="false" MinValue="0" runat="server"
@ -89,9 +94,11 @@
<f:Label runat="server" ID="hdProjectUnitItemId" Hidden="true"></f:Label>
<f:TextBox runat="server" ID="txtContractNum" Label="合同号" LabelWidth="80px"></f:TextBox>
<f:NumberBox runat="server" ID="txtTotalMoney" Label="总金额(元)" LabelWidth="90px"
DecimalPrecision="2" NoNegative="true"></f:NumberBox>
DecimalPrecision="2" NoNegative="true">
</f:NumberBox>
<f:NumberBox runat="server" ID="txtHSEMoney" Label="HSE费用(元)" LabelWidth="100px"
DecimalPrecision="2" NoNegative="true"></f:NumberBox>
DecimalPrecision="2" NoNegative="true">
</f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>

14
SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx.cs
View File

@ -61,6 +61,7 @@ namespace FineUIPro.Web.ProjectData
BLL.ConstValue.InitConstValueDropDownList(this.drpUnitType, ConstValue.Group_ProjectUnitType, true);
BasicDataService.InitBasicDataProjectUnitDropDownList(this.drpIdcardType, "ZHENGJIAN_TYPE", true);
this.drpIdcardType.SelectedValue = "SHENFEN_ZHENGJIAN";
this.ckIsSynchro.Checked = false;
this.ProjectUnitId = Request.QueryString["ProjectUnitId"];
if (!String.IsNullOrEmpty(this.ProjectUnitId))
{
@ -110,6 +111,10 @@ namespace FineUIPro.Web.ProjectData
this.nbPlanCostB.Text = projectUnit.PlanCostB.ToString();
}
this.txtContractRange.Text = projectUnit.ContractRange;
if (projectUnit.IsSynchro == true)
{
this.ckIsSynchro.Checked = true;
}
}
this.BindGrid();
@ -136,6 +141,15 @@ namespace FineUIPro.Web.ProjectData
newProjectUnit.PlanCostA = Funs.GetNewDecimalOrZero(this.nbPlanCostA.Text.Trim());
newProjectUnit.PlanCostB = Funs.GetNewDecimalOrZero(this.nbPlanCostB.Text.Trim());
newProjectUnit.ContractRange = this.txtContractRange.Text.Trim();
if (this.ckIsSynchro.Checked)
{
newProjectUnit.IsSynchro = true;
}
else
{
newProjectUnit.IsSynchro = false;
}
BLL.ProjectUnitService.UpdateProjectUnit(newProjectUnit);
Model.Base_Unit unit = BLL.UnitService.GetUnitByUnitId(newProjectUnit.UnitId);
if (unit != null)

9
SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx.designer.cs generated
View File

@ -149,6 +149,15 @@ namespace FineUIPro.Web.ProjectData
/// </remarks>
protected global::FineUIPro.DatePicker txtOutTime;
/// <summary>
/// ckIsSynchro 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIsSynchro;
/// <summary>
/// nbPlanCostA 控件。
/// </summary>

2
SGGL/FineUIPro.Web/ProjectData/ProjectUser.aspx.cs
View File

@ -66,7 +66,7 @@
LEFT JOIN Base_Unit AS Unit ON SitePerson.UnitId = Unit.UnitId
LEFT JOIN Base_WorkPost AS WorkPost ON SitePerson.WorkPostId =WorkPost.WorkPostId
LEFT JOIN Sys_Const AS sysConst ON sysConst.GroupId ='" + BLL.ConstValue.Group_ProjectUnitType + "' " +
" AND ProjectUnit.UnitType=sysConst.ConstValue WHERE SitePerson.RoleIds IS NOT NULL AND Persons.Account IS NOT NULL ";
" AND ProjectUnit.UnitType=sysConst.ConstValue WHERE SitePerson.RoleIds IS NOT NULL AND SitePerson.RoleIds != '' AND Persons.Account IS NOT NULL ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += " AND SitePerson.ProjectId = @ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));

89
SGGL/FineUIPro.Web/SysManage/ProjectToDo.aspx Normal file
View File

@ -0,0 +1,89 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectToDo.aspx.cs" Inherits="FineUIPro.Web.SysManage.ProjectToDo" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>单位设置</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
<style type="text/css">
.f-grid-row .f-grid-cell-inner {
white-space: normal;
word-break: break-all;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" EnableCollapse="true" ShowHeader="false"
runat="server" BoxFlex="1" DataKeyNames="DataId" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="DataId" AllowSorting="true" SortField="DataTime"
SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="110px" ColumnID="MenuName" DataField="MenuName"
FieldType="String" HeaderText="菜单" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="240px" ColumnID="Content" DataField="Content" TextAlign="Left"
FieldType="String" HeaderText="内容" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="DataTime" DataField="DataTime"
HeaderText="单据时间" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="设置" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true"
Width="1200px" Height="650px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
runat="server" Text="办理" Icon="Pencil">
</f:MenuButton>
</f:Menu>
</form>
<script type="text/jscript">
var menuID = '<%= Menu1.ClientID %>';
// 返回false，来阻止浏览器右键菜单
function onRowContextMenu(event, rowId) {
F(menuID).show(); //showAt(event.pageX, event.pageY);
return false;
}
function reloadGrid() {
__doPostBack(null, 'reloadGrid');
}
</script>
</body>
</html>

115
SGGL/FineUIPro.Web/SysManage/ProjectToDo.aspx.cs Normal file
View File

@ -0,0 +1,115 @@
using BLL;
using FineUIPro.Web.DataShow;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.SysManage
{
public partial class ProjectToDo : PageBase
{
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack && this.CurrUser != null)
{
Funs.DropDownPageSize(this.ddlPageSize);
// 绑定表格
this.BindGrid();
}
}
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
var getDataList = Funs.DB.Sp_Project_GetToDoItems( this.CurrUser.LoginProjectId, this.CurrUser.PersonId).ToList();
Grid1.RecordCount = getDataList.Count();
Grid1.DataSource = getDataList;
Grid1.DataBind();
}
#region 查询
/// <summary>
/// 查询
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void TextBox_TextChanged(object sender, EventArgs e)
{
this.BindGrid();
}
#endregion
/// <summary>
/// 分页
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid();
}
/// <summary>
/// 分页显示条数下拉框
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid();
}
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
{
BindGrid();
}
/// <summary>
/// Grid行双击事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
{
this.EditData();
}
/// <summary>
/// 右键编辑事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnMenuEdit_Click(object sender, EventArgs e)
{
this.EditData();
}
/// <summary>
/// 编辑数据方法
/// </summary>
private void EditData()
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return;
}
var getData = Funs.DB.Sp_Project_GetToDoItems(this.CurrUser.LoginProjectId, this.CurrUser.PersonId).FirstOrDefault(x => x.DataId == Grid1.SelectedRowID);
if (getData != null) ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("{0}", getData.PCUrl, "编辑 - ")));
}
}
}
}

125
SGGL/FineUIPro.Web/SysManage/ProjectToDo.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,125 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.SysManage
{
public partial class ProjectToDo
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// lblNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNumber;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuEdit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
}
}

2
SGGL/FineUIPro.Web/SysManage/RoleListEdit.aspx.cs
View File

@ -30,7 +30,7 @@ namespace FineUIPro.Web.SysManage
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
if (!IsPostBack && this.CurrUser != null)
{
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
this.RoleId = Request.Params["roleId"];

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

@ -448,7 +448,7 @@ namespace FineUIPro.Web.ZHGL.RealName
join persons in Funs.DB.Person_Persons on x.PersonId equals persons.PersonId
join v in Funs.DB.ProjectData_TeamGroup on x.TeamGroupId equals v.TeamGroupId
join p in Funs.DB.Project_ProjectUnit on new { x.UnitId, x.ProjectId } equals new { p.UnitId, p.ProjectId }
where x.ProjectId == projectId
where x.ProjectId == projectId && p.IsSynchro == true
&& persons.IsCardNoOK == true
&& v.TeamId.HasValue && persons.HeadImage != null && persons.HeadImage.Length > 0
&& !x.RealNameAddTime.HasValue
@ -495,7 +495,7 @@ namespace FineUIPro.Web.ZHGL.RealName
var getIdentityCards = (from x in Funs.DB.SitePerson_Person
join v in Funs.DB.ProjectData_TeamGroup on x.TeamGroupId equals v.TeamGroupId
join p in Funs.DB.Project_ProjectUnit on new { x.UnitId, x.ProjectId } equals new { p.UnitId, p.ProjectId }
where x.ProjectId == projectId && v.TeamId.HasValue
where x.ProjectId == projectId && v.TeamId.HasValue && p.IsSynchro == true
&& !x.RealNameUpdateTime.HasValue
//&& x.RealNameAddTime.HasValue
&& p.UnitType != Const.ProjectUnitType_3 && p.UnitType != Const.ProjectUnitType_4

5
SGGL/FineUIPro.Web/common/Menu_ToDo.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Tree>
<TreeNode id="AEBFEC10-DD23-4E95-A684-B291A681A5E8" Text="待办信息" NavigateUrl="SysManage/ProjectToDo.aspx">
</TreeNode>
</Tree>

34
SGGL/FineUIPro.Web/common/PageBase.cs
View File

@ -23,22 +23,26 @@ namespace FineUIPro.Web
{
get
{
if (Session["CurrUser"] == null)
{
string account = string.Empty;
string password = string.Empty;
if (Request.Cookies["u"] != null)
{
account = HttpUtility.UrlDecode(Request.Cookies["u"].Value);
}
if (Request.Cookies["p"] != null)
{
password = Request.Cookies["p"].Value;
}
Session["CurrUser"] = BLL.Funs.DB.Person_Persons.FirstOrDefault(x => x.Account == account && x.Password == Funs.EncryptionPassword(password));
}
if (Session["CurrUser"] == null) return null;
return (Model.Person_Persons)Session["CurrUser"];
//if (Session["CurrUser"] == null)
//{
// string account = string.Empty;
// string password = string.Empty;
// if (Request.Cookies["u"] != null)
// {
// account = HttpUtility.UrlDecode(Request.Cookies["u"].Value);
// }
// if (Request.Cookies["p"] != null)
// {
// password = Request.Cookies["p"].Value;
// }
// Session["CurrUser"] = BLL.Funs.DB.Person_Persons.FirstOrDefault(x => x.Account == account && x.Password == Funs.EncryptionPassword(password));
//}
//return (Model.Person_Persons)Session["CurrUser"];
}
}

21
SGGL/FineUIPro.Web/indexProject.aspx
View File

@ -11,6 +11,9 @@
<link rel="stylesheet" href="~/res/indexv1/iconfont/iconfont.css" />
<link rel="stylesheet" href="~/res/indexv1/css/index2.css" />
<style type="text/css">
.sd-header2 .sd-header2-right ul li .sd-message-dot-none::after {
display:none;
}
.f-tabstrip-header-clip {
width: 100%;
height: 35px;
@ -257,7 +260,10 @@
</div>
<div class="sd-header2-right">
<ul>
<li class="js-showTab-item"><a href="#"><span class="sd-message-dot"><i class="iconfont icon-message"></i></span>消息</a></li>
<li class="js-showTab-item top-li-item"><a href="#"><span <%=cssMessage %> class="sd-message-dot <%=cssMessageNo %>"><i class="iconfont icon-message"></i></span>消息</a><f:Button runat="server" CssClass="bgbtn2" OnClick="btnToDoItem_Click"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnToDoItem" OnClientClick="parent.removeActiveTab();">
</f:Button>
</li>
<li class="js-showTab-item top-li-item"><a href="javascript:void(0);"><span><i class="iconfont icon-user"></i></span><span id="userName" runat="server"></span></a>
<f:Button runat="server" CssClass="bgbtn2" OnClick="btnPersonal_Click"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnPersonal" OnClientClick="parent.removeActiveTab();">
@ -571,8 +577,19 @@
F.addMainTab(F(mainTabStripClientID), tabOptions);
}
function changeClient(e) {
var eText = e || 0
console.log('ex', eText)
var $msgItem = $(".sd-message-dot")
if (eText == 0) {
$msgItem.addClass("sd-message-dot-none")
} else {
$msgItem.removeClass("sd-message-dot-none")
}
}
// 移除选中标签页
function removeActiveTab() {
function removeActiveTab(e) {
var mainTabStrip = F(mainTabStripClientID);
var activeTab = mainTabStrip.getActiveTab();
if (activeTab) {

40
SGGL/FineUIPro.Web/indexProject.aspx.cs
View File

@ -1,4 +1,5 @@
using BLL;
using Aspose.Words;
using BLL;
using System;
using System.Collections.Generic;
using System.IO;
@ -16,9 +17,12 @@ namespace FineUIPro.Web
#region Page_Init
private string _menuType = "menu";
public string cssMessage = "";
public string cssMessageNo = "";
// private bool _compactMode = false;
private int _examplesCount = 0;
private string _searchText = "";
#region Page_Init
/// <summary>
@ -300,6 +304,17 @@ namespace FineUIPro.Web
this.drpProject.SelectedValue = Request.Params["projectId"];
}
// 首次进页面设置消息的数量
var getDataList = Funs.DB.Sp_Project_GetToDoItems(this.drpProject.SelectedValue ?? this.CurrUser.LoginProjectId, this.CurrUser.PersonId);
if (getDataList.Count() == 0)
{
cssMessageNo = "sd-message-dot-none";
}
else
{
cssMessageNo = "";
}
if (!string.IsNullOrEmpty(Request.Params["projectName"]))
{
var getproject = ProjectService.GetProjectByProjectName(Request.Params["projectName"]);
@ -539,8 +554,19 @@ namespace FineUIPro.Web
protected void drpProject_SelectedIndexChanged(object sender, EventArgs e)
{
// 下拉选择项目后，查询对应的消息数量，changeClient有数量传1，无数量传0
var getDataList = Funs.DB.Sp_Project_GetToDoItems(this.drpProject.SelectedValue ?? this.CurrUser.LoginProjectId, this.CurrUser.PersonId);
if (getDataList.Count() == 0)
{
PageContext.RegisterStartupScript("parent.changeClient(0);");
}
else
{
PageContext.RegisterStartupScript("parent.changeClient(1);");
}
this.Tab1.RefreshIFrame();
this.CurrUser.LoginProjectId = this.drpProject.SelectedValue;
PageContext.RegisterStartupScript("parent.removeActiveTab();");
MenuSwitchMethod(this.CurrUser.LastMenuType);
}
@ -559,7 +585,7 @@ namespace FineUIPro.Web
if (!string.IsNullOrEmpty(type))
{
this.CurrUser.LastProjectId = this.CurrUser.LoginProjectId;
if (CommonService.IsHaveSystemPower(this.CurrUser.PersonId, type, this.CurrUser.LoginProjectId) || type == Const.Menu_Personal)
if (CommonService.IsHaveSystemPower(this.CurrUser.PersonId, type, this.CurrUser.LoginProjectId) || type == Const.Menu_Personal || type == Const.Menu_ToDo)
{
this.XmlDataSource1.DataFile = "common/" + type + ".xml";
this.leftPanel.Hidden = false;
@ -575,7 +601,6 @@ namespace FineUIPro.Web
else if (type == Const.Menu_HJGL)
{
this.Tab1.IFrameUrl = "~/common/mainMenu_HJGL_AVEVA.aspx";
}
else if (type == Const.Menu_PZHGL)
{
@ -586,6 +611,10 @@ namespace FineUIPro.Web
{
this.Tab1.IFrameUrl = "~/Person/ProjectPerson.aspx";
}
else if (type == Const.Menu_ToDo)
{
this.Tab1.IFrameUrl = "~/SysManage/ProjectToDo.aspx";
}
}
else
{
@ -670,5 +699,10 @@ namespace FineUIPro.Web
{
this.MenuSwitchMethod(Const.Menu_JDGL);
}
protected void btnToDoItem_Click(object sender, EventArgs e)
{
this.MenuSwitchMethod(Const.Menu_ToDo);
}
}
}

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

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

48
SGGL/Model/Model.cs
View File

@ -59831,6 +59831,8 @@ namespace Model
private System.Nullable<decimal> _SumMoney;
private string _NextManId;
private EntityRef<Base_Project> _Base_Project;
private EntityRef<Base_Unit> _Base_Unit;
@ -59875,6 +59877,8 @@ namespace Model
partial void OnCompileDateChanged();
partial void OnSumMoneyChanging(System.Nullable<decimal> value);
partial void OnSumMoneyChanged();
partial void OnNextManIdChanging(string value);
partial void OnNextManIdChanged();
#endregion
public CostGoods_CostManage()
@ -60199,6 +60203,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NextManId", DbType="NVarChar(50)")]
public string NextManId
{
get
{
return this._NextManId;
}
set
{
if ((this._NextManId != value))
{
this.OnNextManIdChanging(value);
this.SendPropertyChanging();
this._NextManId = value;
this.SendPropertyChanged("NextManId");
this.OnNextManIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_CostGoods_CostManage_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project
{
@ -191083,6 +191107,8 @@ namespace Model
private System.Nullable<System.DateTime> _RealNamePushTime;
private System.Nullable<bool> _IsSynchro;
private EntityRef<Base_Project> _Base_Project;
private EntityRef<Base_Unit> _Base_Unit;
@ -191115,6 +191141,8 @@ namespace Model
partial void OnAuditManChanged();
partial void OnRealNamePushTimeChanging(System.Nullable<System.DateTime> value);
partial void OnRealNamePushTimeChanged();
partial void OnIsSynchroChanging(System.Nullable<bool> value);
partial void OnIsSynchroChanged();
#endregion
public Project_ProjectUnit()
@ -191372,6 +191400,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSynchro", DbType="Bit")]
public System.Nullable<bool> IsSynchro
{
get
{
return this._IsSynchro;
}
set
{
if ((this._IsSynchro != value))
{
this.OnIsSynchroChanging(value);
this.SendPropertyChanging();
this._IsSynchro = value;
this.SendPropertyChanged("IsSynchro");
this.OnIsSynchroChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Project_ProjectUnit_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project
{

17
SGGL/Model/ModelProc.cs
View File

@ -28,9 +28,22 @@ namespace Model
/// <param name="isono"></param>
/// <returns></returns>
[Function(Name = "[dbo].[Sp_Main_GetToDoItems]")]
public IEnumerable<ToDoItem> Sp_Main_GetToDoItems([Parameter(DbType = "nvarchar(50)")] string userId)
public IEnumerable<ToDoItem> Sp_Main_GetToDoItems([Parameter(DbType = "nvarchar(50)")] string personId)
{
IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)MethodInfo.GetCurrentMethod()), userId);
IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)MethodInfo.GetCurrentMethod()), personId);
return (ISingleResult<ToDoItem>)result.ReturnValue;
}
/// <summary>
/// 获取当前用户在项目待办事项
/// </summary>
/// <param name="unitcode"></param>
/// <param name="isono"></param>
/// <returns></returns>
[Function(Name = "[dbo].[Sp_Project_GetToDoItems]")]
public IEnumerable<ToDoItem> Sp_Project_GetToDoItems([Parameter(DbType = "nvarchar(50)")] string projectId, [Parameter(DbType = "nvarchar(50)")] string personId)
{
IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)MethodInfo.GetCurrentMethod()), projectId, personId);
return (ISingleResult<ToDoItem>)result.ReturnValue;
}

10
SGGL/WebAPI/ErrLog.txt
View File

@ -1 +1,11 @@

错误信息开始=====>
错误类型:FormatException
错误信息:输入字符串的格式不正确。
错误堆栈:
在 System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal)
在 System.Number.ParseInt32(String s, NumberStyles style, NumberFormatInfo info)
在 BLL.Funs.GetNewInt(String value) 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\BLL\Common\Funs.cs:行号 507
出错时间:06/13/2023 14:34:59
出错时间:06/13/2023 14:34:59

2
SGGL/WebAPI/WebAPI.csproj
View File

@ -361,7 +361,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>0</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:3305/</IISUrl>
<IISUrl>http://localhost:9850/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>