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

20230607新增月报费用取值，上报集团报表（月报）默认自动取值功能新增

Browse Source
This commit is contained in:
杨红卫
2023-06-07 18:01:30 +08:00
parent e4871bc690
commit c7994e1a5c
21 changed files with 914 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx.cs
+3 -3
View File
@@ -34,10 +34,10 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select Item.HazardId AS HazardSelectedItemId,Item.HazardListId,List.IdentificationDate,List.WorkAreaName,Item.WorkStage,Item.HazardListTypeId
string strSql = @"select (Item.HazardId+'-'+ Item.HazardListId) as HazardSelectedItemId,Item.HazardListId,List.IdentificationDate,List.WorkAreaName,Item.WorkStage,Item.HazardListTypeId
, Item.HazardListTypeId,Item.HazardId,Item.HazardItems,Item.DefectsType,Item.MayLeadAccidents
,Item.HelperMethod,Item.HazardJudge_L,Item.HazardJudge_E,Item.HazardJudge_C,Item.HazardJudge_E
,level.RiskLevelName,Item.ControlMeasures
,Item.HelperMethod,Item.HazardJudge_L,Item.HazardJudge_E,Item.HazardJudge_C,Item.HazardJudge_E,Item.HazardJudge_D,Item.ControlMeasures
,(CASE WHEN level.RiskLevelName IS NULL THEN Item.HazardLevel ELSE level.RiskLevelName END) AS RiskLevelName
from Hazard_HazardSelectedItem AS Item
LEFT JOIN Hazard_HazardList AS List on List.HazardListId = Item.HazardListId
LEFT JOIN Base_RiskLevel as level on level.RiskLevelId = Item.HazardLevel