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

1

Browse Source
This commit is contained in:
高飞
2025-06-24 10:33:02 +08:00
parent d004df928a
commit 85874b9916
4 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/SysManage/UnitService.cs
+9 -12
View File
@@ -11,7 +11,7 @@ namespace BLL
/// </summary>
public static class UnitService
{
/// <summary>
/// 获取单位信息
@@ -185,10 +185,7 @@ namespace BLL
unitId = Const.UnitId_SEDIN;
}
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 select x).ToList();
return unitList;
}
@@ -200,7 +197,7 @@ namespace BLL
public static List<string> GetChildrenUnitId(string unitId)
{
List<string> unitIdList = new List<string>();
var unit = Funs.DB.Base_Unit.FirstOrDefault(e => e.SupUnitId == unitId); //本单位
var unit = Funs.DB.Base_Unit.FirstOrDefault(e => e.IsBranch == true); //本单位
if (unit != null)
{
unitIdList.Add(unit.UnitId);
@@ -274,7 +271,7 @@ namespace BLL
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var q = (from x in db.Base_Unit
orderby x.UnitCode
select x).Distinct().ToList();
return q;
@@ -316,7 +313,7 @@ namespace BLL
unitList = (from x in db.Base_Unit
join y in db.Project_ProjectUnit
on x.UnitId equals y.UnitId
where y.ProjectId == projectId
where y.ProjectId == projectId
orderby x.UnitCode
select x).ToList();
}
@@ -654,14 +651,14 @@ namespace BLL
}
}
public static void InitSeDinAndCNCECUnitDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
public static void InitSeDinAndCNCECUnitDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
{
dropName.Items.Clear();
dropName.DataValueField = "UnitId";
dropName.DataTextField = "UnitName";
dropName.DataSource = (from x in Funs.DB.Base_Unit
where x.UnitId==Const.UnitId_SEDIN || x.UnitId == Const.UnitId_CNCEC
select x).OrderByDescending(x => x.UnitCode).ToList();
dropName.DataSource = (from x in Funs.DB.Base_Unit
where x.UnitId == Const.UnitId_SEDIN || x.UnitId == Const.UnitId_CNCEC
select x).OrderByDescending(x => x.UnitCode).ToList();
dropName.DataBind();
if (isShowPlease)
{
SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
+1 -1
View File
@@ -1761,7 +1761,7 @@ namespace BLL
join y in Funs.DB.QualityAudit_PersonQuality on x.PersonId equals y.PersonId
join z in Funs.DB.Base_Certificate on y.CertificateId equals z.CertificateId
join a in Funs.DB.Person_Persons on x.PersonId equals a.PersonId
where BeUnderConstructionList.Contains(p.ProjectId) && z.CertificateType == "A" && x.States == "1" && x.IdentityCard != null
where BeUnderConstructionList.Contains(p.ProjectId) && z.CertificateType == "A" && x.IdentityCard != null
select new Model.OfSafetySupervisorsOutput
{
ProjectId = x.ProjectId,
SGGL/FineUIPro.Web/ZHGL/Emergency/DrillRecordList.aspx.cs
+4 -4
View File
@@ -62,14 +62,14 @@ namespace FineUIPro.Web.ZHGL.Emergency
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT DrillRecordList.DrillRecordListId,DrillRecordList.ProjectId,DrillRecordType.ConstText AS DrillRecordTypeName,DrillRecordList.JointPersonNum,DrillRecordList.DrillCost,CodeRecords.Code AS DrillRecordCode,DrillRecordList.DrillRecordName,DrillRecordList.DrillRecordDate,DrillRecordList.CompileMan,Users.UserName AS CompileManName,DrillRecordList.UnitIds,DrillRecordList.UnitNames,DrillRecordList.UserNames,DrillRecordList.States "
+ @" ,(CASE WHEN DrillRecordList.States = " + BLL.Const.State_0 + " OR DrillRecordList.States IS NULL THEN '待['+OperateUser.UserName+']提交' WHEN DrillRecordList.States = " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS FlowOperateName"
string strSql = @"SELECT DrillRecordList.DrillRecordListId,DrillRecordList.ProjectId,DrillRecordType.ConstText AS DrillRecordTypeName,DrillRecordList.JointPersonNum,DrillRecordList.DrillCost,CodeRecords.Code AS DrillRecordCode,DrillRecordList.DrillRecordName,DrillRecordList.DrillRecordDate,DrillRecordList.CompileMan,Users.PersonName AS CompileManName,DrillRecordList.UnitIds,DrillRecordList.UnitNames,DrillRecordList.States "
+ @" ,(CASE WHEN DrillRecordList.States = " + BLL.Const.State_0 + " OR DrillRecordList.States IS NULL THEN '待['+OperateUser.PersonName+']提交' WHEN DrillRecordList.States = " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.PersonName+']办理' END) AS FlowOperateName"
+ @" FROM Emergency_DrillRecordList_Unit AS DrillRecordList "
+ @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON DrillRecordList.DrillRecordListId=CodeRecords.DataId "
+ @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON DrillRecordList.DrillRecordListId=FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
+ @" LEFT JOIN Sys_Const AS DrillRecordType ON DrillRecordType.ConstValue = DrillRecordList.DrillRecordType and DrillRecordType.GroupId='DrillRecordType'"
+ @" LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId"
+ @" LEFT JOIN Sys_User AS Users ON DrillRecordList.CompileMan=Users.UserId WHERE 1=1 ";
+ @" LEFT JOIN Person_Persons AS OperateUser ON FlowOperate.OperaterId=OperateUser.PersonId"
+ @" LEFT JOIN Person_Persons AS Users ON DrillRecordList.CompileMan=Users.PersonId WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
//strSql += " AND DrillRecordList.UnitIds =@UnitId";
if (!string.IsNullOrEmpty(this.UnitId)) ///是否文件柜查看页面传项目值
SGGL/FineUIPro.Web/ZHGL/Emergency/EmergencyList.aspx.cs
+6 -6
View File
@@ -65,17 +65,17 @@ namespace FineUIPro.Web.ZHGL.Emergency
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT EmergencyList.EmergencyListId,EmergencyList.ProjectId,CodeRecords.Code AS EmergencyCode,EmergencyList.UnitId,EmergencyList.EmergencyName,EmergencyList.CompileDate,EmergencyList.CompileMan,Users.UserName AS CompileManName,EmergencyType.EmergencyTypeName,EmergencyList.VersionCode,Unit.UnitName,EmergencyList.States,AuditMan.UserName AS AuditMan,ApproveMan.UserName AS ApproveMan "
+ @" ,(CASE WHEN EmergencyList.States = " + BLL.Const.State_0 + " OR EmergencyList.States IS NULL THEN '待['+OperateUser.UserName+']提交' WHEN EmergencyList.States = " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS FlowOperateName"
string strSql = @"SELECT EmergencyList.EmergencyListId,EmergencyList.ProjectId,CodeRecords.Code AS EmergencyCode,EmergencyList.UnitId,EmergencyList.EmergencyName,EmergencyList.CompileDate,EmergencyList.CompileMan,Users.PersonName AS CompileManName,EmergencyType.EmergencyTypeName,EmergencyList.VersionCode,Unit.UnitName,EmergencyList.States,AuditMan.PersonName AS AuditMan,ApproveMan.PersonName AS ApproveMan "
+ @" ,(CASE WHEN EmergencyList.States = " + BLL.Const.State_0 + " OR EmergencyList.States IS NULL THEN '待['+OperateUser.PersonName+']提交' WHEN EmergencyList.States = " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.PersonName+']办理' END) AS FlowOperateName"
+ @" FROM Emergency_EmergencyList_Unit AS EmergencyList "
+ @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON EmergencyList.EmergencyListId=CodeRecords.DataId "
+ @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON EmergencyList.EmergencyListId=FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
+ @" LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId"
+ @" LEFT JOIN Person_Persons AS OperateUser ON FlowOperate.OperaterId=OperateUser.PersonId"
+ @" LEFT JOIN Base_Unit AS Unit ON EmergencyList.UnitId=Unit.UnitId "
+ @" LEFT JOIN Base_EmergencyType AS EmergencyType ON EmergencyList.EmergencyTypeId=EmergencyType.EmergencyTypeId"
+ @" LEFT JOIN Sys_User AS AuditMan ON AuditMan.UserId=EmergencyList.AuditMan"
+ @" LEFT JOIN Sys_User AS ApproveMan ON ApproveMan.UserId=EmergencyList.ApproveMan"
+ @" LEFT JOIN Sys_User AS Users ON EmergencyList.CompileMan=Users.UserId WHERE 1=1 ";
+ @" LEFT JOIN Person_Persons AS AuditMan ON AuditMan.PersonId=EmergencyList.AuditMan"
+ @" LEFT JOIN Person_Persons AS ApproveMan ON ApproveMan.PersonId=EmergencyList.ApproveMan"
+ @" LEFT JOIN Person_Persons AS Users ON EmergencyList.CompileMan=Users.PersonId WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
//strSql += " AND EmergencyList.UnitId = @UnitId";
if (!string.IsNullOrEmpty(this.UnitId)) ///是否文件柜查看页面传项目值