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

积分优化

Browse Source
This commit is contained in:
夏菊
2026-10-17 10:34:45 +08:00
parent 29b15d4b54
commit bbd0e6d392
27 changed files with 1054 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataBase/版本日志/SGGLDB_V2026-10-16-xiaj.sql
+15
View File
@@ -0,0 +1,15 @@
update Sys_Menu
set MenuName='记分流水日志'
where MenuName like '%得分%'
go
--公司级：积分榜
IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = '94128BC0-75E3-4E27-9629-8775066DAFE7')
BEGIN
INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
VALUES (N'94128BC0-75E3-4E27-9629-8775066DAFE7', N'积分榜', 'Score/Standings.aspx', 25, N'416F0A73-FB3D-4AAC-BC76-3820F52382D9', N'Menu_S_HSSE', 1,1, 1);
END
GO
DataBase/版本日志/SGGLDB_V2026-10-16-xiaj（View_SitePerson_PersonList）.sql
+46
View File
@@ -0,0 +1,46 @@
ALTER VIEW [dbo].[View_SitePerson_PersonList]
AS
SELECT
Person.PersonId,
Person.ProjectId,
Person.IsUsed,
Person.IsForeign,
Person.IsOutside,
Person.BlackList,
Person.CardNo,
Person.PersonName,
su.Score,
Person.UnitId,
Unit.UnitName,
WorkAreaName= STUFF((SELECT ',' + UnitWorkName FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +Person.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''),
TeamGroup.TeamGroupName,
Person.InTime,
Person.OutTime,
(CASE Person.IsUsed WHEN 'TRUE' THEN 'ÊÇ' ELSE '·ñ' END) AS IsUsedName,
Person.IdentityCard,
Person.TeamGroupId,
Person.WorkPostId,
Post.WorkPostName,
Person.IdcardType,
Person.PhotoUrl,
edu.TrainCount,
PoliticsStatus.dictName AS PoliticsStatusName
--,Person.PostTrainingRoleId,
--PostRole.Name AS PostTrainingRoleName
FROM SitePerson_Person AS Person
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Person.UnitId
LEFT JOIN ScoreUser AS su ON su.IdentityCard = Person.IdentityCard AND su.Year=YEAR(GETDATE())
LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId=Person.TeamGroupId
LEFT JOIN Base_WorkPost AS Post ON Post.WorkPostId = Person.WorkPostId
LEFT JOIN RealName_BasicData AS PoliticsStatus ON PoliticsStatus.dictCode = Person.PoliticsStatus AND PoliticsStatus.DictTypeCode='POLITICAL_LANDSCAPE'
LEFT JOIN (select PersonId,count(PersonId)as TrainCount from EduTrain_TrainRecordDetail group by PersonId) as edu on edu.PersonId= Person.PersonId
--LEFT JOIN PostTraining_Role AS PostRole ON PostRole.Id = Person.PostTrainingRoleId
GO
DataBase/版本日志/SGGLDB_V2026-10-16-xiaj（View_SitePerson_Person）.sql
+119
View File
@@ -0,0 +1,119 @@
ALTER VIEW [dbo].[View_SitePerson_Person]
AS
SELECT Person.PersonId,
Person.CardNo,
Person.PersonName,
su.Score,
Person.Sex,
(Case Person.Sex WHEN '1' THEN '男' WHEN '2' THEN '女' ELSE '' END) AS SexName,
Person.IdentityCard,
Person.Address,
Person.ProjectId,
Person.UnitId,
Person.Birthday,
Person.TeamGroupId,
Person.WorkAreaId,
Person.WorkPostId,
Person.InTime,
Person.OutTime,
Person.OutResult,
Person.Telephone,
Person.PositionId,
Person.PostTitleId,
Person.InstitutionalDivisionId,
Person.EmployeeCategoryId,
Person.EmployeeSubgroupId,
Person.DepartId,
Person.PhotoUrl,
Person.IsUsed,
Person.Remarks,
(CASE Person.IsUsed WHEN 'TRUE' THEN '是' ELSE '否' END) AS IsUsedName,
Person.IsCardUsed,
(CASE Person.IsCardUsed WHEN 'TRUE' THEN '是' ELSE '否' END) AS IsCardUsedName,
Person.PersonIndex,
Project.ProjectCode,
Project.ProjectName,
Unit.UnitCode,
Unit.UnitName,
TeamGroup.TeamGroupName,
--WorkArea.UnitWorkCode AS WorkAreaCode,
WorkAreaCode= STUFF((SELECT ',' + UnitWorkCode FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +Person.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''),
--WorkArea.UnitWorkName AS WorkAreaName
WorkAreaName= STUFF((SELECT ',' + UnitWorkName FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +Person.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''),
Post.WorkPostName,
Position.PositionName,
Title.PostTitleName,
Depart.DepartName,
EmployeeCategory.CategoryName as EmployeeCategoryName,
EmployeeSubgroup.SubgroupName as EmployeeSubgroupName,
Division.Name as InstitutionalDivisionName,
Post.PostType,
Post.IsHsse,
(SELECT COUNT(*) FROM EduTrain_TrainRecordDetail T WHERE T.PersonId=Person.PersonId) AS TrainCount,
Person.AuditorId,
sysUser.UserName AS AuditorName,
Person.AuditorDate,
Person.IDCardUrl,
Person.IsForeign,
case when Person.IsForeign=1 then '是' else '否' end as IsForeignStr,
Person.IdcardType,
BasicData1.dictName as IdcardTypeName,
Person.IdcardStartDate,
Person.IdcardEndDate,
Person.IdcardForever,
case when Person.IdcardForever='Y' then '是' else '否' end as IdcardForeverStr,
Person.PoliticsStatus,
BasicData2.dictName as PoliticsStatusName,
Person.IdcardAddress,
Person.Nation,
BasicData3.dictName as NationName,
Person.EduLevel,
BasicData4.dictName as EduLevelName,
Person.MaritalStatus,
BasicData5.dictName as MaritalStatusName,
Person.CountryCode,
Country.cname as CountryName,
Person.ProvinceCode,
City.cname as ProvinceName,
Person.MainCNProfessionalId,
CNProfessional.ProfessionalName as MainCNProfessionalName,
Person.ViceCNProfessionalId,
'' as ViceCNProfessionalName,
Person.IsOutside,
case when Person.IsOutside=1 then '是' else '否' end as IsOutsideStr,
Person.BlackList,
Person.BlackReason,
Person.States,
sysUser.StarLevelId,
StarLevel.StarMark,
StarLevel.LevelValue
FROM SitePerson_Person AS Person
LEFT JOIN Base_Project AS Project ON Project.ProjectId=Person.ProjectId
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Person.UnitId
LEFT JOIN ScoreUser AS su ON su.IdentityCard = Person.IdentityCard AND su.Year=YEAR(GETDATE())
LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId=Person.TeamGroupId
--LEFT JOIN WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = Person.WorkAreaId
LEFT JOIN Base_WorkPost AS Post ON Post.WorkPostId = Person.WorkPostId
LEFT JOIN Base_Position AS Position ON Position.PositionId = Person.PositionId
Left JOIN Base_PostTitle AS Title ON Title.PostTitleId = Person.PostTitleId
Left JOIN Base_Depart AS Depart ON Depart.DepartId = Person.DepartId
Left JOIN Base_EmployeeCategory AS EmployeeCategory ON EmployeeCategory.CategoryId = Person.EmployeeCategoryId
Left JOIN Base_EmployeeSubgroup AS EmployeeSubgroup ON EmployeeSubgroup.SubgroupId = Person.EmployeeSubgroupId
Left JOIN Base_InstitutionalDivision AS Division ON Division.Id = Person.InstitutionalDivisionId
Left JOIN Sys_User AS sysUser ON sysUser.UserId = Person.AuditorId
Left JOIN RealName_BasicData AS BasicData1 ON BasicData1.dictCode = Person.IdcardType
Left JOIN RealName_BasicData AS BasicData2 ON BasicData2.dictCode = Person.PoliticsStatus
Left JOIN RealName_BasicData AS BasicData3 ON BasicData3.dictCode = Person.Nation
Left JOIN RealName_BasicData AS BasicData4 ON BasicData4.dictCode = Person.EduLevel
Left JOIN RealName_BasicData AS BasicData5 ON BasicData5.dictCode = Person.MaritalStatus
Left JOIN RealName_Country AS Country ON Country.CountryId = Person.CountryCode
Left JOIN RealName_City AS City ON City.provinceCode = Person.ProvinceCode
Left JOIN Base_CNProfessional AS CNProfessional ON CNProfessional.CNProfessionalId = Person.MainCNProfessionalId
Left JOIN Base_StarLevel AS StarLevel ON sysUser.StarLevelId = StarLevel.StarLevelId
GO
SGGL/BLL/Score/ScoreUserService.cs
+21 -13
View File
@@ -1,5 +1,4 @@
using Model;
using NPOI.SS.UserModel;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -20,7 +19,6 @@ namespace BLL
{
return Funs.DB.ScoreUser.FirstOrDefault(e => e.Id == Id);
}
/// <summary>
/// 根据证件号码获取人员今年上一条得分记录
/// </summary>
@@ -55,17 +53,27 @@ namespace BLL
/// <param name="model">人员得分实体</param>
public static void AddScoreUser(Model.ScoreUser model)
{
Model.ScoreUser newModel = new Model.ScoreUser();
newModel.Id = model.Id;
newModel.Year = model.Year;
newModel.IdentityCard = model.IdentityCard;
newModel.UserName = model.UserName;
newModel.Score = model.Score;
newModel.CompileDate = model.CompileDate;
newModel.DataSourceId = model.DataSourceId;
newModel.CheckDate = model.CheckDate;
Funs.DB.ScoreUser.InsertOnSubmit(newModel);
Funs.DB.SubmitChanges();
var su = Funs.DB.ScoreUser.FirstOrDefault(e => e.IdentityCard == model.IdentityCard && e.Year == model.Year);
if (su != null)
{//已存在，修改人员今年得分值
su.Score = model.Score;
su.CompileDate = model.CompileDate;
Funs.DB.SubmitChanges();
}
else
{
Model.ScoreUser newModel = new Model.ScoreUser();
newModel.Id = model.Id;
newModel.Year = model.Year;
newModel.IdentityCard = model.IdentityCard;
newModel.UserName = model.UserName;
newModel.Score = model.Score;
newModel.CompileDate = model.CompileDate;
newModel.DataSourceId = model.DataSourceId;
newModel.CheckDate = model.CheckDate;
Funs.DB.ScoreUser.InsertOnSubmit(newModel);
Funs.DB.SubmitChanges();
}
}
/// <summary>
SGGL/BLL/SysManage/UnitService.cs
+52 -27
View File
@@ -153,7 +153,9 @@ namespace BLL
/// <returns></returns>
public static List<Model.Base_Unit> GetUnitDropDownList()
{
var list = (from x in Funs.DB.Base_Unit select x).OrderBy(x => x.UnitCode).ToList();
var list = (from x in Funs.DB.Base_Unit
orderby x.IsThisUnit descending, x.UnitCode ascending
select x).ToList();
return list;
}
@@ -163,7 +165,10 @@ namespace BLL
/// <returns></returns>
public static List<Model.Base_Unit> GetThisUnitDropDownList()
{
var list = (from x in Funs.DB.Base_Unit where x.UnitId == Const.UnitId_XJYJ select x).ToList();
var list = (from x in Funs.DB.Base_Unit
where x.UnitId == Const.UnitId_XJYJ
orderby x.IsThisUnit descending, x.UnitCode ascending
select x).ToList();
return list;
}
@@ -181,7 +186,10 @@ namespace BLL
var unitIdList = GetChildrenUnitId(unitId);
if (unitIdList.Count() > 0)
{
unitList = (from x in Funs.DB.Base_Unit where unitIdList.Contains(x.UnitId) || x.UnitId == unitId select x).ToList();
unitList = (from x in Funs.DB.Base_Unit
where unitIdList.Contains(x.UnitId) || x.UnitId == unitId
orderby x.IsThisUnit descending, x.UnitCode ascending
select x).ToList();
}
return unitList;
}
@@ -212,12 +220,14 @@ namespace BLL
{
var list = (from x in Funs.DB.Base_Unit
where x.IsBranch == true
select x).OrderBy(x => x.UnitCode).ToList();
orderby x.IsThisUnit descending, x.UnitCode ascending
select x).ToList();
if (isThisUnit)
{
list = (from x in Funs.DB.Base_Unit
where x.IsBranch == true || x.UnitId == Const.UnitId_XJYJ
select x).OrderBy(x => x.UnitCode).ToList();
orderby x.IsThisUnit descending, x.UnitCode ascending
select x).ToList();
}
return list;
}
@@ -237,15 +247,16 @@ namespace BLL
units = (from x in db.Base_Unit
join y in db.Project_ProjectUnit on x.UnitId equals y.UnitId
where y.ProjectId == projectId
orderby x.IsThisUnit descending, x.UnitCode ascending
select x).ToList();
}
else
{
units = (from x in db.Base_Unit
orderby x.UnitCode
orderby x.IsThisUnit descending, x.UnitCode ascending
select x).ToList();
}
units = units.OrderBy(x => x.UnitCode).ToList();
//units = units.OrderBy(x => x.UnitCode).ToList();
return units;
}
}
@@ -263,7 +274,7 @@ namespace BLL
join y in db.Project_ProjectUnit
on x.UnitId equals y.UnitId
where y.ProjectId == projectId
orderby x.UnitCode
orderby x.IsThisUnit descending, x.UnitCode ascending
select x).ToList();
return q;
}
@@ -282,7 +293,7 @@ namespace BLL
join y in db.Project_ProjectUnit
on x.UnitId equals y.UnitId
where y.ProjectId == projectId && (y.UnitType == unitType || string.IsNullOrEmpty(unitType))
orderby x.UnitCode
orderby x.IsThisUnit descending, x.UnitCode ascending
select x).ToList();
return q;
}
@@ -301,7 +312,7 @@ namespace BLL
join y in db.Project_ProjectUnit
on x.UnitId equals y.UnitId
where y.ProjectId == projectId && (y.UnitType == BLL.Const.ProjectUnitType_2 || y.UnitType == BLL.Const.ProjectUnitType_1)
orderby x.UnitCode
orderby x.IsThisUnit descending, x.UnitCode ascending
select x).ToList();
return q;
}
@@ -320,7 +331,7 @@ namespace BLL
join y in db.Project_ProjectUnit
on x.UnitId equals y.UnitId
where y.ProjectId == projectId && (x.UnitId != unitId || unitId == null)
orderby x.UnitCode
orderby x.IsThisUnit descending, x.UnitCode ascending
select x).ToList();
return q;
}
@@ -333,7 +344,7 @@ namespace BLL
join y in db.Project_ProjectUnit
on x.UnitId equals y.UnitId
where y.ProjectId == projectId && (unitId == null || x.UnitId != unitId) && (key == null || x.UnitCode.Contains(key) || x.UnitName.Contains(key))
orderby x.UnitCode
orderby x.IsThisUnit descending, x.UnitCode ascending
select x).ToList();
return q;
}
@@ -421,7 +432,10 @@ namespace BLL
public static List<Model.Base_Unit> GetMainAndSubUnitList()
{
//return (from x in Funs.DB.Base_Unit where x.IsThisUnit == true || x.IsBranch == true orderby x.IsThisUnit descending select x).ToList();
return (from x in Funs.DB.Base_Unit where x.IsThisUnit == true || x.IsBranch == true select x).ToList();
return (from x in Funs.DB.Base_Unit
where x.IsThisUnit == true || x.IsBranch == true
orderby x.IsThisUnit descending, x.UnitCode ascending
select x).ToList();
}
#region 单位表下拉框
@@ -557,11 +571,11 @@ namespace BLL
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var q = (from x in db.Base_Unit
join y in db.Project_ProjectUnit
on x.UnitId equals y.UnitId
join y in db.Project_ProjectUnit on x.UnitId equals y.UnitId
where y.ProjectId == projectId
&& (y.UnitType == BLL.Const.ProjectUnitType_1 || y.UnitType == BLL.Const.ProjectUnitType_2) && (y.OutTime == null || y.OutTime >= Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString() + "-01"))
select x).OrderBy(x => x.UnitCode).ToList();
orderby x.IsThisUnit descending, x.UnitCode ascending
select x).ToList();
return q;
}
}
@@ -620,16 +634,17 @@ namespace BLL
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var q = (from x in db.Base_Unit
orderby x.UnitCode
orderby x.IsThisUnit descending, x.UnitCode ascending
select x).ToList();
if (!string.IsNullOrEmpty(projectId))
{
q = (from x in q
join y in db.Project_ProjectUnit on x.UnitId equals y.UnitId
where (y.ProjectId == projectId && y.UnitType != Const.ProjectUnitType_2)
orderby x.IsThisUnit descending, x.UnitCode ascending
select x).ToList();
}
q = q.OrderByDescending(x => x.UnitCode).ToList();
//q = q.OrderByDescending(x => x.UnitCode).ToList();
return q;
}
}
@@ -741,7 +756,8 @@ namespace BLL
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == projectId
//where (x.UnitType == Const.ProjectUnitType_1 || x.UnitType == Const.ProjectUnitType_2)
orderby y.UnitCode
//orderby y.UnitCode
orderby y.IsThisUnit descending, y.UnitCode ascending
select y).ToList();
ListItem[] list = new ListItem[q.Count()];
for (int i = 0; i < list.Count(); i++)
@@ -805,7 +821,8 @@ namespace BLL
var q = (from x in Funs.DB.Project_ProjectUnit
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == projectId
orderby y.UnitCode
//orderby y.UnitCode
orderby y.IsThisUnit descending, y.UnitCode ascending
select y).ToList();
ListItem[] list = new ListItem[q.Count()];
for (int i = 0; i < list.Count(); i++)
@@ -827,7 +844,8 @@ namespace BLL
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
join z in Funs.DB.ProjectData_WorkArea on y.UnitId equals z.UnitId
where x.ProjectId == projectId && (y.UnitId == unitId || z.SupervisorUnitId == unitId) && x.UnitType == BLL.Const.ProjectUnitType_2
orderby y.UnitCode
//orderby y.UnitCode
orderby y.IsThisUnit descending, y.UnitCode ascending
select y).Distinct().ToList();
return q;
}
@@ -844,7 +862,8 @@ namespace BLL
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
join z in Funs.DB.ProjectData_WorkArea on y.UnitId equals z.UnitId
where x.ProjectId == projectId && (y.UnitId == unitId || z.SupervisorUnitId == unitId) && x.UnitType == BLL.Const.ProjectUnitType_2
orderby y.UnitCode
//orderby y.UnitCode
orderby y.IsThisUnit descending, y.UnitCode ascending
select y).Distinct().ToList();
ListItem[] list = new ListItem[q.Count()];
for (int i = 0; i < q.Count(); i++)
@@ -861,7 +880,7 @@ namespace BLL
/// <param name="projectId"></param>
/// <param name="unitId"></param>
/// <param name="isShowPlease"></param>
public static void InitSubUnitNameDownList(FineUIPro.DropDownList dropName, string projectId,string unitId, bool isShowPlease)
public static void InitSubUnitNameDownList(FineUIPro.DropDownList dropName, string projectId, string unitId, bool isShowPlease)
{
dropName.DataValueField = "Value";
dropName.DataTextField = "Text";
@@ -883,8 +902,9 @@ namespace BLL
{
var q = (from x in Funs.DB.Project_ProjectUnit
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == projectId && y.UnitId == unitId && x.UnitType == BLL.Const.ProjectUnitType_2
orderby y.UnitCode
where x.ProjectId == projectId && y.UnitId == unitId && x.UnitType == BLL.Const.ProjectUnitType_2
//orderby y.UnitCode
orderby y.IsThisUnit descending, y.UnitCode ascending
select y).Distinct().ToList();
ListItem[] list = new ListItem[q.Count()];
for (int i = 0; i < q.Count(); i++)
@@ -952,7 +972,10 @@ namespace BLL
{
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
var q = (from x in db.Base_Unit where x.UnitId != BLL.Const.UnitId_XJYJ orderby x.UnitCode select x).ToList();
var q = (from x in db.Base_Unit
where x.UnitId != BLL.Const.UnitId_XJYJ
orderby x.IsThisUnit descending, x.UnitCode ascending
select x).ToList();
return q;
}
}
@@ -961,7 +984,9 @@ namespace BLL
{
dropName.DataValueField = "UnitId";
dropName.DataTextField = "UnitName";
dropName.DataSource = (from x in Funs.DB.Base_Unit orderby x.UnitCode select x).ToList();
dropName.DataSource = (from x in Funs.DB.Base_Unit
orderby x.IsThisUnit descending, x.UnitCode ascending
select x).ToList();
dropName.DataBind();
if (isShowPlease)
{
SGGL/BLL/SysManage/UserService.cs
-1
View File
@@ -492,7 +492,6 @@ namespace BLL
orderby x.UserName
select x).ToList();
}
}
else
{
SGGL/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs
-23
View File
@@ -150,35 +150,12 @@ namespace BLL
{
var q = GetTodayData();
var data = new HJGLData();
if (CommonService.GetIsThisUnit().CollCropCode== "91410200170644116B")
{
return GetELECLTodayHJGLData_HJGL();
}
if (q != null && q.State == Const.CNCEC_State_S)
data = StatisticalData();
else
data = StatisticalData();
return data;
}
/// <summary>
/// 获取十一化建焊接数据
/// </summary>
/// <returns></returns>
public static HJGLData GetELECLTodayHJGLData_HJGL()
{
var data = new HJGLData();
string baseurl = "http://36.99.162.230:9493/sgglapi/api/CNCECServer/PostGetHJGLData";
string token = Const.sysglyId;
string response = Funs.RequestPost(baseurl, token, "");
var json = JsonConvert.DeserializeObject(response) as JObject;
if (json != null && json["code"]?.ToString()=="1")
{
var str = json["data"]?.ToString();
if (str != null) data = JsonConvert.DeserializeObject<HJGLData>(str);
}
return data;
}
public static HJGLData_HJGL GetTodayData()
{
SGGL/FineUIPro.Web/Check/HSE/CheckProblemEdit.aspx.cs
+32 -21
View File
@@ -1,6 +1,5 @@
using BLL;
using Model;
using NPOI.SS.Formula.Functions;
using System;
namespace FineUIPro.Web.Check.HSE
@@ -55,28 +54,38 @@ namespace FineUIPro.Web.Check.HSE
var model = CheckProblemSafetyService.GetCheckProblemById(this.CheckId);
if (model != null)
{
this.drpUnit.SelectedValue = model.UnitId;
this.drpRectificationUser.Items.Clear();
BLL.UserService.InitUserUnitIdDropDownList(this.drpRectificationUser, this.drpUnit.SelectedValue, true);
this.drpPMUser.Items.Clear();
BLL.UserService.InitUserUnitIdDropDownList(this.drpPMUser, this.drpUnit.SelectedValue, true);
if (!string.IsNullOrWhiteSpace(model.UnitId))
{
this.drpUnit.SelectedValue = model.UnitId;
this.drpRectificationUser.Items.Clear();
BLL.UserService.InitUserUnitIdDropDownList(this.drpRectificationUser, model.UnitId, true);
this.drpPMUser.Items.Clear();
BLL.UserService.InitUserUnitIdDropDownList(this.drpPMUser, model.UnitId, true);
BLL.ProjectService.InitProjectDropDownList(this.drpProject, model.UnitId, true);
BLL.ProjectService.InitProjectDropDownList(this.drpProject, model.UnitId, true);
}
if (!string.IsNullOrWhiteSpace(model.ProjectId))
{
this.drpProject.SelectedValue = model.ProjectId;
}
if (!string.IsNullOrWhiteSpace(model.ProjectName))
{
this.drpProject.Text = model.ProjectName;
}
var pro = BLL.ProjectService.GetProjectByProjectId(model.ProjectId);
if (pro != null)
{
var pro = BLL.ProjectService.GetProjectByProjectId(model.ProjectId);
this.txtAddress.Text = pro.ProjectAddress;
this.drpRectificationUser.Items.Clear();
BLL.UserService.InitUserDropDownList(this.drpRectificationUser, model.ProjectId, true);
this.drpPMUser.Items.Clear();
BLL.UserService.InitUserDropDownList(this.drpPMUser, model.ProjectId, true);
}
else if (!string.IsNullOrWhiteSpace(model.ProjectName))
{
this.drpProject.Text = model.ProjectName;
}
//var pro = BLL.ProjectService.GetProjectByProjectId(model.ProjectId);
//if (pro != null)
//{
// this.txtAddress.Text = pro.ProjectAddress;
// this.drpPMUser.Items.Clear();
// BLL.UserService.InitUserDropDownList(this.drpPMUser, model.ProjectId, true);
//}
this.drpClassify.SelectedValue = model.ClassifyId;
BLL.SafetyProblemClassifyItemService.InitClassifyItemDownList(this.drpClassifyItem, model.ClassifyId, true);
@@ -143,8 +152,8 @@ namespace FineUIPro.Web.Check.HSE
{
//受检单位
UnitService.InitBranchUnitDropDownList(this.drpUnit, false);
//受检项目
ProjectService.InitProjectDropDownList(this.drpProject, true);
////受检项目
//ProjectService.InitProjectDropDownList(this.drpProject, true);
//问题分类
SafetyProblemClassifyService.InitClassifyDropDownList(this.drpClassify, false);
//问题性质
@@ -158,9 +167,9 @@ namespace FineUIPro.Web.Check.HSE
/// <param name="e"></param>
protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
{
//this.drpProject.Items.Clear();
////受检项目
//BLL.ProjectService.InitProjectDropDownList(this.drpProject, this.drpUnit.SelectedValue, true);
this.drpProject.Items.Clear();
//受检项目
BLL.ProjectService.InitProjectDropDownList(this.drpProject, this.drpUnit.SelectedValue, true);
this.drpRectificationUser.Items.Clear();
BLL.UserService.InitUserUnitIdDropDownList(this.drpRectificationUser, this.drpUnit.SelectedValue, true);
@@ -182,6 +191,8 @@ namespace FineUIPro.Web.Check.HSE
if (pro != null)
{
this.txtAddress.Text = pro.ProjectAddress;
this.drpRectificationUser.Items.Clear();
BLL.UserService.InitUserDropDownList(this.drpRectificationUser, proId, true);
this.drpPMUser.Items.Clear();
BLL.UserService.InitUserDropDownList(this.drpPMUser, proId, true);
}
@@ -386,7 +397,6 @@ namespace FineUIPro.Web.Check.HSE
////增加一条编码记录
//BLL.CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(BLL.Const.SafetyCheckProblemMenuId, model.ProjectId, null, model.CheckId, model.CheckDate);
}
else
{
@@ -478,6 +488,7 @@ namespace FineUIPro.Web.Check.HSE
{
log.CurrentScore = 100 + log.Score;
}
log.CurrentScore = log.CurrentScore < 0 ? 0 : log.CurrentScore;
BLL.ScoreFlowLogService.AddScoreFlowLog(log);
//增加人员记分情况
SGGL/FineUIPro.Web/Check/HSE/CheckProblemIn.aspx.cs
+1
View File
@@ -759,6 +759,7 @@ namespace FineUIPro.Web.Check.HSE
{
log.CurrentScore = 100 + log.Score;
}
log.CurrentScore = log.CurrentScore < 0 ? 0 : log.CurrentScore;
BLL.ScoreFlowLogService.AddScoreFlowLog(log);
SGGL/FineUIPro.Web/Check/QMS/CheckProblemEdit.aspx.cs
+30 -7
View File
@@ -54,11 +54,32 @@ namespace FineUIPro.Web.Check.QMS
var model = CheckProblemQualityService.GetCheckProblemById(this.CheckId);
if (model != null)
{
this.drpUnit.SelectedValue = model.UnitId;
BLL.ProjectService.InitProjectDropDownList(this.drpProject, model.UnitId, true);
if (!string.IsNullOrWhiteSpace(model.UnitId))
{
this.drpUnit.SelectedValue = model.UnitId;
this.drpRectificationUser.Items.Clear();
BLL.UserService.InitUserUnitIdDropDownList(this.drpRectificationUser, model.UnitId, true);
this.drpPMUser.Items.Clear();
BLL.UserService.InitUserUnitIdDropDownList(this.drpPMUser, model.UnitId, true);
this.drpQCUser.Items.Clear();
BLL.UserService.InitUserUnitIdDropDownList(this.drpQCUser, model.UnitId, true);
BLL.ProjectService.InitProjectDropDownList(this.drpProject, model.UnitId, true);
}
//this.drpUnit.SelectedValue = model.UnitId;
//BLL.ProjectService.InitProjectDropDownList(this.drpProject, model.UnitId, true);
if (!string.IsNullOrWhiteSpace(model.ProjectId))
{
this.drpProject.SelectedValue = model.ProjectId;
var pro = BLL.ProjectService.GetProjectByProjectId(model.ProjectId);
this.txtAddress.Text = pro.ProjectAddress;
this.drpRectificationUser.Items.Clear();
BLL.UserService.InitUserDropDownList(this.drpRectificationUser, model.ProjectId, true);
this.drpPMUser.Items.Clear();
BLL.UserService.InitUserDropDownList(this.drpPMUser, model.ProjectId, true);
this.drpQCUser.Items.Clear();
BLL.UserService.InitUserUnitIdDropDownList(this.drpQCUser, model.ProjectId, true);
}
else if (!string.IsNullOrWhiteSpace(model.ProjectName))
{
@@ -133,8 +154,8 @@ namespace FineUIPro.Web.Check.QMS
{
//受检单位
UnitService.InitBranchUnitDropDownList(this.drpUnit, false);
//受检项目
ProjectService.InitProjectDropDownList(this.drpProject, true);
////受检项目
//ProjectService.InitProjectDropDownList(this.drpProject, true);
//问题分类
QualityProblemClassifyService.InitClassifyDropDownList(this.drpClassify, false);
//问题性质
@@ -148,9 +169,9 @@ namespace FineUIPro.Web.Check.QMS
/// <param name="e"></param>
protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
{
//this.drpProject.Items.Clear();
////受检项目
//BLL.ProjectService.InitProjectDropDownList(this.drpProject, this.drpUnit.SelectedValue, true);
this.drpProject.Items.Clear();
//受检项目
BLL.ProjectService.InitProjectDropDownList(this.drpProject, this.drpUnit.SelectedValue, true);
this.drpRectificationUser.Items.Clear();
BLL.UserService.InitUserUnitIdDropDownList(this.drpRectificationUser, this.drpUnit.SelectedValue, true);
@@ -174,6 +195,8 @@ namespace FineUIPro.Web.Check.QMS
if (pro != null)
{
this.txtAddress.Text = pro.ProjectAddress;
this.drpRectificationUser.Items.Clear();
BLL.UserService.InitUserDropDownList(this.drpRectificationUser, proId, true);
this.drpPMUser.Items.Clear();
BLL.UserService.InitUserDropDownList(this.drpPMUser, proId, true);
this.drpQCUser.Items.Clear();
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+8
View File
@@ -3267,6 +3267,7 @@
<Content Include="File\Excel\HJGL_DataOut\设备焊口检测委托单.xlsx" />
<Content Include="File\Excel\HJGL_DataOut\设备焊口返修委托单.xlsx" />
<None Include="Scripts\jquery-2.1.1.intellisense.js" />
<Content Include="Score\Standings.aspx" />
<Content Include="Score\ScoreFlowLog.aspx" />
<Content Include="Scripts\jquery-2.1.1.js" />
<Content Include="Scripts\jquery-2.1.1.min.js" />
@@ -17886,6 +17887,13 @@
<DependentUpon>imageUp.ashx</DependentUpon>
</Compile>
<Compile Include="res\umeditor\net\Uploader.cs" />
<Compile Include="Score\Standings.aspx.cs">
<DependentUpon>Standings.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Score\Standings.aspx.designer.cs">
<DependentUpon>Standings.aspx</DependentUpon>
</Compile>
<Compile Include="Score\ScoreFlowLog.aspx.cs">
<DependentUpon>ScoreFlowLog.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
SGGL/FineUIPro.Web/Global.asax.cs
+14 -11
View File
@@ -1,17 +1,12 @@
namespace FineUIPro.Web
{
using BLL;
using FineUIPro.Web.Score;
using Model;
using NPOI.SS.Formula.Functions;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data.SqlClient;
using System.Globalization;
using System.Linq;
using System.Text;
using System.Windows.Forms;
public class Global : System.Web.HttpApplication
{
@@ -60,7 +55,7 @@
//定义一个定时器，并开启和配置相关属性
System.Timers.Timer Wtimer = new System.Timers.Timer();
//执行任务的周期 ,60分钟
Wtimer.Interval =1000 * 60 * 60; //120000;
Wtimer.Interval = 1000 * 60 * 60; //120000;
Wtimer.Enabled = true;
Wtimer.Start();
Wtimer.Elapsed += new System.Timers.ElapsedEventHandler(Wtimer_Elapsed);
@@ -74,9 +69,10 @@
void Wtimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{
//考试大于等于80分通过，且没有加过分的记录，加分
var testRecordList = (from x in Funs.DB.View_Training_TestRecord where x.TestScores >= 80
&& !Funs.DB.ScoreFlowLog.Any(log => log.DataSourceId == x.TestRecordId)
orderby x.TestStartTime select x).ToList();
var testRecordList = (from x in Funs.DB.View_Training_TestRecord
where x.TestScores >= 80 && !Funs.DB.ScoreFlowLog.Any(log => log.DataSourceId == x.TestRecordId)
orderby x.TestStartTime
select x).ToList();
foreach (var item in testRecordList)
{
//查找最新一条积分记录
@@ -137,6 +133,7 @@
newlog.CurrentScore = 102;
}
}
newlog.CurrentScore = newlog.CurrentScore < 0 ? 0 : newlog.CurrentScore;
BLL.ScoreFlowLogService.AddScoreFlowLog(newlog);
//人员记分情况
@@ -203,6 +200,7 @@
newlog.CurrentScore = 102;
}
}
newlog.CurrentScore = newlog.CurrentScore < 0 ? 0 : newlog.CurrentScore;
BLL.ScoreFlowLogService.AddScoreFlowLog(newlog);
//人员记分情况
@@ -257,6 +255,7 @@
{
newlog.CurrentScore = 102;
}
newlog.CurrentScore = newlog.CurrentScore < 0 ? 0 : newlog.CurrentScore;
BLL.ScoreFlowLogService.AddScoreFlowLog(newlog);
//人员记分情况
@@ -327,6 +326,7 @@
newlog.CurrentScore = 102;
}
}
newlog.CurrentScore = newlog.CurrentScore < 0 ? 0 : newlog.CurrentScore;
BLL.ScoreFlowLogService.AddScoreFlowLog(newlog);
//人员记分情况
@@ -393,6 +393,7 @@
newlog.CurrentScore = 102;
}
}
newlog.CurrentScore = newlog.CurrentScore < 0 ? 0 : newlog.CurrentScore;
BLL.ScoreFlowLogService.AddScoreFlowLog(newlog);
//人员记分情况
@@ -459,6 +460,7 @@
newlog.CurrentScore = 102;
}
}
newlog.CurrentScore = newlog.CurrentScore < 0 ? 0 : newlog.CurrentScore;
BLL.ScoreFlowLogService.AddScoreFlowLog(newlog);
//人员记分情况
@@ -512,6 +514,7 @@
{
newlog.CurrentScore = 102;
}
newlog.CurrentScore = newlog.CurrentScore < 0 ? 0 : newlog.CurrentScore;
BLL.ScoreFlowLogService.AddScoreFlowLog(newlog);
//人员记分情况
@@ -601,8 +604,8 @@
{
if (errLog != null)
{
db.Sys_ErrLogInfo.InsertOnSubmit(newErr);
db.SubmitChanges();
db.Sys_ErrLogInfo.InsertOnSubmit(newErr);
db.SubmitChanges();
}
ErrLogInfo.WriteLog(newErr.ErrLogId, ex, errLog == null ? null : errLog.ToString());
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx
+8 -4
View File
@@ -116,11 +116,15 @@
FieldType="String" HeaderText="姓名" HeaderTextAlign="Center"
TextAlign="Center">
</f:RenderField>
<f:RenderField Width="60px" ColumnID="Score" DataField="Score" SortField="Score"
FieldType="String" HeaderText="积分" HeaderTextAlign="Center"
TextAlign="Center">
</f:RenderField>
<%-- <f:RenderField HeaderText="卡号" ColumnID="CardNo" DataField="CardNo" SortField="CardNo"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
</f:RenderField>--%>
<f:RenderField HeaderText="岗位名称" ColumnID="WorkPostName" DataField="WorkPostName" SortField="WorkPostName"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="单位名称" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="200px">
@@ -128,9 +132,9 @@
<%--<f:RenderField HeaderText="培训岗位" ColumnID="PostTrainingRoleName" DataField="PostTrainingRoleName" SortField="PostTrainingRoleName"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField>--%>
<%-- <f:RenderField HeaderText="部门名称" ColumnID="DepartName" DataField="DepartName" SortField="DepartName"
<%--<f:RenderField HeaderText="部门名称" ColumnID="DepartName" DataField="DepartName" SortField="DepartName"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField> --%>
</f:RenderField>--%>
<f:TemplateField ColumnID="tfI" HeaderText="身份证号" Width="170px" HeaderTextAlign="Center" TextAlign="Left">
<ItemTemplate>
<asp:Label ID="lbI" runat="server" Text=' <%# Bind("IdentityCard") %>'></asp:Label>
@@ -146,7 +150,7 @@
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="入场时间"
HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<%-- <f:RenderField HeaderText="电话" ColumnID="Telephone" DataField="Telephone" SortField="Telephone"
<%--<f:RenderField HeaderText="电话" ColumnID="Telephone" DataField="Telephone" SortField="Telephone"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="110px">
</f:RenderField>--%>
<f:RenderField HeaderText="在场" ColumnID="IsUsedName" DataField="IsUsedName" SortField="IsUsedName"
SGGL/FineUIPro.Web/Login.aspx.cs
+1 -1
View File
@@ -247,7 +247,7 @@ namespace FineUIPro.Web
{
//url = "index.aspx";
string unitId = Const.UnitId_XJYJ;
if (!string.IsNullOrWhiteSpace(this.CurrUser.UnitId) && this.CurrUser.Base_Unit.IsBranch == true)
if (this.CurrUser != null && !string.IsNullOrWhiteSpace(this.CurrUser.UnitId) && this.CurrUser.Base_Unit.IsBranch == true)
{
unitId = this.CurrUser.UnitId;
}
SGGL/FineUIPro.Web/ProjectData/ProjectUser.aspx
+6 -3
View File
@@ -67,7 +67,7 @@
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="90px" ColumnID="UnitTypeName" DataField="UnitTypeName" SortField="UnitTypeName" FieldType="String"
HeaderText="单位类型" HeaderTextAlign="Center" TextAlign="Left">
HeaderText="单位类型" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="220px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName" FieldType="String"
HeaderText="单位名称" HeaderTextAlign="Center" TextAlign="Left">
@@ -78,11 +78,14 @@
<f:RenderField Width="100px" ColumnID="UserName" DataField="UserName" SortField="UserName"
FieldType="String" HeaderText="用户名称" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="60px" ColumnID="Score" DataField="Score" SortField="Score"
FieldType="String" HeaderText="积分" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="RoleName" DataField="RoleName" SortField="RoleName"
FieldType="String" HeaderText="项目角色" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="WorkPostName" DataField="WorkPostName" SortField="WorkPostName"
FieldType="String" HeaderText="项目岗位" HeaderTextAlign="Center" TextAlign="Left">
FieldType="String" HeaderText="项目岗位" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="WorkAreaId" Width="200px" HeaderText="分管范围" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
@@ -91,7 +94,7 @@
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="70px" ColumnID="IsPostName" DataField="IsPostName" SortField="IsPostName"
FieldType="String" HeaderText="在岗" HeaderTextAlign="Center" TextAlign="Left">
FieldType="String" HeaderText="在岗" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
</Columns>
<Listeners>
SGGL/FineUIPro.Web/ProjectData/ProjectUser.aspx.cs
+2 -1
View File
@@ -55,11 +55,12 @@ namespace FineUIPro.Web.ProjectData
{
if (this.drpProject.Items.Count() > 0)
{
string strSql = @"SELECT DISTINCT ProjectUser.ProjectUserId,ProjectUser.ProjectId,ProjectUser.UserId,ProjectUser.WorkAreaId,Users.UserCode,Users.UserName,ProjectUser.UnitId,Unit.UnitCode,Unit.UnitName,ProjectUnit.UnitType,sysConst.ConstText AS UnitTypeName,ProjectUser.RoleId,ProjectUser.IsPost,(CASE WHEN ProjectUser.IsPost = 1 THEN '在岗' ELSE '离岗' END) AS IsPostName,WorkPost.WorkPostName,UnitCode"
string strSql = @"SELECT DISTINCT ProjectUser.ProjectUserId,su.Score,ProjectUser.ProjectId,ProjectUser.UserId,ProjectUser.WorkAreaId,Users.UserCode,Users.UserName,ProjectUser.UnitId,Unit.UnitCode,Unit.UnitName,ProjectUnit.UnitType,sysConst.ConstText AS UnitTypeName,ProjectUser.RoleId,ProjectUser.IsPost,(CASE WHEN ProjectUser.IsPost = 1 THEN '在岗' ELSE '离岗' END) AS IsPostName,WorkPost.WorkPostName,UnitCode"
+ @" ,RoleName= STUFF(( SELECT ',' + RoleName FROM dbo.Sys_Role where PATINDEX('%,' + RTRIM(RoleId) + ',%',',' +ProjectUser.RoleId + ',')>0 FOR XML PATH('')), 1, 1,'')"
+ @" FROM Project_ProjectUser AS ProjectUser "
+ @" LEFT JOIN Base_Project AS Project ON ProjectUser.ProjectId = Project.ProjectId "
+ @" LEFT JOIN Sys_User AS Users ON ProjectUser.UserId = Users.UserId "
+ @" LEFT JOIN ScoreUser AS su ON su.IdentityCard = Users.IdentityCard AND su.Year=YEAR(GETDATE()) "
+ @" LEFT JOIN Sys_Role AS Role ON ProjectUser.RoleId = Role.RoleId "
+ @" LEFT JOIN Project_ProjectUnit AS ProjectUnit ON ProjectUser.UnitId = ProjectUnit.UnitId AND ProjectUser.ProjectId= ProjectUnit.ProjectId "
+ @" LEFT JOIN Base_Unit AS Unit ON ProjectUser.UnitId = Unit.UnitId "
SGGL/FineUIPro.Web/Score/ScoreFlowLog.aspx
+94 -79
View File
@@ -6,7 +6,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>得分扣分记录流水日志</title>
<title>记分流水日志</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
</head>
<body>
@@ -14,7 +14,98 @@
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="记分流水日志" EnableCollapse="true"
runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="ID"
AllowCellEditing="true" ClicksToEdit="2" DataIDField="ID" AllowSorting="true"
SortField="CompileDate" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" Label="姓名" ID="txtName" EmptyText="输入查询条件" AutoPostBack="true"
OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px" LabelAlign="right">
</f:TextBox>
<f:TextBox runat="server" Label="身份证" ID="txtIdentityCard" EmptyText="输入查询条件" AutoPostBack="true"
OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px" LabelAlign="right">
</f:TextBox>
<%--<f:DropDownList ID="drpType" runat="server" Label="加分/扣分" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" Width="200px">
<f:ListItem Value="" Text="-请选择-" />
<f:ListItem Value="0" Text="扣分" />
<f:ListItem Value="1" Text="加分" />
</f:DropDownList>--%>
<f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
<f:RadioButtonList runat="server" ID="rbType" Label="类型" Width="260px" LabelWidth="50px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
<f:RadioItem Text="全部" Value="" Selected="true" />
<f:RadioItem Text="扣分" Value="0" />
<f:RadioItem Text="加分" Value="1" />
</f:RadioButtonList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</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="160px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm:ss" HeaderText="记分时间" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="160px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
FieldType="String" HeaderText="单位" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="220px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
FieldType="String" HeaderText="项目" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="160px" ColumnID="UserName" DataField="UserName" SortField="UserName"
FieldType="String" HeaderText="姓名" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="tfI" HeaderText="身份证号" Width="170px" HeaderTextAlign="Center" TextAlign="Left">
<ItemTemplate>
<asp:Label ID="lbI" runat="server" Text=' <%# Bind("IdentityCard") %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="80px" ColumnID="TypeName" DataField="TypeName" SortField="TypeName"
FieldType="String" HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="Score" DataField="Score" SortField="Score"
FieldType="String" HeaderText="分值" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="CurrentScore" DataField="CurrentScore" SortField="CurrentScore"
FieldType="String" HeaderText="最终分值" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="160px" ColumnID="Item" DataField="Item" SortField="Item"
FieldType="String" HeaderText="类目" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="LogContent" DataField="LogContent" SortField="LogContent"
FieldType="String" HeaderText="记录内容" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="CompileMan" DataField="CompileMan" SortField="CompileMan"
FieldType="String" HeaderText="记分人" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<%--<f:RenderField Width="150px" ColumnID="Remark" DataField="Remark" SortField="Remark"
FieldType="String" HeaderText="备注" ExpandUnusedSpace="true" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>--%>
</Columns>
<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>
<%--<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
<Items>
@@ -27,84 +118,8 @@
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="得分扣分记录流水日志" EnableCollapse="true"
runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="ID"
AllowCellEditing="true" ClicksToEdit="2" DataIDField="ID" AllowSorting="true"
SortField="CompileDate" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" Label="姓名" ID="txtName" EmptyText="输入查询条件" AutoPostBack="true"
OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px" LabelAlign="right">
</f:TextBox>
<f:DropDownList ID="drpType" runat="server" Label="加分/扣分" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" Width="200px">
<f:ListItem Value="" Text="-请选择-" />
<f:ListItem Value="0" Text="扣分" />
<f:ListItem Value="1" Text="加分" />
</f:DropDownList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</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="100px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="记分时间" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="UserName" DataField="UserName" SortField="UserName"
FieldType="String" HeaderText="姓名" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:TemplateField ColumnID="tfI" HeaderText="身份证号" Width="170px" HeaderTextAlign="Center" TextAlign="Left">
<ItemTemplate>
<asp:Label ID="lbI" runat="server" Text=' <%# Bind("IdentityCard") %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="100px" ColumnID="TypeName" DataField="TypeName" SortField="TypeName"
FieldType="String" HeaderText="加分/扣分" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="Score" DataField="Score" SortField="Score"
FieldType="String" HeaderText="分值" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="CurrentScore" DataField="CurrentScore" SortField="CurrentScore"
FieldType="String" HeaderText="最终分值" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="Item" DataField="Item" SortField="Item"
FieldType="String" HeaderText="类目" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="LogContent" DataField="LogContent" SortField="LogContent"
FieldType="String" HeaderText="记录内容" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="CompileMan" DataField="CompileMan" SortField="CompileMan"
FieldType="String" HeaderText="记分人" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<%--<f:RenderField Width="150px" ColumnID="Remark" DataField="Remark" SortField="Remark"
FieldType="String" HeaderText="备注" ExpandUnusedSpace="true" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>--%>
</Columns>
<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:Panel>--%>
</Items>
</f:Panel>
</form>
SGGL/FineUIPro.Web/Score/ScoreFlowLog.aspx.cs
+75 -35
View File
@@ -3,7 +3,6 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Text;
using AspNet = System.Web.UI.WebControls;
@@ -26,6 +25,20 @@ namespace FineUIPro.Web.Score
ViewState["ProjectId"] = value;
}
}
/// <summary>
/// 单位主键
/// </summary>
public string UnitId
{
get
{
return (string)ViewState["UnitId"];
}
set
{
ViewState["UnitId"] = value;
}
}
#endregion
#region 加载
/// <summary>
@@ -43,15 +56,20 @@ namespace FineUIPro.Web.Score
{
this.ProjectId = Request.Params["projectId"];
}
////权限按钮方法
this.ucTree.UnitId = this.CurrUser.UnitId;
this.ucTree.ProjectId = this.ProjectId;
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
this.UnitId = this.CurrUser.UnitId;
if (CommonService.IsSuperAdminManage(this.CurrUser.UserId) || (!string.IsNullOrWhiteSpace(this.UnitId) && this.UnitId == Const.UnitId_XJYJ))
{
this.panelLeftRegion.Hidden = true;
////权限按钮方法
this.GetButtonPower();
this.UnitId = !string.IsNullOrWhiteSpace(this.CurrUser.LastUnitId) ? this.CurrUser.LastUnitId : Const.UnitId_XJYJ;
}
//////权限按钮方法
//this.ucTree.UnitId = this.CurrUser.UnitId;
//this.ucTree.ProjectId = this.ProjectId;
//if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
//{
// this.panelLeftRegion.Hidden = true;
// ////权限按钮方法
// this.GetButtonPower();
//}
if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
{
@@ -63,49 +81,71 @@ namespace FineUIPro.Web.Score
}
}
/// <summary>
/// 加载树
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void changeTree(object sender, EventArgs e)
{
this.ProjectId = this.ucTree.ProjectId;
this.BindGrid();
this.GetButtonPower();
}
///// <summary>
///// 加载树
///// </summary>
///// <param name="sender"></param>
///// <param name="e"></param>
//protected void changeTree(object sender, EventArgs e)
//{
// this.ProjectId = this.ucTree.ProjectId;
// this.BindGrid();
// this.GetButtonPower();
//}
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
if (string.IsNullOrEmpty(this.ProjectId))
{
return;
}
string strSql = "select flowLog.Id, flowLog.Year, flowLog.IdentityCard, flowLog.UserName, flowLog.Type, (case when flowLog.Type=0 then '扣分' else '加分' end) as TypeName,flowLog.Score, flowLog.CurrentScore, flowLog.Item, flowLog.LogContent, flowLog.UserId, flowLog.PersonId, flowLog.UnitId, flowLog.ProjectId, flowLog.UnitName, flowLog.ProjectName, flowLog.Remark, flowLog.CompileDate, flowLog.CompileMan, flowLog.CompileManId from ScoreFlowLog flowLog WHERE 1=1 ";
//if (string.IsNullOrEmpty(this.ProjectId))
//{
// return;
//}
StringBuilder sb = new StringBuilder();
sb.Append("SELECT flowLog.Id, flowLog.Year, flowLog.IdentityCard, flowLog.UserName, flowLog.Type, (case when flowLog.Type=0 then '扣分' else '加分' end) as TypeName,flowLog.Score, flowLog.CurrentScore, flowLog.Item, flowLog.LogContent, flowLog.UserId, flowLog.PersonId, flowLog.UnitId, flowLog.ProjectId, flowLog.UnitName, flowLog.ProjectName, flowLog.Remark, flowLog.CompileDate, flowLog.CompileMan, flowLog.CompileManId ");
sb.Append("FROM ScoreFlowLog AS flowLog WITH(NOLOCK) ");
sb.Append("WHERE 1=1 ");
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += " AND flowLog.ProjectId = @ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
if (!string.IsNullOrEmpty(this.ProjectId))
{//项目级
sb.Append("AND flowLog.ProjectId = @ProjectId ");
listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
}
else if (!string.IsNullOrEmpty(this.UnitId) && this.UnitId != Const.UnitId_XJYJ)
{//分公司
sb.Append("AND flowLog.UnitId = @UnitId ");
listStr.Add(new SqlParameter("@UnitId", this.UnitId));
}
if (!string.IsNullOrEmpty(this.txtName.Text.Trim()))
{
strSql += " AND flowLog.UserName like @name";
sb.Append("AND flowLog.UserName like @name ");
listStr.Add(new SqlParameter("@name", "%" + this.txtName.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.drpType.SelectedValue))
if (!string.IsNullOrEmpty(this.txtIdentityCard.Text.Trim()))
{
strSql += " AND flowLog.Type = @type";
listStr.Add(new SqlParameter("@type", this.drpType.SelectedValue));
sb.Append("AND flowLog.IdentityCard like @IdentityCard ");
listStr.Add(new SqlParameter("@IdentityCard", "%" + this.txtIdentityCard.Text.Trim() + "%"));
}
if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
if (!string.IsNullOrWhiteSpace(this.rbType.SelectedValue))
{
strSql += " AND flowLog.UnitId =@unitId";
listStr.Add(new SqlParameter("@unitId", this.CurrUser.UnitId));
sb.Append("AND flowLog.Type = @type ");
listStr.Add(new SqlParameter("@type", this.rbType.SelectedValue));
}
//if (!string.IsNullOrEmpty(this.drpType.SelectedValue))
//{
// sb.Append("AND flowLog.Type = @type ");
// listStr.Add(new SqlParameter("@type", this.drpType.SelectedValue));
//}
//if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
//{
// sb.Append("AND flowLog.UnitId =@unitId ");
// listStr.Add(new SqlParameter("@unitId", this.CurrUser.UnitId));
//}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
DataTable tb = SQLHelper.GetDataTableRunText(sb.ToString(), parameter);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
@@ -201,7 +241,7 @@ namespace FineUIPro.Web.Score
{
Response.ClearContent();
string filename = Funs.GetNewFileName();
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("人员记分流水日志表" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("记分流水日志" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.ContentType = "application/excel";
Response.ContentEncoding = System.Text.Encoding.UTF8;
this.Grid1.PageSize = 500;
SGGL/FineUIPro.Web/Score/ScoreFlowLog.aspx.designer.cs
Generated
+11 -38
View File
@@ -41,42 +41,6 @@ namespace FineUIPro.Web.Score
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// ContentPanel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel1;
/// <summary>
/// ucTree 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -105,13 +69,22 @@ namespace FineUIPro.Web.Score
protected global::FineUIPro.TextBox txtName;
/// <summary>
/// drpType 控件。
/// txtIdentityCard 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpType;
protected global::FineUIPro.TextBox txtIdentityCard;
/// <summary>
/// rbType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rbType;
/// <summary>
/// ToolbarFill1 控件。
SGGL/FineUIPro.Web/Score/Standings.aspx
+81
View File
@@ -0,0 +1,81 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Standings.aspx.cs" Inherits="FineUIPro.Web.Score.Standings" %>
<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>积分榜</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Grid ID="Grid1" runat="server" Title="积分榜" BoxFlex="1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
EnableColumnLines="true" DataKeyNames="ID" DataIDField="ID" AllowSorting="true" ForceFit="true"
SortField="Score" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpYear" AutoPostBack="true" EnableSimulateTree="true" runat="server"
Width="200px" LabelWidth="60px" Label="年度" LabelAlign="Right" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:TextBox runat="server" Label="姓名" ID="txtName" EmptyText="输入姓名" AutoPostBack="true"
OnTextChanged="TextBox_TextChanged" Width="280px" LabelWidth="80px" LabelAlign="right">
</f:TextBox>
<f:TextBox runat="server" Label="身份证" ID="txtIdentityCard" EmptyText="输入身份证号码" AutoPostBack="true"
OnTextChanged="TextBox_TextChanged" Width="280px" LabelWidth="80px" LabelAlign="right">
</f:TextBox>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</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="220px" ColumnID="UserName" DataField="UserName" SortField="UserName"
FieldType="String" HeaderText="姓名" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="tfI" HeaderText="身份证号" Width="220px" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lbI" runat="server" Text=' <%# Bind("IdentityCard") %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="120px" ColumnID="Score" DataField="Score" SortField="Score"
FieldType="String" HeaderText="积分" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="220px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm:ss" HeaderText="最后记分时间" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
</Columns>
<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>
</form>
<script type="text/javascript">
function reloadGrid() {
__doPostBack(null, 'reloadGrid');
}
</script>
</body>
</html>
SGGL/FineUIPro.Web/Score/Standings.aspx.cs
+200
View File
@@ -0,0 +1,200 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Text;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.Score
{
public partial class Standings : PageBase
{
#region 项目主键
/// <summary>
/// 项目主键
/// </summary>
public string ProjectId
{
get
{
return (string)ViewState["ProjectId"];
}
set
{
ViewState["ProjectId"] = value;
}
}
#endregion
#region 加载
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
BLL.ConstValue.InitConstValueDropDownList(this.drpYear, ConstValue.Group_0008, false);
this.drpYear.SelectedValue = DateTime.Now.Year.ToString();
this.ProjectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
{
this.ProjectId = Request.Params["projectId"];
}
if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
{
Grid1.PageSize = this.CurrUser.PageSize.Value;
}
this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
this.BindGrid();
}
}
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
StringBuilder sb = new StringBuilder();
sb.Append("SELECT tba.Id,tba.Year,tba.IdentityCard,tba.UserName,tba.Score,tba.CompileDate ");
sb.Append("FROM ScoreUser AS tba WITH(NOLOCK) ");
sb.Append("WHERE 1=1 ");
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrWhiteSpace(this.drpYear.SelectedValue) && this.drpYear.SelectedValue != Const._Null)
{
sb.Append("AND tba.Year = @Year ");
listStr.Add(new SqlParameter("@Year", this.drpYear.SelectedValue));
}
if (!string.IsNullOrEmpty(this.txtName.Text.Trim()))
{
sb.Append("AND tba.UserName like @name ");
listStr.Add(new SqlParameter("@name", "%" + this.txtName.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtIdentityCard.Text.Trim()))
{
sb.Append("AND tba.IdentityCard like @IdentityCard ");
listStr.Add(new SqlParameter("@IdentityCard", "%" + this.txtIdentityCard.Text.Trim() + "%"));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(sb.ToString(), parameter);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
}
/// <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();
}
#endregion
#region 查询
/// <summary>
/// 查询
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void TextBox_TextChanged(object sender, EventArgs e)
{
this.BindGrid();
}
#endregion
#region 导出按钮
/// 导出按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnOut_Click(object sender, EventArgs e)
{
Response.ClearContent();
string filename = Funs.GetNewFileName();
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("积分榜" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.ContentType = "application/excel";
Response.ContentEncoding = System.Text.Encoding.UTF8;
this.Grid1.PageSize = 500;
this.BindGrid();
Response.Write(GetGridTableHtml(Grid1));
Response.End();
}
/// <summary>
/// 导出方法
/// </summary>
/// <param name="grid"></param>
/// <returns></returns>
private string GetGridTableHtml(Grid grid)
{
StringBuilder sb = new StringBuilder();
sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
sb.Append("<tr>");
foreach (GridColumn column in grid.Columns)
{
sb.AppendFormat("<td>{0}</td>", column.HeaderText);
}
sb.Append("</tr>");
foreach (GridRow row in grid.Rows)
{
sb.Append("<tr>");
foreach (GridColumn column in grid.Columns)
{
string html = row.Values[column.ColumnIndex].ToString();
if (column.ColumnID == "tfNumber")
{
html = (row.FindControl("lblNumber") as AspNet.Label).Text;
}
if (column.ColumnID == "tfI")
{
html = (row.FindControl("lbI") as AspNet.Label).Text;
}
//sb.AppendFormat("<td>{0}</td>", html);
sb.AppendFormat("<td style='vnd.ms-excel.numberformat:@;width:140px;'>{0}</td>", html);
}
sb.Append("</tr>");
}
sb.Append("</table>");
return sb.ToString();
}
#endregion
}
}
SGGL/FineUIPro.Web/Score/Standings.aspx.designer.cs
Generated
+152
View File
@@ -0,0 +1,152 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.Score
{
public partial class Standings
{
/// <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>
/// drpYear 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpYear;
/// <summary>
/// txtName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtName;
/// <summary>
/// txtIdentityCard 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtIdentityCard;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnOut 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// lblNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNumber;
/// <summary>
/// lbI 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbI;
/// <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;
}
}
SGGL/FineUIPro.Web/SysManage/UserList.aspx
+10 -7
View File
@@ -64,31 +64,34 @@
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="45px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:RenderField Width="90px" ColumnID="UserCode" DataField="UserCode" SortField="UserCode"
FieldType="String" HeaderText="员工编号" HeaderTextAlign="Center" TextAlign="Left">
FieldType="String" HeaderText="员工编号" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="UserName" DataField="UserName" SortField="UserName"
FieldType="String" HeaderText="姓名" HeaderTextAlign="Center" TextAlign="Left">
FieldType="String" HeaderText="姓名" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="60px" ColumnID="Score" DataField="Score" SortField="Score"
FieldType="String" HeaderText="积分" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<%--<f:RenderField Width="100px" ColumnID="UnitCode" DataField="UnitCode" SortField="UnitCode"
FieldType="String" HeaderText="单位编号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>--%>
<f:RenderField Width="220px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
<f:RenderField Width="200px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DepartName" DataField="DepartName" SortField="DepartName"
<f:RenderField Width="180px" ColumnID="DepartName" DataField="DepartName" SortField="DepartName"
FieldType="String" HeaderText="部门" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Account" DataField="Account" SortField="Account"
FieldType="String" HeaderText="账号" HeaderTextAlign="Center" TextAlign="Left">
FieldType="String" HeaderText="账号" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<%-- <f:RenderField Width="120px" ColumnID="IdentityCard" DataField="IdentityCard" SortField="IdentityCard"
FieldType="String" HeaderText="身份证号码" HeaderTextAlign="Center" TextAlign="Right" Hidden="true">
</f:RenderField>--%>
<f:RenderField Width="230px" ColumnID="RoleName" DataField="RoleName" SortField="RoleName"
<f:RenderField Width="200px" ColumnID="RoleName" DataField="RoleName" SortField="RoleName"
FieldType="String" HeaderText="本部角色" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="Telephone" DataField="Telephone" SortField="Telephone"
FieldType="String" HeaderText="手机号码" HeaderTextAlign="Center" TextAlign="Right" Hidden="true">
FieldType="String" HeaderText="手机号码" HeaderTextAlign="Center" TextAlign="Center" Hidden="true">
</f:RenderField>
<f:CheckBoxField Width="50px" SortField="IsPost" RenderAsStaticField="true" DataField="IsPost"
HeaderText="在岗" HeaderTextAlign="Center" TextAlign="Center">
SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs
+2 -1
View File
@@ -44,9 +44,10 @@
/// </summary>
private void BindGrid()
{
string strSql = $@"SELECT Users.UserId,Users.Account,Users.UserCode,Users.Password,Users.UserName,Depart.DepartName,Users.RoleId,Users.UnitId,Users.IsPost,CASE WHEN Users.IsPost=1 THEN '是' ELSE '否' END AS IsPostName,Users.IdentityCard,Users.Telephone,Users.IsOffice,UnitCode,Unit.UnitName,Unit.UnitCode
string strSql = $@"SELECT Users.UserId,Users.Account,Users.UserCode,Users.Password,Users.UserName,su.Score,Depart.DepartName,Users.RoleId,Users.UnitId,Users.IsPost,CASE WHEN Users.IsPost=1 THEN '是' ELSE '否' END AS IsPostName,Users.IdentityCard,Users.Telephone,Users.IsOffice,UnitCode,Unit.UnitName,Unit.UnitCode
,RoleName= STUFF(( SELECT ',' + RoleName FROM dbo.Sys_Role where PATINDEX('%,' + RTRIM(RoleId) + ',%',',' +Users.RoleId + ',')>0 FOR XML PATH('')), 1, 1,'')
From dbo.Sys_User AS Users
LEFT JOIN ScoreUser AS su ON su.IdentityCard = Users.IdentityCard AND su.Year=YEAR(GETDATE())
LEFT JOIN Sys_Role AS Roles ON Roles.RoleId=Users.RoleId
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Users.UnitId
LEFT JOIN Base_Depart AS Depart ON Depart.DepartId=Users.DepartId
SGGL/FineUIPro.Web/common/PageBase.cs
+13 -5
View File
@@ -30,18 +30,26 @@ namespace FineUIPro.Web
string password = string.Empty;
if (HttpContext.Current != null && HttpContext.Current.Request != null)
{
if (Request.Cookies["u"] != null)
//if (Request.Cookies["u"] != null)
//{
// account = HttpUtility.UrlDecode(Request.Cookies["u"].Value);
//}
//if (Request.Cookies["p"] != null)
//{
// password = Request.Cookies["p"].Value;
//}
if (HttpContext.Current.Request.Cookies["u"] != null)
{
account = HttpUtility.UrlDecode(Request.Cookies["u"].Value);
account = HttpUtility.UrlDecode(HttpContext.Current.Request.Cookies["u"].Value);
}
if (Request.Cookies["p"] != null)
if (HttpContext.Current.Request.Cookies["p"] != null)
{
password = Request.Cookies["p"].Value;
password = HttpContext.Current.Request.Cookies["p"].Value;
}
}
Session["CurrUser"] = BLL.Funs.DB.Sys_User.FirstOrDefault(x => x.Account == account && x.Password == Funs.EncryptionPassword(password));
}
//var ssss = (Model.Sys_User)Session["CurrUser"];
return (Model.Sys_User)Session["CurrUser"];
}
}
SGGL/Model/APIItem/HSSE/StudyZoneItemItem.cs
+37 -37
View File
@@ -60,42 +60,42 @@ namespace Model
get;
set;
}
// /// <summary>
// /// 开始时间
// /// </summary>
//public DateTime? StartTime
// {
// get;
// set;
// }
// /// <summary>
// /// 学习时长(秒)
// /// </summary>
//public int? LearningTime
// {
// get;
// set;
// }
// /// <summary>
// /// 教材时长(秒)
// /// </summary>
// public int? AttachTime
// {
// get;
// set;
// }
// public DateTime? EndTime
// {
// get;
// set;
// }
// /// <summary>
// /// 视频进度（秒）
// /// </summary>
//public int? VideoProgress
// {
// get;
// set;
// }
// /// <summary>
// /// 开始时间
// /// </summary>
//public DateTime? StartTime
// {
// get;
// set;
// }
// /// <summary>
// /// 学习时长(秒)
// /// </summary>
//public int? LearningTime
// {
// get;
// set;
// }
// /// <summary>
// /// 教材时长(秒)
// /// </summary>
// public int? AttachTime
// {
// get;
// set;
// }
// public DateTime? EndTime
// {
// get;
// set;
// }
// /// <summary>
// /// 视频进度（秒）
// /// </summary>
//public int? VideoProgress
// {
// get;
// set;
// }
}
}
SGGL/WebAPI/Controllers/Person/PersonController.cs
+17 -14
View File
@@ -24,21 +24,24 @@ namespace WebAPI.Controllers
{
var personData = APIPersonService.getPersonByPersonId(personId);
PersonInfoItem data = new PersonInfoItem();
data.PersonId = personData.PersonId;
data.PersonName = personData.PersonName;
data.SexName = personData.SexName;
data.IdentityCard = personData.IdentityCard;
data.Telephone = personData.Telephone;
data.UnitName = personData.UnitName;
data.TeamGroupName = personData.TeamGroupName;
data.WorkPostName = personData.WorkPostName;
data.InTime = personData.InTime;
data.PhotoUrl = personData.PhotoUrl;
//获取用户本年HSE分值、培训学时（待处理）
data.HSEScore = 0;
data.LearnHour = 0;
if (personData != null)
{
data.PersonId = personData.PersonId;
data.PersonName = personData.PersonName;
data.SexName = personData.SexName;
data.IdentityCard = personData.IdentityCard;
data.Telephone = personData.Telephone;
data.UnitName = personData.UnitName;
data.TeamGroupName = personData.TeamGroupName;
data.WorkPostName = personData.WorkPostName;
data.InTime = personData.InTime;
data.PhotoUrl = personData.PhotoUrl;
var userScore = ScoreUserService.GetScoreUserByIdentityCard(personData.IdentityCard, DateTime.Now.Year);
//获取用户本年HSE分值、培训学时（待处理）
data.HSEScore = userScore != null ? userScore.Score : 100;
data.LearnHour = 0;
}
responeData.data = data;
}
catch (Exception ex)