提交代码

2024-05-15 09:04:57 +08:00
parent 4bf0e3ed0a eb224b4fbb
commit b3f95bfee0
37 changed files with 2650 additions and 2186 deletions
@@ -10,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>BLL</RootNamespace>
    <AssemblyName>BLL</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <SccProjectName>
    </SccProjectName>
@@ -587,7 +587,6 @@
    <Compile Include="JDGL\Check\QuantityListService.cs" />
    <Compile Include="JDGL\Check\SteelStructureCompletionService.cs" />
    <Compile Include="JDGL\Check\UndergroundPipeCompletionService.cs" />
-    <Compile Include="JDGL\Check\WeekPlanService.cs" />
    <Compile Include="JDGL\WBSCompleteAndReal\WBSReportService.cs" />
    <Compile Include="JDGL\WBS\CnProfessionInitService.cs" />
    <Compile Include="JDGL\WBS\CnProfessionService.cs" />
@@ -81,19 +81,6 @@ namespace BLL
                Funs.FineUIPleaseSelect(dropName);
            }
        }
-
-        public static void InitCNProfessionalDocDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
-        {
-            dropName.DataValueField = "Value";
-            dropName.DataTextField = "Text";
-            dropName.DataSource = GetCNProfessionalDocItem();
-            dropName.DataBind();
-            if (isShowPlease)
-            {
-                Funs.FineUIPleaseSelect(dropName);
-            }
-        }
-
        /// <summary>
        /// 专业下拉框
        /// </summary>
@@ -117,29 +104,7 @@ namespace BLL
        /// <returns></returns>
        public static ListItem[] GetCNProfessionalItem()
        {
-            var q = (from x in Funs.DB.Base_CNProfessional
-                     where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
-                     && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId
-                     orderby x.SortIndex
-                     select x).ToList();
-            ListItem[] list = new ListItem[q.Count()];
-            for (int i = 0; i < q.Count(); i++)
-            {
-                list[i] = new ListItem(q[i].ProfessionalName ?? "", q[i].CNProfessionalId);
-            }
-            return list;
-        }
-
-        /// <summary>
-        /// 资料收发文专用
-        /// </summary>
-        /// <returns></returns>
-        public static ListItem[] GetCNProfessionalDocItem()
-        {
-            var q = (from x in Funs.DB.Base_CNProfessional
-                     where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
-                     orderby x.SortIndex
-                     select x).ToList();
+            var q = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId orderby x.SortIndex select x).ToList();
            ListItem[] list = new ListItem[q.Count()];
            for (int i = 0; i < q.Count(); i++)
            {
@@ -47,7 +47,7 @@ namespace BLL
        {
            try
            {
-                var getDataList = (from x in Funs.DB.Sys_DataExchange where x.IsUpdate == false select x).Take(500).ToList();
+                var getDataList = (from x in Funs.DB.Sys_DataExchange where x.IsUpdate == false select x).Take(100).ToList();
                if (getDataList.Count() > 0)
                {
                    var getDataList0 = getDataList.Where(x => x.MessageText.Contains("\"Type\":0")).ToList();
@@ -339,10 +339,10 @@ namespace BLL
            {
                InspectionMangementList = (from x in InspectionMangementList where x.CNProfessionalId==cNProfessionalId select x).ToList();
            }
-            //if (isOnceQualified == true)
-            //{
+            if (isOnceQualified == true)
+            {
                InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == isOnceQualified select x).ToList();
-            //}
+            }
            if (startDate != null && SoptDate != null)
            {
                InspectionMangementList = (from x in InspectionMangementList where x.InspectionDate >= startDate && x.InspectionDate <= SoptDate select x).ToList();
@@ -357,10 +357,10 @@ namespace BLL
            {
                InspectionMangementList = (from x in InspectionMangementList where x.UnitId == unitId select x).ToList();
            }
-            //if (isOnceQualified == true)
-            //{
+            if (isOnceQualified == true)
+            {
                InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == isOnceQualified select x).ToList();
-            //}
+            }
            if (startDate != null && SoptDate != null)
            {
                InspectionMangementList = (from x in InspectionMangementList where x.InspectionDate >= startDate && x.InspectionDate <= SoptDate select x).ToList();
@@ -369,20 +369,6 @@ namespace BLL
            return InspectionMangementList;
        }

-        public static List<Model.View_CQMS_InspectionManagementDetail> getInspectionManagementDetailListByDate(string projectId, DateTime startDate, DateTime SoptDate, bool isOnceQualified)
-        {
-            List<Model.View_CQMS_InspectionManagementDetail> InspectionMangementList = (from x in Funs.DB.View_CQMS_InspectionManagementDetail where x.ProjectId == projectId select x).ToList();
-            //if (isOnceQualified == true)
-            //{
-                InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == isOnceQualified select x).ToList();
-            //}
-            if (startDate != null && SoptDate != null)
-            {
-                InspectionMangementList = (from x in InspectionMangementList where x.InspectionDate >= startDate && x.InspectionDate <= SoptDate select x).ToList();
-            }
-            return InspectionMangementList;
-        }
-
        /// <summary>
        /// 根据主键获取视图信息
        /// </summary>
@@ -3148,14 +3148,6 @@ namespace BLL
        /// </summary>
        public const string QuantityCompletionTemplateUrl = "File\\Excel\\DataIn\\项目进度完成情况导入模板.xls";
        /// <summary>
-        /// 月度计划情况导入模版文件原始的虚拟路径
-        /// </summary>
-        public const string MonthPlanTemplateUrl = "File\\Excel\\DataIn\\月度计划情况导入模板.xls";
-        /// <summary>
-        /// 周进度计划导入模版文件原始的虚拟路径
-        /// </summary>
-        public const string WeekPlanTemplateUrl = "File\\Excel\\DataIn\\周进度计划导入模板.xls";
-        /// <summary>
        /// 仪表索引
        /// </summary>
        public const string InstrumentUrl = "File\\Excel\\TestRun\\仪表索引模板.xlsx";
@@ -3899,11 +3891,6 @@ namespace BLL
        /// </summary>
        public const string CNProfessionalConstructId = "96EE9000-CAB3-46F0-9392-74BC6AD5D57B";

-        /// <summary>
-        /// 安全专业ID
-        /// </summary>
-        public const string CNProfessionalHSEId = "BD344C54-66CC-4547-89AF-04C297D60CD7";
-
        /// <summary>
        /// 设备材料报验
        /// </summary>
@@ -5771,15 +5758,10 @@ namespace BLL
        public const string RectificationMeasureMenuId = "0629BAB1-DB1C-42CE-A333-49F3813617D7";

        /// <summary>
-        /// 月度计划情况
+        /// 工程量完成情况
        /// </summary>
        public const string MonthPlanMenuId = "94287B92-7E96-4B90-BC6F-DAF30AE3B314";

-        /// <summary>
-        /// 周进度计划
-        /// </summary>
-        public const string WeekPlanMenuId = "56A54B4B-BBA3-4249-9FFC-3A60DAC79059";
-
        /// <summary>
        /// 进度完成情况
        /// </summary>
@@ -22,16 +22,6 @@ namespace BLL
            return Funs.DB.JDGL_MonthPlan.FirstOrDefault(e => e.MonthPlanId == MonthPlanId);
        }

-        /// <summary>
-        /// 根据主键获取月度计划情况
-        /// </summary>
-        /// <param name="MonthPlanId"></param>
-        /// <returns></returns>
-        public static List<Model.JDGL_MonthPlan> GetMonthPlansByMonths(string projectId, DateTime months)
-        {
-            return (from x in Funs.DB.JDGL_MonthPlan where x.ProjectId == projectId && x.Months == months select x).ToList();
-        }
-
        /// <summary>
        /// 添加月度计划情况
        /// </summary>
@@ -52,7 +42,6 @@ namespace BLL
                Remark = MonthPlan.Remark,
                CompileMan = MonthPlan.CompileMan,
                CompileDate = MonthPlan.CompileDate,
-                SortIndex = MonthPlan.SortIndex,
            };
            db.JDGL_MonthPlan.InsertOnSubmit(newMonthPlan);
            db.SubmitChanges();
@@ -76,8 +65,7 @@ namespace BLL
                newMonthPlan.Remark = MonthPlan.Remark;
                newMonthPlan.CompileMan = MonthPlan.CompileMan;
                newMonthPlan.CompileDate = MonthPlan.CompileDate;
-                newMonthPlan.SortIndex = MonthPlan.SortIndex;
-
+               
                db.SubmitChanges();
            }
        }
@@ -96,20 +84,5 @@ namespace BLL
                db.SubmitChanges();
            }
        }
-
-        /// <summary>
-        /// 根据主键删除月度计划情况
-        /// </summary>
-        /// <param name="MonthPlanId"></param>
-        public static void DeleteAllMonthPlan(string projectId, DateTime months)
-        {
-            Model.SGGLDB db = Funs.DB;
-            var q = from x in db.JDGL_MonthPlan where x.ProjectId == projectId && x.Months == months select x;
-            if (q != null)
-            {
-                db.JDGL_MonthPlan.DeleteAllOnSubmit(q);
-                db.SubmitChanges();
-            }
-        }
    }
 }
@@ -1,122 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BLL
-{
-    /// <summary>
-    /// 周计划情况
-    /// </summary>
-    public class WeekPlanService
-    {
-        public static Model.SGGLDB db = Funs.DB;
-
-        /// <summary>
-        /// 根据主键获取周计划情况
-        /// </summary>
-        /// <param name="WeekPlanId"></param>
-        /// <returns></returns>
-        public static Model.JDGL_WeekPlan GetWeekPlanById(string WeekPlanId)
-        {
-            return Funs.DB.JDGL_WeekPlan.FirstOrDefault(e => e.WeekPlanId == WeekPlanId);
-        }
-
-        /// <summary>
-        /// 根据主键获取周计划情况
-        /// </summary> 
-        /// <param name="WeekPlanId"></param>
-        /// <returns></returns>
-        public static List<Model.JDGL_WeekPlan> GetWeekPlansByWeeks(string projectId, string weekNo)
-        {
-            return (from x in Funs.DB.JDGL_WeekPlan where x.ProjectId == projectId && x.WeekNo == weekNo select x).ToList();
-        }
-
-        /// <summary>
-        /// 添加周计划情况
-        /// </summary>
-        /// <param name="WeekPlan"></param>
-        public static void AddWeekPlan(Model.JDGL_WeekPlan WeekPlan)
-        {
-            Model.SGGLDB db = Funs.DB;
-            Model.JDGL_WeekPlan newWeekPlan = new Model.JDGL_WeekPlan
-            {
-                WeekPlanId = WeekPlan.WeekPlanId,
-                ProjectId = WeekPlan.ProjectId,
-                WeekNo = WeekPlan.WeekNo,
-                StartDate = WeekPlan.StartDate,
-                EndDate = WeekPlan.EndDate,
-                UnitWork = WeekPlan.UnitWork,
-                Major = WeekPlan.Major,
-                WorkContent = WeekPlan.WorkContent,
-                UnitId = WeekPlan.UnitId,
-                DutyPerson = WeekPlan.DutyPerson,
-                PlanDate = WeekPlan.PlanDate,
-                IsOK = WeekPlan.IsOK,
-                Remark = WeekPlan.Remark,
-                CompileMan = WeekPlan.CompileMan,
-                CompileDate = WeekPlan.CompileDate,
-                SortIndex = WeekPlan.SortIndex,
-            };
-            db.JDGL_WeekPlan.InsertOnSubmit(newWeekPlan);
-            db.SubmitChanges();
-        }
-
-        /// <summary>
-        /// 修改周计划情况
-        /// </summary>
-        /// <param name="WeekPlan"></param>
-        public static void UpdateWeekPlan(Model.JDGL_WeekPlan WeekPlan)
-        {
-            Model.SGGLDB db = Funs.DB;
-            Model.JDGL_WeekPlan newWeekPlan = db.JDGL_WeekPlan.FirstOrDefault(e => e.WeekPlanId == WeekPlan.WeekPlanId);
-            if (newWeekPlan != null)
-            {
-                newWeekPlan.UnitWork = WeekPlan.UnitWork;
-                newWeekPlan.Major = WeekPlan.Major;
-                newWeekPlan.WorkContent = WeekPlan.WorkContent;
-                newWeekPlan.UnitId = WeekPlan.UnitId;
-                newWeekPlan.DutyPerson = WeekPlan.DutyPerson;
-                newWeekPlan.PlanDate = WeekPlan.PlanDate;
-                newWeekPlan.IsOK = WeekPlan.IsOK;
-                newWeekPlan.Remark = WeekPlan.Remark;
-                newWeekPlan.CompileMan = WeekPlan.CompileMan;
-                newWeekPlan.CompileDate = WeekPlan.CompileDate;
-                newWeekPlan.SortIndex = WeekPlan.SortIndex;
-
-                db.SubmitChanges();
-            }
-        }
-
-        /// <summary>
-        /// 根据主键删除周计划情况
-        /// </summary>
-        /// <param name="WeekPlanId"></param>
-        public static void DeleteWeekPlanByWeekPlanId(string WeekPlanId)
-        {
-            Model.SGGLDB db = Funs.DB;
-            var q = (from x in db.JDGL_WeekPlan where x.WeekPlanId == WeekPlanId select x).FirstOrDefault();
-            if (q != null)
-            {
-                db.JDGL_WeekPlan.DeleteOnSubmit(q);
-                db.SubmitChanges();
-            }
-        }
-
-        /// <summary>
-        /// 根据主键删除周计划情况
-        /// </summary>
-        /// <param name="WeekPlanId"></param>
-        public static void DeleteAllWeekPlan(string projectId, string weekNo)
-        {
-            Model.SGGLDB db = Funs.DB;
-            var q = from x in db.JDGL_WeekPlan where x.ProjectId == projectId && x.WeekNo == weekNo select x;
-            if (q != null)
-            {
-                db.JDGL_WeekPlan.DeleteAllOnSubmit(q);
-                db.SubmitChanges();
-            }
-        }
-    }
-}
@@ -169,32 +169,6 @@
                }
            }
        }
-
-        /// <summary>
-        ///  项目类型单位表下拉框
-        /// </summary>
-        /// <param name="dropName">下拉框名字</param>
-        /// <param name="isShowPlease">是否显示请选择</param>
-        public static void InitUnitDropDownList2(FineUIPro.DropDownList dropName, string projectId, string unitType, bool isShowPlease)
-        {
-            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
-            {
-                var pUnit = (from x in db.Project_ProjectUnit
-                             join y in db.Base_Unit on x.UnitId equals y.UnitId
-                             where x.ProjectId == projectId && x.UnitType == unitType
-                             orderby y.UnitCode
-                             select y).ToList();
-
-                dropName.DataValueField = "UnitName";
-                dropName.DataTextField = "UnitName";
-                dropName.DataSource = pUnit;
-                dropName.DataBind();
-                if (isShowPlease)
-                {
-                    Funs.FineUIPleaseSelect(dropName);
-                }
-            }
-        }
        #endregion

        /// <summary>
@@ -10998,600 +10998,223 @@ namespace BLL.CNCECHSSEService {
    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    [System.Runtime.Serialization.DataContractAttribute(Name="Information_MillionsMonthlyReport", Namespace="http://schemas.datacontract.org/2004/07/BLL.OpenService")]
    [System.SerializableAttribute()]
-    public partial class Information_MillionsMonthlyReport : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
-    {
-
+    public partial class Information_MillionsMonthlyReport : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
+        
        [System.NonSerializedAttribute()]
        private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
-
+        
        [System.Runtime.Serialization.OptionalFieldAttribute()]
        private System.Nullable<decimal> AccidentMortalityField;
-
+        
        [System.Runtime.Serialization.OptionalFieldAttribute()]
        private System.Nullable<decimal> DeathAccidentFrequencyField;
-
+        
        [System.Runtime.Serialization.OptionalFieldAttribute()]
        private string DutyPersonField;
-
+        
        [System.Runtime.Serialization.OptionalFieldAttribute()]
        private System.Nullable<System.DateTime> FillingDateField;
-
+        
        [System.Runtime.Serialization.OptionalFieldAttribute()]
        private string FillingManField;
-
+        
        [System.Runtime.Serialization.OptionalFieldAttribute()]
        private System.Nullable<decimal> LostTimeInjuryRateField;
-
+        
        [System.Runtime.Serialization.OptionalFieldAttribute()]
        private System.Nullable<decimal> LostTimeRateField;
-
+        
        [System.Runtime.Serialization.OptionalFieldAttribute()]
        private string MillionsMonthlyReportIdField;
-
+        
        [System.Runtime.Serialization.OptionalFieldAttribute()]
        private System.Nullable<int> MonthField;
-
+        
        [System.Runtime.Serialization.OptionalFieldAttribute()]
        private System.Nullable<decimal> RecordableIncidentRateField;
-
+        
        [System.Runtime.Serialization.OptionalFieldAttribute()]
        private string UnitIdField;
-
+        
        [System.Runtime.Serialization.OptionalFieldAttribute()]
        private System.Nullable<int> YearField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<decimal> InputCostsField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> TrainNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> GeneralHazardNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> MajorHazardNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> NotProofLargeProjectNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> ProofLargeProjectNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> FireLicenseNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> LimitLicenseNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> HighLicenseNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> HoistingLicenseNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> BreakGroundLicenseNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> ElectricityLicenseNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> RTLicenseNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> NightLicenseNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> CommissionerNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> SoleDutyNumField;
-
+        
        [global::System.ComponentModel.BrowsableAttribute(false)]
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> SoleDutyNum
-        {
-            get
-            {
-                return this.SoleDutyNumField;
-            }
-            set
-            {
-                if ((this.SoleDutyNumField.Equals(value) != true))
-                {
-                    this.SoleDutyNumField = value;
-                    this.RaisePropertyChanged("SoleDutyNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> CommissionerNum
-        {
-            get
-            {
-                return this.CommissionerNumField;
-            }
-            set
-            {
-                if ((this.CommissionerNumField.Equals(value) != true))
-                {
-                    this.CommissionerNumField = value;
-                    this.RaisePropertyChanged("CommissionerNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> NightLicenseNum
-        {
-            get
-            {
-                return this.NightLicenseNumField;
-            }
-            set
-            {
-                if ((this.NightLicenseNumField.Equals(value) != true))
-                {
-                    this.NightLicenseNumField = value;
-                    this.RaisePropertyChanged("NightLicenseNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> RTLicenseNum
-        {
-            get
-            {
-                return this.RTLicenseNumField;
-            }
-            set
-            {
-                if ((this.RTLicenseNumField.Equals(value) != true))
-                {
-                    this.RTLicenseNumField = value;
-                    this.RaisePropertyChanged("RTLicenseNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> ElectricityLicenseNum
-        {
-            get
-            {
-                return this.ElectricityLicenseNumField;
-            }
-            set
-            {
-                if ((this.ElectricityLicenseNumField.Equals(value) != true))
-                {
-                    this.ElectricityLicenseNumField = value;
-                    this.RaisePropertyChanged("ElectricityLicenseNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> BreakGroundLicenseNum
-        {
-            get
-            {
-                return this.BreakGroundLicenseNumField;
-            }
-            set
-            {
-                if ((this.BreakGroundLicenseNumField.Equals(value) != true))
-                {
-                    this.BreakGroundLicenseNumField = value;
-                    this.RaisePropertyChanged("BreakGroundLicenseNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> HoistingLicenseNum
-        {
-            get
-            {
-                return this.HoistingLicenseNumField;
-            }
-            set
-            {
-                if ((this.HoistingLicenseNumField.Equals(value) != true))
-                {
-                    this.HoistingLicenseNumField = value;
-                    this.RaisePropertyChanged("HoistingLicenseNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> HighLicenseNum
-        {
-            get
-            {
-                return this.HighLicenseNumField;
-            }
-            set
-            {
-                if ((this.HighLicenseNumField.Equals(value) != true))
-                {
-                    this.HighLicenseNumField = value;
-                    this.RaisePropertyChanged("HighLicenseNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> LimitLicenseNum
-        {
-            get
-            {
-                return this.LimitLicenseNumField;
-            }
-            set
-            {
-                if ((this.LimitLicenseNumField.Equals(value) != true))
-                {
-                    this.LimitLicenseNumField = value;
-                    this.RaisePropertyChanged("LimitLicenseNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> FireLicenseNum
-        {
-            get
-            {
-                return this.FireLicenseNumField;
-            }
-            set
-            {
-                if ((this.FireLicenseNumField.Equals(value) != true))
-                {
-                    this.FireLicenseNumField = value;
-                    this.RaisePropertyChanged("FireLicenseNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> ProofLargeProjectNum
-        {
-            get
-            {
-                return this.ProofLargeProjectNumField;
-            }
-            set
-            {
-                if ((this.ProofLargeProjectNumField.Equals(value) != true))
-                {
-                    this.ProofLargeProjectNumField = value;
-                    this.RaisePropertyChanged("ProofLargeProjectNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> NotProofLargeProjectNum
-        {
-            get
-            {
-                return this.NotProofLargeProjectNumField;
-            }
-            set
-            {
-                if ((this.NotProofLargeProjectNumField.Equals(value) != true))
-                {
-                    this.NotProofLargeProjectNumField = value;
-                    this.RaisePropertyChanged("NotProofLargeProjectNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> MajorHazardNum
-        {
-            get
-            {
-                return this.MajorHazardNumField;
-            }
-            set
-            {
-                if ((this.MajorHazardNumField.Equals(value) != true))
-                {
-                    this.MajorHazardNumField = value;
-                    this.RaisePropertyChanged("MajorHazardNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> GeneralHazardNum
-        {
-            get
-            {
-                return this.GeneralHazardNumField;
-            }
-            set
-            {
-                if ((this.GeneralHazardNumField.Equals(value) != true))
-                {
-                    this.GeneralHazardNumField = value;
-                    this.RaisePropertyChanged("GeneralHazardNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> TrainNum
-        {
-            get
-            {
-                return this.TrainNumField;
-            }
-            set
-            {
-                if ((this.TrainNumField.Equals(value) != true))
-                {
-                    this.TrainNumField = value;
-                    this.RaisePropertyChanged("TrainNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<decimal> InputCosts
-        {
-            get
-            {
-                return this.InputCostsField;
-            }
-            set
-            {
-                if ((this.InputCostsField.Equals(value) != true))
-                {
-                    this.InputCostsField = value;
-                    this.RaisePropertyChanged("InputCosts");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-
-        public System.Runtime.Serialization.ExtensionDataObject ExtensionData
-        {
-            get
-            {
+        public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
+            get {
                return this.extensionDataField;
            }
-            set
-            {
+            set {
                this.extensionDataField = value;
            }
        }
-
+        
        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<decimal> AccidentMortality
-        {
-            get
-            {
+        public System.Nullable<decimal> AccidentMortality {
+            get {
                return this.AccidentMortalityField;
            }
-            set
-            {
-                if ((this.AccidentMortalityField.Equals(value) != true))
-                {
+            set {
+                if ((this.AccidentMortalityField.Equals(value) != true)) {
                    this.AccidentMortalityField = value;
                    this.RaisePropertyChanged("AccidentMortality");
                }
            }
        }
-
+        
        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<decimal> DeathAccidentFrequency
-        {
-            get
-            {
+        public System.Nullable<decimal> DeathAccidentFrequency {
+            get {
                return this.DeathAccidentFrequencyField;
            }
-            set
-            {
-                if ((this.DeathAccidentFrequencyField.Equals(value) != true))
-                {
+            set {
+                if ((this.DeathAccidentFrequencyField.Equals(value) != true)) {
                    this.DeathAccidentFrequencyField = value;
                    this.RaisePropertyChanged("DeathAccidentFrequency");
                }
            }
        }
-
+        
        [System.Runtime.Serialization.DataMemberAttribute()]
-        public string DutyPerson
-        {
-            get
-            {
+        public string DutyPerson {
+            get {
                return this.DutyPersonField;
            }
-            set
-            {
-                if ((object.ReferenceEquals(this.DutyPersonField, value) != true))
-                {
+            set {
+                if ((object.ReferenceEquals(this.DutyPersonField, value) != true)) {
                    this.DutyPersonField = value;
                    this.RaisePropertyChanged("DutyPerson");
                }
            }
        }
-
+        
        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<System.DateTime> FillingDate
-        {
-            get
-            {
+        public System.Nullable<System.DateTime> FillingDate {
+            get {
                return this.FillingDateField;
            }
-            set
-            {
-                if ((this.FillingDateField.Equals(value) != true))
-                {
+            set {
+                if ((this.FillingDateField.Equals(value) != true)) {
                    this.FillingDateField = value;
                    this.RaisePropertyChanged("FillingDate");
                }
            }
        }
-
+        
        [System.Runtime.Serialization.DataMemberAttribute()]
-        public string FillingMan
-        {
-            get
-            {
+        public string FillingMan {
+            get {
                return this.FillingManField;
            }
-            set
-            {
-                if ((object.ReferenceEquals(this.FillingManField, value) != true))
-                {
+            set {
+                if ((object.ReferenceEquals(this.FillingManField, value) != true)) {
                    this.FillingManField = value;
                    this.RaisePropertyChanged("FillingMan");
                }
            }
        }
-
+        
        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<decimal> LostTimeInjuryRate
-        {
-            get
-            {
+        public System.Nullable<decimal> LostTimeInjuryRate {
+            get {
                return this.LostTimeInjuryRateField;
            }
-            set
-            {
-                if ((this.LostTimeInjuryRateField.Equals(value) != true))
-                {
+            set {
+                if ((this.LostTimeInjuryRateField.Equals(value) != true)) {
                    this.LostTimeInjuryRateField = value;
                    this.RaisePropertyChanged("LostTimeInjuryRate");
                }
            }
        }
-
+        
        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<decimal> LostTimeRate
-        {
-            get
-            {
+        public System.Nullable<decimal> LostTimeRate {
+            get {
                return this.LostTimeRateField;
            }
-            set
-            {
-                if ((this.LostTimeRateField.Equals(value) != true))
-                {
+            set {
+                if ((this.LostTimeRateField.Equals(value) != true)) {
                    this.LostTimeRateField = value;
                    this.RaisePropertyChanged("LostTimeRate");
                }
            }
        }
-
+        
        [System.Runtime.Serialization.DataMemberAttribute()]
-        public string MillionsMonthlyReportId
-        {
-            get
-            {
+        public string MillionsMonthlyReportId {
+            get {
                return this.MillionsMonthlyReportIdField;
            }
-            set
-            {
-                if ((object.ReferenceEquals(this.MillionsMonthlyReportIdField, value) != true))
-                {
+            set {
+                if ((object.ReferenceEquals(this.MillionsMonthlyReportIdField, value) != true)) {
                    this.MillionsMonthlyReportIdField = value;
                    this.RaisePropertyChanged("MillionsMonthlyReportId");
                }
            }
        }
-
+        
        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> Month
-        {
-            get
-            {
+        public System.Nullable<int> Month {
+            get {
                return this.MonthField;
            }
-            set
-            {
-                if ((this.MonthField.Equals(value) != true))
-                {
+            set {
+                if ((this.MonthField.Equals(value) != true)) {
                    this.MonthField = value;
                    this.RaisePropertyChanged("Month");
                }
            }
        }
-
+        
        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<decimal> RecordableIncidentRate
-        {
-            get
-            {
+        public System.Nullable<decimal> RecordableIncidentRate {
+            get {
                return this.RecordableIncidentRateField;
            }
-            set
-            {
-                if ((this.RecordableIncidentRateField.Equals(value) != true))
-                {
+            set {
+                if ((this.RecordableIncidentRateField.Equals(value) != true)) {
                    this.RecordableIncidentRateField = value;
                    this.RaisePropertyChanged("RecordableIncidentRate");
                }
            }
        }
-
+        
        [System.Runtime.Serialization.DataMemberAttribute()]
-        public string UnitId
-        {
-            get
-            {
+        public string UnitId {
+            get {
                return this.UnitIdField;
            }
-            set
-            {
-                if ((object.ReferenceEquals(this.UnitIdField, value) != true))
-                {
+            set {
+                if ((object.ReferenceEquals(this.UnitIdField, value) != true)) {
                    this.UnitIdField = value;
                    this.RaisePropertyChanged("UnitId");
                }
            }
        }
-
+        
        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> Year
-        {
-            get
-            {
+        public System.Nullable<int> Year {
+            get {
                return this.YearField;
            }
-            set
-            {
-                if ((this.YearField.Equals(value) != true))
-                {
+            set {
+                if ((this.YearField.Equals(value) != true)) {
                    this.YearField = value;
                    this.RaisePropertyChanged("Year");
                }
            }
        }
-
+        
        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-
-        protected void RaisePropertyChanged(string propertyName)
-        {
+        
+        protected void RaisePropertyChanged(string propertyName) {
            System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
-            if ((propertyChanged != null))
-            {
+            if ((propertyChanged != null)) {
                propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
            }
        }
    }
-
+    
    [System.Diagnostics.DebuggerStepThroughAttribute()]
    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    [System.Runtime.Serialization.DataContractAttribute(Name="Information_MillionsMonthlyReportItem", Namespace="http://schemas.datacontract.org/2004/07/BLL.OpenService")]
@@ -1293,19 +1293,6 @@ namespace BLL
                Funs.FineUIPleaseSelect(dropName);
            }
        }
-
-        public static void InitUserNameProjectIdUnitTypeDropDownList(FineUIPro.DropDownList dropName, string projectId, string unitType, bool isShowPlease)
-        {
-            dropName.DataValueField = "UserName";
-            dropName.DataTextField = "UserName";
-            dropName.DataSource = BLL.UserService.GetUserListByProjectIdAndUnitType(projectId, unitType);
-            dropName.DataBind();
-            if (isShowPlease)
-            {
-                Funs.FineUIPleaseSelect(dropName);
-            }
-        }
-
        /// <summary>
        /// 根据项目号和单位类型获取用户下拉选项
        /// </summary>
@@ -109,22 +109,22 @@
                                       LostTimeInjuryRate = x.LostTimeInjuryRate,
                                       DeathAccidentFrequency = x.DeathAccidentFrequency,
                                       AccidentMortality = x.AccidentMortality,
-                                       InputCosts = x.InputCosts,
-                                       TrainNum = x.TrainNum,
-                                       GeneralHazardNum = x.GeneralHazardNum,
-                                       MajorHazardNum = x.MajorHazardNum,
-                                       NotProofLargeProjectNum = x.NotProofLargeProjectNum,
-                                       ProofLargeProjectNum = x.ProofLargeProjectNum,
-                                       FireLicenseNum = x.FireLicenseNum,
-                                       LimitLicenseNum = x.LimitLicenseNum,
-                                       HighLicenseNum = x.HighLicenseNum,
-                                       HoistingLicenseNum = x.HoistingLicenseNum,
-                                       BreakGroundLicenseNum = x.BreakGroundLicenseNum,
-                                       ElectricityLicenseNum = x.ElectricityLicenseNum,
-                                       RTLicenseNum = x.RTLicenseNum,
-                                       NightLicenseNum = x.NightLicenseNum,
-                                       CommissionerNum = x.CommissionerNum,
-                                       SoleDutyNum = x.SoleDutyNum,
+                                       //InputCosts = x.InputCosts,
+                                       //TrainNum = x.TrainNum,
+                                       //GeneralHazardNum = x.GeneralHazardNum,
+                                       //MajorHazardNum = x.MajorHazardNum,
+                                       //NotProofLargeProjectNum = x.NotProofLargeProjectNum,
+                                       //ProofLargeProjectNum = x.ProofLargeProjectNum,
+                                       //FireLicenseNum = x.FireLicenseNum,
+                                       //LimitLicenseNum = x.LimitLicenseNum,
+                                       //HighLicenseNum = x.HighLicenseNum,
+                                       //HoistingLicenseNum = x.HoistingLicenseNum,
+                                       //BreakGroundLicenseNum = x.BreakGroundLicenseNum,
+                                       //ElectricityLicenseNum = x.ElectricityLicenseNum,
+                                       //RTLicenseNum = x.RTLicenseNum,
+                                       //NightLicenseNum = x.NightLicenseNum,
+                                       //CommissionerNum = x.CommissionerNum,
+                                       //SoleDutyNum = x.SoleDutyNum,
                                   };

                    var upReportItem = from x in db.Information_MillionsMonthlyReportItem
@@ -1,64 +1,64 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
      </dependentAssembly>
      <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1"/>
      </dependentAssembly>
      <dependentAssembly>
-        <assemblyIdentity name="System.Configuration.ConfigurationManager" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
+        <assemblyIdentity name="System.Configuration.ConfigurationManager" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1"/>
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
  <system.serviceModel>
    <client>
-      <endpoint address="http://114.247.88.70:1080/CNCECHSSE/HSSEService.svc" binding="wsHttpBinding" bindingConfiguration="HSSEServiceEndpoint" contract="CNCECHSSEService.HSSEService" name="HSSEServiceEndpoint" />
-      <endpoint address="https://mat.cwcec.com/LocWebServices/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="MCSService.WebService1Soap" name="WebService1Soap" />
+      <endpoint address="http://114.247.88.70:1080/CNCECHSSE/HSSEService.svc" binding="wsHttpBinding" bindingConfiguration="HSSEServiceEndpoint" contract="CNCECHSSEService.HSSEService" name="HSSEServiceEndpoint"/>
+      <endpoint address="https://mat.cwcec.com/LocWebServices/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="MCSService.WebService1Soap" name="WebService1Soap"/>
    </client>
-    <serviceHostingEnvironment aspNetCompatibilityEnabled="true" multipleSiteBindingsEnabled="true" />
+    <serviceHostingEnvironment aspNetCompatibilityEnabled="true" multipleSiteBindingsEnabled="true"/>
    <services>
      <service name="BLL.OpenService.HSSEService" behaviorConfiguration="BLL.HSSEServiceBehavior">
-        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="BLL.HSSEServiceBinding" name="BLL.HSSEServiceEndpoint" contract="BLL.OpenService.IHSSEService" />
+        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="BLL.HSSEServiceBinding" name="BLL.HSSEServiceEndpoint" contract="BLL.OpenService.IHSSEService"/>
      </service>
    </services>
    <behaviors>
      <serviceBehaviors>
        <behavior name="BLL.HSSEServiceBehavior">
-          <serviceMetadata httpGetEnabled="true" />
-          <serviceDebug includeExceptionDetailInFaults="false" />
-          <dataContractSerializer maxItemsInObjectGraph="2147483647" />
-          <serviceThrottling maxConcurrentCalls="2147483647" maxConcurrentInstances="2147483647" maxConcurrentSessions="2147483647" />
+          <serviceMetadata httpGetEnabled="true"/>
+          <serviceDebug includeExceptionDetailInFaults="false"/>
+          <dataContractSerializer maxItemsInObjectGraph="2147483647"/>
+          <serviceThrottling maxConcurrentCalls="2147483647" maxConcurrentInstances="2147483647" maxConcurrentSessions="2147483647"/>
        </behavior>
      </serviceBehaviors>
    </behaviors>
    <bindings>
      <basicHttpBinding>
        <binding name="WebService1Soap">
-          <security mode="Transport" />
+          <security mode="Transport"/>
        </binding>
-        <binding name="WebService1Soap1" />
+        <binding name="WebService1Soap1"/>
      </basicHttpBinding>
      <customBinding>
        <binding name="WebService1Soap12">
-          <textMessageEncoding messageVersion="Soap12" />
-          <httpsTransport />
+          <textMessageEncoding messageVersion="Soap12"/>
+          <httpsTransport/>
        </binding>
      </customBinding>
      <wsHttpBinding>
        <binding name="BLL.HSSEServiceBinding" closeTimeout="00:05:00" openTimeout="00:05:00" receiveTimeout="00:10:00" sendTimeout="00:10:00" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="5242880000" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
-          <readerQuotas maxDepth="32" maxStringContentLength="8192000" maxArrayLength="16384000" maxBytesPerRead="4096000" maxNameTableCharCount="16384000" />
-          <security mode="None" />
+          <readerQuotas maxDepth="32" maxStringContentLength="8192000" maxArrayLength="16384000" maxBytesPerRead="4096000" maxNameTableCharCount="16384000"/>
+          <security mode="None"/>
        </binding>
        <binding name="HSSEServiceEndpoint">
-          <security mode="None" />
+          <security mode="None"/>
        </binding>
      </wsHttpBinding>
    </bindings>
  </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>