2023-10-08

DataBase/版本日志/SGGLDB_WH_2023-09-30.sql

@@ -0,0 +1,47 @@
+--专项检查检查记录接收人
+alter table Check_CheckSpecial add ReceiveMan nvarchar(2000) null;
+
+--States：0-保存 1-提交 2-审核通过 3-已确认
+
+
+--修改专项检查明细视图
+/****** Object:  View [dbo].[View_CheckSpecialDetail]    Script Date: 2023/9/30 11:19:54 ******/
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+/*LEFT JOIN Sys_Const AS const ON const.ConstValue = detail.HandleStep and const.GroupId='HandleStep'*/
+ALTER VIEW [dbo].[View_CheckSpecialDetail]
+AS
+SELECT  detail.CheckSpecialDetailId, detail.CheckSpecialId, detail.CheckItem, checkItemSet.CheckItemName, detail.Unqualified, 
+                   detail.SortIndex, detail.UnitId, detail.HandleStep, detail.CompleteStatus, 
+                   (CASE WHEN detail.CompleteStatus = 1 THEN '合格' ELSE '不合格' END) AS CompleteStatusName, detail.LimitedDate, 
+                   detail.CompletedDate, detail.CheckContent, detail.CheckArea, 
+                   workArea.UnitWorkName + (CASE WHEN workArea.ProjectType = '1' THEN '(建筑)' WHEN workArea.ProjectType = '2' THEN '(安装)'
+                    ELSE '' END) AS CheckAreaName, detail.DataId, detail.DataType, unit.UnitName, 
+                   dbo.GetConstTextByIds(detail.HandleStep) AS HandleStepStr, 
+                   (CASE WHEN detail.DataType LIKE '%1%' THEN '下发整改单:' +
+                       (SELECT  RectifyNoticesCode
+                        FROM       Check_RectifyNotices
+                        WHERE    detail.DataId LIKE '%' + RectifyNoticesId + '%') ELSE '' END) 
+                   + (CASE WHEN detail.DataType LIKE '%2%' THEN '下发处罚单:' +
+                       (SELECT  PunishNoticeCode
+                        FROM       Check_PunishNotice
+                        WHERE    detail.DataId LIKE '%' + PunishNoticeId + '%') ELSE '' END) 
+                   + (CASE WHEN detail.DataType = '3' THEN '下发暂停令:' +
+                       (SELECT  PauseNoticeCode
+                        FROM       Check_PauseNotice
+                        WHERE    detail.DataId LIKE '%' + PauseNoticeId + '%') ELSE '' END) AS HandleStepLink, detail.HiddenHazardType, 
+                   (CASE WHEN detail.HiddenHazardType = '3' THEN '重大' WHEN detail.HiddenHazardType = '2' THEN '较大' WHEN detail.HiddenHazardType
+                    = '1' THEN '一般' ELSE '' END) AS HiddenHazardTypeName, detail.CheckItemSetId, detail.CheckItemSetContent, 
+                   detail.Rectification_Date
+FROM      dbo.Check_CheckSpecialDetail AS detail LEFT OUTER JOIN
+                   dbo.Technique_CheckItemSet AS checkItemSet ON checkItemSet.CheckItemSetId = detail.CheckItem LEFT OUTER JOIN
+                   dbo.Base_Unit AS unit ON unit.UnitId = detail.UnitId LEFT OUTER JOIN
+                   dbo.WBS_UnitWork AS workArea ON detail.CheckArea = workArea.UnitWorkId
+
+
+GO
+
+

DataBase/版本日志/SGGLDB_WH_2023-10-07.sql

@@ -0,0 +1,4 @@
+alter table Base_Project add ProjType nvarchar(50) null
+GO
+alter table Base_Project add ProjPhase nvarchar(50) null
+GO

DataBase/版本日志/SGGLDB_WH_2023-10-08.sql

@@ -0,0 +1,31 @@
+Create VIEW [dbo].[View_QualityAudit_GeneralEquipmentQuality]  AS 
+/*机具设备资质信息列表视图*/ 
+SELECT equ.GeneralEquipmentQualityId
+      ,equ.ProjectId
+      ,equ.GeneralEquipmentQualityCode
+      ,equ.UnitId
+	  ,Unit.UnitName
+      ,equ.SpecialEquipmentId
+	  ,sp.SpecialEquipmentName
+      ,equ.[IsQualified]
+	  ,equ.EquipmentCount    
+      ,equ.InDate    
+      ,equ.Remark
+      ,equ.CompileMan
+	  ,U.UserName AS CompileManName
+      ,equ.CompileDate
+      ,equ.QRCodeAttachUrl
+	  ,REPLACE(a.AttachUrl,'\', '/') AS AttachUrl
+FROM QualityAudit_GeneralEquipmentQuality AS equ
+LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=equ.UnitId
+LEFT JOIN Base_SpecialEquipment AS sp ON equ.SpecialEquipmentId = sp.SpecialEquipmentId
+LEFT JOIN Sys_User AS U ON U.UserId = equ.CompileMan
+LEFT JOIN AttachFile AS a ON a.ToKeyId = equ.GeneralEquipmentQualityId
+
+
+
+GO
+
+
+update QualityAudit_GeneralEquipmentQuality set QRCodeAttachUrl =NULL
+GO

SGGL/BLL/API/APIPersonService.cs

@@ -58,7 +58,7 @@ namespace BLL
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
                 var getPerson = from x in db.View_SitePerson_Person
-                                where x.PersonId == personId || x.IdentityCard == personId
+                                where (x.PersonId == personId || x.IdentityCard == personId)
                                 select new Model.PersonItem
                                 {
                                     PersonId = x.PersonId,
@@ -1752,5 +1752,83 @@ namespace BLL
 
             return message;
         }
+
+        #region 二维码扫码获取人员
+        /// <summary>
+        /// 二维码扫码获取人员
+        /// </summary>
+        /// <param name="personId"></param>
+        /// <returns></returns>
+        public static Model.PersonItem getPersonByPersonIdQrcode(string personId)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var getPerson = from x in db.View_SitePerson_Person
+                                where (x.PersonId == personId || x.IdentityCard == personId) && x.IsUsed == true
+                                select new Model.PersonItem
+                                {
+                                    PersonId = x.PersonId,
+                                    CardNo = x.CardNo,
+                                    PersonName = x.PersonName,
+                                    Sex = x.Sex,
+                                    SexName = x.SexName,
+                                    IdentityCard = x.IdentityCard,
+                                    Address = x.Address,
+                                    ProjectId = x.ProjectId,
+                                    ProjectCode = x.ProjectCode,
+                                    ProjectName = x.ProjectName,
+                                    UnitId = x.UnitId,
+                                    UnitCode = x.UnitCode,
+                                    UnitName = x.UnitName,
+                                    TeamGroupId = x.TeamGroupId,
+                                    TeamGroupName = x.TeamGroupName,
+                                    WorkPostId = x.WorkPostId,
+                                    WorkPostName = x.WorkPostName,
+                                    InTime = string.Format("{0:yyyy-MM-dd}", x.InTime),
+                                    OutTime = string.Format("{0:yyyy-MM-dd}", x.OutTime),
+                                    OutResult = x.OutResult,
+                                    Telephone = x.Telephone,
+                                    PhotoUrl = x.PhotoUrl,
+                                    DepartName = x.DepartName,
+                                    IsUsed = x.IsUsed,
+                                    IsUsedName = x.IsUsed == false ? "不启用" : "启用",
+                                    AuditorId = x.AuditorId,
+                                    AuditorName = db.Sys_User.First(z => z.UserId == x.AuditorId).UserName,
+                                    IsForeign = x.IsForeign.HasValue ? x.IsForeign : false,
+                                    IsOutside = x.IsOutside.HasValue ? x.IsOutside : false,
+                                    AuditorDate = string.Format("{0:yyyy-MM-dd}", x.AuditorDate),
+                                    AttachUrl1 = x.IDCardUrl == null ? APIUpLoadFileService.getFileUrl(personId + "#1", null) : x.IDCardUrl.Replace('\\', '/'),
+                                    AttachUrl2 = APIUpLoadFileService.getFileUrl(personId + "#2", null),
+                                    AttachUrl3 = APIUpLoadFileService.getFileUrl(personId + "#3", null),
+                                    AttachUrl4 = getAttachUrl4(x.PersonId),
+                                    AttachUrl5 = APIUpLoadFileService.getFileUrl(personId + "#5", null),
+                                    IdcardType = x.IdcardType,
+                                    IdcardTypeName = x.IdcardTypeName,
+                                    IdcardStartDate = string.Format("{0:yyyy-MM-dd}", x.IdcardStartDate),
+                                    IdcardEndDate = string.Format("{0:yyyy-MM-dd}", x.IdcardEndDate),
+                                    IdcardForever = x.IdcardForever,
+                                    IdcardForeverStr = x.IdcardForeverStr,
+                                    PoliticsStatus = x.PoliticsStatus,
+                                    PoliticsStatusName = x.PoliticsStatusName,
+                                    IdcardAddress = x.IdcardAddress,
+                                    Nation = x.Nation,
+                                    NationName = x.NationName,
+                                    EduLevel = x.EduLevel,
+                                    EduLevelName = x.EduLevelName,
+                                    MaritalStatus = x.MaritalStatus,
+                                    MaritalStatusName = x.MaritalStatusName,
+                                    CountryCode = x.CountryCode,
+                                    CountryName = x.CountryName,
+                                    ProvinceCode = x.ProvinceCode,
+                                    ProvinceName = x.ProvinceName,
+                                    MainCNProfessionalId = x.MainCNProfessionalId,
+                                    MainCNProfessionalName = x.MainCNProfessionalName,
+                                    ViceCNProfessionalId = x.ViceCNProfessionalId,
+                                    ViceCNProfessionalName = x.ViceCNProfessionalName
+                                };
+                return getPerson.FirstOrDefault();
+            }
+        }
+        #endregion
     }
 }

SGGL/BLL/API/HSSE/APICheckSpecialService.cs

@@ -14,37 +14,96 @@ namespace BLL
         /// </summary>
         /// <param name="CheckSpecialId"></param>
         /// <returns></returns>
-        public static Model.CheckSpecialItem getCheckSpecialById(string CheckSpecialId)
+        public static Model.CheckSpecialItem getCheckSpecialById(string CheckSpecialId,string state="0")
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
-                var getInfo = from x in db.Check_CheckSpecial
+                if (state == "0")
-                              where x.CheckSpecialId == CheckSpecialId
+                {
-                              select new Model.CheckSpecialItem
+                    //状态是0的时候查看所有
-                              {
+                    var getInfo = from x in db.Check_CheckSpecial
-                                  CheckSpecialId = x.CheckSpecialId,
+                                  where x.CheckSpecialId == CheckSpecialId
-                                  ProjectId = x.ProjectId,
+                                  select new Model.CheckSpecialItem
-                                  CheckSpecialCode = x.CheckSpecialCode,
+                                  {
-                                  CheckTypeName = (x.CheckType == "1" ? "联合" : "专项"),
+                                      CheckSpecialId = x.CheckSpecialId,
-                                  CheckType = x.CheckType,
+                                      ProjectId = x.ProjectId,
-                                  CheckItemSetId = x.CheckItemSetId,
+                                      CheckSpecialCode = x.CheckSpecialCode,
-                                  CheckItemSetName = db.Technique_CheckItemSet.First(y => y.CheckItemSetId == x.CheckItemSetId).CheckItemName,
+                                      CheckTypeName = (x.CheckType == "1" ? "联合" : "专项"),
-                                  CheckPersonId = x.CheckPerson,
+                                      CheckType = x.CheckType,
-                                  CheckPersonName = db.Sys_User.First(u => u.UserId == x.CheckPerson).UserName,
+                                      CheckItemSetId = x.CheckItemSetId,
-                                  CheckTime = string.Format("{0:yyyy-MM-dd}", x.CheckTime),
+                                      CheckItemSetName = db.Technique_CheckItemSet.First(y => y.CheckItemSetId == x.CheckItemSetId).CheckItemName,
-                                  DaySummary = x.DaySummary,
+                                      CheckPersonId = x.CheckPerson,
-                                  PartInUnitIds = x.PartInUnits,
+                                      CheckPersonName = db.Sys_User.First(u => u.UserId == x.CheckPerson).UserName,
-                                  PartInUnitNames = UnitService.getUnitNamesUnitIds(x.PartInUnits),
+                                      CheckTime = string.Format("{0:yyyy-MM-dd}", x.CheckTime),
-                                  PartInPersonIds = x.PartInPersonIds,
+                                      DaySummary = x.DaySummary,
-                                  PartInPersonNames = UserService.getUserNamesUserIds(x.PartInPersonIds),
+                                      PartInUnitIds = x.PartInUnits,
-                                  PartInPersonNames2 = x.PartInPersonNames,
+                                      PartInUnitNames = UnitService.getUnitNamesUnitIds(x.PartInUnits),
-                                  CompileManId = x.CompileMan,
+                                      PartInPersonIds = x.PartInPersonIds,
-                                  CompileManName = db.Sys_User.First(u => u.UserId == x.CompileMan).UserName,
+                                      PartInPersonNames = UserService.getUserNamesUserIds(x.PartInPersonIds),
-                                  States = x.States,
+                                      PartInPersonNames2 = x.PartInPersonNames,
-                                  AttachUrl1 = APIUpLoadFileService.getFileUrl(x.CheckSpecialId, null),
+                                      CompileManId = x.CompileMan,
-                                  CheckSpecialDetailItems = getCheckSpecialDetailList(x.CheckSpecialId),
+                                      CompileManName = db.Sys_User.First(u => u.UserId == x.CompileMan).UserName,
-                              };
+                                      States = x.States,
-                return getInfo.FirstOrDefault();
+                                      AttachUrl1 = APIUpLoadFileService.getFileUrl(x.CheckSpecialId, null),
+                                      CheckSpecialDetailItems = getCheckSpecialDetailList(x.CheckSpecialId,"0"),
+
+                                      ResponsibleUnit = x.ResponsibleUnit,
+                                      ResponsibleUnitName = UnitService.GetUnitNameByUnitId(x.ResponsibleUnit),
+                                      WorkAreaId = x.WorkAreaId,
+                                      WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
+                                      QuestionType = x.QuestionType,
+                                      QuestionTypeName = UnitService.GetQuestionTypeId(x.QuestionType),
+
+                                      ResponsibleMan = x.ResponsibleMan,
+                                      ReceiveMan = x.ReceiveMan,
+                                      ReceiveManName = UserService.getUserNamesUserIds(x.ReceiveMan)
+
+                                  };
+                    return getInfo.FirstOrDefault();
+                }
+                else {
+                    //状态是1的时候查看不合格的子项
+                    var getInfo = from x in db.Check_CheckSpecial
+                                  where x.CheckSpecialId == CheckSpecialId
+                                  select new Model.CheckSpecialItem
+                                  {
+                                      CheckSpecialId = x.CheckSpecialId,
+                                      ProjectId = x.ProjectId,
+                                      CheckSpecialCode = x.CheckSpecialCode,
+                                      CheckTypeName = (x.CheckType == "1" ? "联合" : "专项"),
+                                      CheckType = x.CheckType,
+                                      CheckItemSetId = x.CheckItemSetId,
+                                      CheckItemSetName = db.Technique_CheckItemSet.First(y => y.CheckItemSetId == x.CheckItemSetId).CheckItemName,
+                                      CheckPersonId = x.CheckPerson,
+                                      CheckPersonName = db.Sys_User.First(u => u.UserId == x.CheckPerson).UserName,
+                                      CheckTime = string.Format("{0:yyyy-MM-dd}", x.CheckTime),
+                                      DaySummary = x.DaySummary,
+                                      PartInUnitIds = x.PartInUnits,
+                                      PartInUnitNames = UnitService.getUnitNamesUnitIds(x.PartInUnits),
+                                      PartInPersonIds = x.PartInPersonIds,
+                                      PartInPersonNames = UserService.getUserNamesUserIds(x.PartInPersonIds),
+                                      PartInPersonNames2 = x.PartInPersonNames,
+                                      CompileManId = x.CompileMan,
+                                      CompileManName = db.Sys_User.First(u => u.UserId == x.CompileMan).UserName,
+                                      States = x.States,
+                                      AttachUrl1 = APIUpLoadFileService.getFileUrl(x.CheckSpecialId, null),
+                                      CheckSpecialDetailItems = getCheckSpecialDetailList(x.CheckSpecialId,"1"),
+
+                                      ResponsibleUnit = x.ResponsibleUnit,
+                                      ResponsibleUnitName = UnitService.GetUnitNameByUnitId(x.ResponsibleUnit),
+                                      WorkAreaId = x.WorkAreaId,
+                                      WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
+                                      QuestionType = x.QuestionType,
+                                      QuestionTypeName = UnitService.GetQuestionTypeId(x.QuestionType),
+
+                                      ResponsibleMan = x.ResponsibleMan,
+                                      ReceiveMan = x.ReceiveMan,
+                                      ReceiveManName = UserService.getUserNamesUserIds(x.ReceiveMan)
+
+                                  };
+                    return getInfo.FirstOrDefault();
+                }
+                
             }
         }
         #endregion        
@@ -56,12 +115,14 @@ namespace BLL
         /// <param name="projectId"></param>
         /// <param name="states"></param>
         /// <returns></returns>
-        public static List<Model.CheckSpecialItem> getCheckSpecialList(string projectId,  string states)
+        public static List<Model.CheckSpecialItem> getCheckSpecialList(string projectId,  string states,string userid)
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
                 var getCheckSpecial = from x in db.Check_CheckSpecial
                                       where x.ProjectId == projectId &&  x.States ==states
+                                      //当前保存人、审核人、确认人能看到
+                                      &&(x.CompileMan==userid || x.ResponsibleMan==userid || userid.Split(',').Contains(x.ReceiveMan))
                                       orderby x.CheckSpecialCode descending
                                       select new Model.CheckSpecialItem
                                       {
@@ -85,6 +146,8 @@ namespace BLL
                                           CompileManName = db.Sys_User.First(u => u.UserId == x.CompileMan).UserName,
                                           States = x.States,
                                           AttachUrl1 = APIUpLoadFileService.getFileUrl(x.CheckSpecialId, null),
+                                          ReceiveMan=x.ReceiveMan,
+                                          ReceiveManName= UserService.getUserNamesUserIds(x.ReceiveMan)
                                       };
                 return getCheckSpecial.ToList();
             }
@@ -117,18 +180,39 @@ namespace BLL
                     PartInPersons = UserService.getUserNamesUserIds(newItem.PartInPersonIds),
                     PartInPersonNames = newItem.PartInPersonNames2,
                     CompileMan = newItem.CompileManId,
-                    States = Const.State_0,
+                    States = newItem.States,
+
+                    ResponsibleUnit=newItem.ResponsibleUnit,
+                    WorkAreaId=newItem.WorkAreaId,
+                    QuestionType=newItem.QuestionType,
+                    //审核人
+                    ResponsibleMan=newItem.ResponsibleMan,
+                    ReceiveMan=newItem.ReceiveMan
                 };
                 //if (newItem.States != Const.State_1)
                 //{
                 //    newCheckSpecial.States = Const.State_0;
                 //}
 
-                if (newItem.CheckSpecialDetailItems == null || newItem.CheckSpecialDetailItems.Count() == 0)
+                //if (newItem.CheckSpecialDetailItems == null || newItem.CheckSpecialDetailItems.Count() == 0)
+                //{
+                //    if (newItem.States == Const.State_1)
+                //    {
+                //        newCheckSpecial.States = Const.State_2;
+                //    }
+                //}
+
+                //如果审核状态不为空
+                if (!string.IsNullOrEmpty(newItem.AuditState))
                 {
-                    if (newItem.States == Const.State_1)
+                    //不同意的话
+                    if (newItem.AuditState=="0")
                     {
-                        newCheckSpecial.States = Const.State_2;
+                        newCheckSpecial.States = "0";
+                    }
+                    else if (newItem.AuditState=="1")
+                    {
+                        newCheckSpecial.States = "2";
                     }
                 }
 
@@ -167,31 +251,32 @@ namespace BLL
                         SaveCheckSpecialDetail(item);                      
                     }
                     //// 单据完成后 系统自动按照单位 整改要求生成隐患整改单
-                    if (newItem.States == Const.State_1)
+                    ///五环不需要
-                    {
+                    //if (newItem.States == Const.State_1)
-                        var getC = newItem.CheckSpecialDetailItems.FirstOrDefault(x => x.CompleteStatus == false);
+                    //{
-                        if (getC == null)
+                    //    var getC = newItem.CheckSpecialDetailItems.FirstOrDefault(x => x.CompleteStatus == false);
-                        {
+                    //    if (getC == null)
-                            newCheckSpecial.States = Const.State_2;
+                    //    {
-                            Check_CheckSpecialService.UpdateCheckSpecial(newCheckSpecial);
+                    //        newCheckSpecial.States = Const.State_2;
-                        }
+                    //        Check_CheckSpecialService.UpdateCheckSpecial(newCheckSpecial);
-                        else
+                    //    }
-                        {
+                    //    else
-                            var getNA = newItem.CheckSpecialDetailItems.FirstOrDefault(x => x.CompleteStatus == false && (x.HandleStep== null || x.HandleStep==""));
+                    //    {
-                            if (getNA == null)
+                    //        var getNA = newItem.CheckSpecialDetailItems.FirstOrDefault(x => x.CompleteStatus == false && (x.HandleStep== null || x.HandleStep==""));
-                            {
+                    //        if (getNA == null)
-                                var detailLists = db.Check_CheckSpecialDetail.Where(x => x.CheckSpecialId == newCheckSpecial.CheckSpecialId && x.CompleteStatus == false);
+                    //        {
-                                if (detailLists.Count() > 0)
+                    //            var detailLists = db.Check_CheckSpecialDetail.Where(x => x.CheckSpecialId == newCheckSpecial.CheckSpecialId && x.CompleteStatus == false);
-                                {
+                    //            if (detailLists.Count() > 0)
-                                    message = Check_CheckSpecialService.IssueRectification(detailLists.ToList(), newCheckSpecial);
+                    //            {
-                                }
+                    //                message = Check_CheckSpecialService.IssueRectification(detailLists.ToList(), newCheckSpecial);
-                            }
+                    //            }
-                            else
+                    //        }
-                            {
+                    //        else
-                                message += "存在待整改，没有处理措施的记录！";
+                    //        {
-                            }
+                    //            message += "存在待整改，没有处理措施的记录！";
-                        }
+                    //        }
-                    }
+                    //    }
+                    //}
                 }
                 return message;
             }
@@ -204,42 +289,83 @@ namespace BLL
         /// </summary>
         /// <param name="checkSpecialId"></param>
         /// <returns></returns>
-        public static List<Model.CheckSpecialDetailItem> getCheckSpecialDetailList(string checkSpecialId)
+        public static List<Model.CheckSpecialDetailItem> getCheckSpecialDetailList(string checkSpecialId,string CompleteStatus="0")
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
-                var getInfo = from x in db.Check_CheckSpecialDetail
+                if (CompleteStatus == "0")
-                              where x.CheckSpecialId == checkSpecialId
+                {
-                              orderby x.SortIndex
+                    var getInfo = from x in db.Check_CheckSpecialDetail
-                              select new Model.CheckSpecialDetailItem
+                                  where x.CheckSpecialId == checkSpecialId
-                              {
+                                  orderby x.SortIndex
-                                  CheckSpecialDetailId = x.CheckSpecialDetailId,
+                                  select new Model.CheckSpecialDetailItem
-                                  CheckSpecialId = x.CheckSpecialId,
+                                  {
-                                  CheckItemSetId = x.CheckItem,
+                                      CheckSpecialDetailId = x.CheckSpecialDetailId,
-                                  CheckItemSetName = db.Technique_CheckItemSet.First(y => y.CheckItemSetId == x.CheckItem).CheckItemName,
+                                      CheckSpecialId = x.CheckSpecialId,
-                                  CheckContent = x.CheckContent,
+                                      CheckItemSetId = x.CheckItem,
-                                  SortIndex = x.SortIndex,
+                                      CheckItemSetName = db.Technique_CheckItemSet.First(y => y.CheckItemSetId == x.CheckItem).CheckItemName,
-                                  Unqualified = x.Unqualified,
+                                      CheckContent = x.CheckContent,
-                                  Suggestions = x.Suggestions,
+                                      SortIndex = x.SortIndex,
-                                  WorkArea = db.WBS_UnitWork.First(y=>y.UnitWorkId ==x.CheckArea).UnitWorkName,
+                                      Unqualified = x.Unqualified,
-                                  WorkAreaId=x.CheckArea,
+                                      Suggestions = x.Suggestions,
-                                  UnitId = x.UnitId,
+                                      WorkArea = db.WBS_UnitWork.First(y => y.UnitWorkId == x.CheckArea).UnitWorkName,
-                                  UnitName = db.Base_Unit.First(y => y.UnitId == x.UnitId).UnitName,
+                                      WorkAreaId = x.CheckArea,
-                                  HandleStep = x.HandleStep,
+                                      UnitId = x.UnitId,
-                                  HandleStepName = getNames(x.HandleStep),
+                                      UnitName = db.Base_Unit.First(y => y.UnitId == x.UnitId).UnitName,
-                                  HiddenHazardType = x.HiddenHazardType,
+                                      HandleStep = x.HandleStep,
-                                  HiddenHazardTypeName = x.HiddenHazardType == "3" ? "重大" : (x.HiddenHazardType == "2" ? "较大" : "一般"),
+                                      HandleStepName = getNames(x.HandleStep),
-                                  LimitedDate = string.Format("{0:yyyy-MM-dd}", x.LimitedDate),
+                                      HiddenHazardType = x.HiddenHazardType,
-                                  CompleteStatus = x.CompleteStatus,
+                                      HiddenHazardTypeName = x.HiddenHazardType == "3" ? "重大" : (x.HiddenHazardType == "2" ? "较大" : "一般"),
-                                  CompleteStatusName = x.CompleteStatus == true ? "已整改" : "待整改",
+                                      LimitedDate = string.Format("{0:yyyy-MM-dd}", x.LimitedDate),
-                                  CompletedDate = string.Format("{0:yyyy-MM-dd}", x.CompletedDate),
+                                      CompleteStatus = x.CompleteStatus,
-                                  AttachUrl1 = APIUpLoadFileService.getFileUrl(x.CheckSpecialDetailId, null),
+                                      CompleteStatusName = x.CompleteStatus == true ? "已整改" : "待整改",
+                                      CompletedDate = string.Format("{0:yyyy-MM-dd}", x.CompletedDate),
+                                      AttachUrl1 = APIUpLoadFileService.getFileUrl(x.CheckSpecialDetailId, null),
 
-                                  CheckItemDetailSetId = x.CheckItemSetId,
+                                      CheckItemDetailSetId = x.CheckItemSetId,
-                                  CheckItemDetailContent = x.CheckItemSetContent,
+                                      CheckItemDetailContent = x.CheckItemSetContent,
-                                  Rectification_Date = string.Format("{0:yyyy-MM-dd}", x.Rectification_Date),
+                                      Rectification_Date = string.Format("{0:yyyy-MM-dd}", x.Rectification_Date),
-                              };
+                                      CheckOpinions = x.CheckOpinions,
-                return getInfo.ToList();
+                                  };
+                    return getInfo.ToList();
+                }
+                else {
+                    //查询不合格子项
+                    var getInfo = from x in db.Check_CheckSpecialDetail
+                                  where x.CheckSpecialId == checkSpecialId && x.CompleteStatus==false
+                                  orderby x.SortIndex
+                                  select new Model.CheckSpecialDetailItem
+                                  {
+                                      CheckSpecialDetailId = x.CheckSpecialDetailId,
+                                      CheckSpecialId = x.CheckSpecialId,
+                                      CheckItemSetId = x.CheckItem,
+                                      CheckItemSetName = db.Technique_CheckItemSet.First(y => y.CheckItemSetId == x.CheckItem).CheckItemName,
+                                      CheckContent = x.CheckContent,
+                                      SortIndex = x.SortIndex,
+                                      Unqualified = x.Unqualified,
+                                      Suggestions = x.Suggestions,
+                                      WorkArea = db.WBS_UnitWork.First(y => y.UnitWorkId == x.CheckArea).UnitWorkName,
+                                      WorkAreaId = x.CheckArea,
+                                      UnitId = x.UnitId,
+                                      UnitName = db.Base_Unit.First(y => y.UnitId == x.UnitId).UnitName,
+                                      HandleStep = x.HandleStep,
+                                      HandleStepName = getNames(x.HandleStep),
+                                      HiddenHazardType = x.HiddenHazardType,
+                                      HiddenHazardTypeName = x.HiddenHazardType == "3" ? "重大" : (x.HiddenHazardType == "2" ? "较大" : "一般"),
+                                      LimitedDate = string.Format("{0:yyyy-MM-dd}", x.LimitedDate),
+                                      CompleteStatus = x.CompleteStatus,
+                                      CompleteStatusName = x.CompleteStatus == true ? "已整改" : "待整改",
+                                      CompletedDate = string.Format("{0:yyyy-MM-dd}", x.CompletedDate),
+                                      AttachUrl1 = APIUpLoadFileService.getFileUrl(x.CheckSpecialDetailId, null),
+
+                                      CheckItemDetailSetId = x.CheckItemSetId,
+                                      CheckItemDetailContent = x.CheckItemSetContent,
+                                      Rectification_Date = string.Format("{0:yyyy-MM-dd}", x.Rectification_Date),
+                                      CheckOpinions = x.CheckOpinions,
+                                  };
+                    return getInfo.ToList();
+                }
+                
             }
         }
         /// <summary>
@@ -290,6 +416,7 @@ namespace BLL
                                   CheckItemDetailSetId=x.CheckItemSetId,
                                   CheckItemDetailContent=x.CheckItemSetContent,
                                   Rectification_Date= string.Format("{0:yyyy-MM-dd}", x.Rectification_Date),
+                                  CheckOpinions=x.CheckOpinions
                               };
                 return getInfo.First();
             }
@@ -316,7 +443,7 @@ namespace BLL
                         UnitId = newDetail.UnitId,
                         HandleStep = newDetail.HandleStep,
                         HiddenHazardType = newDetail.HiddenHazardType,
-                        CompleteStatus = newDetail.CompleteStatus ?? false,
+                        CompleteStatus = newDetail.CompleteStatus,
                         RectifyNoticeId = newDetail.RectifyNoticeId,
                         LimitedDate = Funs.GetNewDateTime(newDetail.LimitedDate),
                         CompletedDate = Funs.GetNewDateTime(newDetail.CompletedDate),
@@ -325,10 +452,11 @@ namespace BLL
                         CheckArea = newDetail.WorkAreaId,
                         CheckContent = newDetail.CheckContent,
 
-                        //整改日期、检查内容、检查内容id
+                        //整改日期、检查内容、检查内容id、处理意见
                         CheckItemSetId= newDetail.CheckItemDetailSetId,
                         CheckItemSetContent= newDetail.CheckItemDetailContent,
-                        Rectification_Date = Funs.GetNewDateTime(newDetail.Rectification_Date)
+                        Rectification_Date = Funs.GetNewDateTime(newDetail.Rectification_Date),
+                        CheckOpinions=newDetail.CheckOpinions,
                     };
                     if (newCheckSpecialDetail.CompleteStatus == false && newCheckSpecialDetail.HandleStep.Contains("1") && string.IsNullOrEmpty(newCheckSpecialDetail.HiddenHazardType))
                     {
@@ -371,10 +499,11 @@ namespace BLL
                         updateDetail.CheckArea = newCheckSpecialDetail.CheckArea;
                         updateDetail.CheckContent = newCheckSpecialDetail.CheckContent;
 
-                        //整改日期、检查内容、检查内容id
+                        //整改日期、检查内容、检查内容id、处理意见
                         updateDetail.CheckItemSetId = newDetail.CheckItemDetailSetId;
                         updateDetail.CheckItemSetContent = newDetail.CheckItemDetailContent;
                         updateDetail.Rectification_Date = Funs.GetNewDateTime(newDetail.Rectification_Date);
+                        updateDetail.CheckOpinions = newDetail.CheckOpinions;
                         db.SubmitChanges();
                     }
                     ////保存附件

SGGL/BLL/API/HSSE/APIGeneralEquipmentQualityService.cs

@@ -0,0 +1,148 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using EmitMapper;
+
+namespace BLL
+{
+    public static class APIGeneralEquipmentQualityService
+    {
+        #region 根据equipmentQualityId获取机具设备信息
+        /// <summary>
+        /// 根据equipmentQualityId获取机具设备信息
+        /// </summary>
+        /// <param name="equipmentQualityId"></param>
+        /// <returns></returns>
+        public static Model.EquipmentQualityItem getEquipmentQualityByEquipmentQualityIdFactoryCode(string equipmentQualityId)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var getEquipmentQuality = (from x in db.View_QualityAudit_GeneralEquipmentQuality
+                                           where x.GeneralEquipmentQualityId == equipmentQualityId
+                                           select new Model.EquipmentQualityItem
+                                           {
+                                               EquipmentQualityId = x.GeneralEquipmentQualityId,
+                                               ProjectId = x.ProjectId,
+                                               EquipmentQualityCode = x.GeneralEquipmentQualityCode,
+                                               EquipmentCount = x.EquipmentCount.HasValue? x.EquipmentCount.Value.ToString():"",
+                                               UnitId = x.UnitId,
+                                               IsQualified =x.IsQualified.HasValue? x.IsQualified.Value?"是":"否":"",
+                                               UnitName = x.UnitName,
+                                               SpecialEquipmentName = x.SpecialEquipmentName,
+                                               InDate = string.Format("{0:yyyy-MM-dd}", x.InDate),
+                                               Remark = x.Remark,
+                                               CompileManId = x.CompileMan,
+                                               CompileManName = x.CompileManName,
+                                               CompileDate = string.Format("{0:yyyy-MM-dd}", x.CompileDate),
+                                               AttachUrl = x.AttachUrl.Replace('\\', '/')
+                                           }); ;
+                return getEquipmentQuality.FirstOrDefault();
+            }
+        }
+        #endregion        
+
+        #region 获取机具设备列表信息
+        /// <summary>
+        /// 获取机具设备列表信息
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="unitId"></param>
+        /// <param name="strParam"></param>
+        /// <returns></returns>
+        public static List<Model.EquipmentQualityItem> getEquipmentQualityList(string projectId, string unitId, string strParam)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var getEquipmentQuality = from x in db.View_QualityAudit_GeneralEquipmentQuality
+                                          where x.ProjectId == projectId && (x.UnitId == unitId || unitId == null)
+                                          && (strParam == null  || x.SpecialEquipmentName.Contains(strParam)  )
+                                          orderby x.GeneralEquipmentQualityCode descending
+                                          select new Model.EquipmentQualityItem
+                                          {
+                                              EquipmentQualityId = x.GeneralEquipmentQualityId,
+                                              ProjectId = x.ProjectId,
+                                              EquipmentQualityCode = x.GeneralEquipmentQualityCode,
+                                              EquipmentCount = x.EquipmentCount.HasValue ? x.EquipmentCount.Value.ToString() : "",
+                                              UnitId = x.UnitId,
+                                              IsQualified = x.IsQualified.HasValue ? x.IsQualified.Value ? "是" : "否" : "",
+                                              UnitName = x.UnitName,
+                                              SpecialEquipmentName = x.SpecialEquipmentName,
+                                              InDate = string.Format("{0:yyyy-MM-dd}", x.InDate),
+                                              Remark = x.Remark,
+                                              CompileManId = x.CompileMan,
+                                              CompileManName = x.CompileManName,
+                                              CompileDate = string.Format("{0:yyyy-MM-dd}", x.CompileDate),
+                                              AttachUrl = x.AttachUrl.Replace('\\', '/')
+                                          };
+                return getEquipmentQuality.ToList();
+            }
+        }
+        #endregion        
+
+        #region 保存QualityAudit_EquipmentQuality
+        /// <summary>
+        /// 保存QualityAudit_EquipmentQuality
+        /// </summary>
+        /// <param name="newItem">机具设备资质</param>
+        /// <returns></returns>
+        public static void SaveEquipmentQuality(Model.EquipmentQualityItem newItem)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.QualityAudit_GeneralEquipmentQuality newEquipmentQuality = new Model.QualityAudit_GeneralEquipmentQuality
+            {
+                GeneralEquipmentQualityId = newItem.EquipmentQualityId,
+                ProjectId = newItem.ProjectId,
+                GeneralEquipmentQualityCode = newItem.EquipmentQualityCode,
+                UnitId = newItem.UnitId,
+                SpecialEquipmentId = newItem.SpecialEquipmentId,
+                InDate = Funs.GetNewDateTime(newItem.InDate),
+                Remark = newItem.Remark,
+                CompileMan = newItem.CompileManId,
+            };
+            if (!string.IsNullOrEmpty(newItem.IsQualified))
+            {
+                if ("1".Equals(newItem.IsQualified))
+                {
+                    newEquipmentQuality.IsQualified = true;
+                }
+                else
+                {
+                    newEquipmentQuality.IsQualified = false;
+
+                }
+            }
+            if (!string.IsNullOrEmpty(newItem.EquipmentCount))
+            {
+                try
+                {
+                    newEquipmentQuality.EquipmentCount = int.Parse(newItem.EquipmentCount);
+                }
+                catch (Exception e) { }
+            }
+            var updateEquipmentQuality = db.QualityAudit_GeneralEquipmentQuality.FirstOrDefault(x => x.GeneralEquipmentQualityId == newItem.EquipmentQualityId);
+            if (updateEquipmentQuality == null)
+            {
+                newEquipmentQuality.CompileDate = DateTime.Now;
+                newEquipmentQuality.GeneralEquipmentQualityId = SQLHelper.GetNewID();
+                newEquipmentQuality.GeneralEquipmentQualityCode = BLL.CodeRecordsService.ReturnCodeByMenuIdProjectId(BLL.Const.GeneralEquipmentQualityMenuId, newItem.ProjectId, newItem.UnitId);
+                GeneralEquipmentQualityService.AddGeneralEquipmentQuality(newEquipmentQuality);
+            }
+            else
+            {
+                GeneralEquipmentQualityService.UpdateGeneralEquipmentQuality(newEquipmentQuality);
+            }
+            if (!string.IsNullOrEmpty(newItem.AttachUrl))
+            {
+                ////保存附件
+                UploadFileService.SaveAttachUrl(UploadFileService.GetSourceByAttachUrl(newItem.AttachUrl, 10, null), newItem.AttachUrl, Const.GeneralEquipmentQualityMenuId, newEquipmentQuality.GeneralEquipmentQualityId);
+            }
+            else
+            {
+                CommonService.DeleteAttachFileById(newEquipmentQuality.GeneralEquipmentQualityId);
+            }
+        }
+        #endregion
+    }
+}

SGGL/BLL/API/HSSE/APIResourcesService.cs

@@ -357,22 +357,42 @@ namespace BLL
         /// <param name="supTypeId"></param>
         /// <param name="checkType">1-checkType;2-专项检查;3-综合检查</param>
         /// <returns></returns>
-        public static List<Model.ResourcesItem> getCheckItemSetListBySupCheckItemId(string supTypeId, string checkType)
+        public static List<Model.ResourcesItem> getCheckItemSetListBySupCheckItemId(string supTypeId, string checkType,string supName="")
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
-                var getDataLists = from x in db.Technique_CheckItemSet
+                if (!string.IsNullOrEmpty(supName))
-                                   where x.CheckType == checkType && (x.SupCheckItem == supTypeId || (supTypeId == null && x.SupCheckItem == "0"))
+                {
-                                   orderby x.SortIndex
+                    var getDataLists = from x in db.Technique_CheckItemSet
-                                   select new Model.ResourcesItem
+                                       where x.CheckType == checkType && (x.SupCheckItem == supTypeId || (supTypeId == null && x.SupCheckItem == "0"))
-                                   {
+                                       && x.CheckItemName.Contains(supName)
-                                       ResourcesId = x.CheckItemSetId,
+                                       orderby x.SortIndex
-                                       ResourcesCode = x.MapCode,
+                                       select new Model.ResourcesItem
-                                       ResourcesName = x.CheckItemName,
+                                       {
-                                       SupResourcesId = x.SupCheckItem,
+                                           ResourcesId = x.CheckItemSetId,
-                                       IsEndLever = x.IsEndLever,
+                                           ResourcesCode = x.MapCode,
-                                   };
+                                           ResourcesName = x.CheckItemName,
-                return getDataLists.ToList();
+                                           SupResourcesId = x.SupCheckItem,
+                                           IsEndLever = x.IsEndLever,
+                                       };
+                    return getDataLists.ToList();
+                }
+                else {
+                    var getDataLists = from x in db.Technique_CheckItemSet
+                                       where x.CheckType == checkType && (x.SupCheckItem == supTypeId || (supTypeId == null && x.SupCheckItem == "0"))
+                                       orderby x.SortIndex
+                                       select new Model.ResourcesItem
+                                       {
+                                           ResourcesId = x.CheckItemSetId,
+                                           ResourcesCode = x.MapCode,
+                                           ResourcesName = x.CheckItemName,
+                                           SupResourcesId = x.SupCheckItem,
+                                           IsEndLever = x.IsEndLever,
+                                       };
+                    return getDataLists.ToList();
+                }
+               
+              
             }
         }
 

SGGL/BLL/BLL.csproj

@@ -103,6 +103,7 @@
     <Compile Include="API\HJGL\APIPreWeldingDailyService.cs" />
     <Compile Include="API\HJGL\APIReportQueryService.cs" />
     <Compile Include="API\HJGL\APITestPackageService.cs" />
+    <Compile Include="API\HSSE\APIGeneralEquipmentQualityService.cs" />
     <Compile Include="API\HSSE\APIPageDataService.cs" />
     <Compile Include="API\HSSE\APIChartAnalysisService.cs" />
     <Compile Include="API\HSSE\APICheckSpecialService.cs" />
@@ -174,6 +175,7 @@
     <Compile Include="Common\CommonService.cs" />
     <Compile Include="Common\CreateQRCodeService.cs" />
     <Compile Include="Common\IDCardValid.cs" />
+    <Compile Include="Common\NPOIExcel.cs" />
     <Compile Include="Common\NPOIHelper.cs" />
     <Compile Include="Common\PrinterDocService.cs" />
     <Compile Include="Common\ProjectDataFlowSetService.cs" />

SGGL/BLL/HSSE/Check/Check_CheckSpecialService.cs

@@ -244,7 +244,8 @@ namespace BLL
                             {
                                 Model.RectifyNoticesItemItem newRItem = new Model.RectifyNoticesItemItem
                                 {
-                                    WrongContent = item.Unqualified
+                                    //WrongContent = item.Unqualified
+                                    WrongContent = item.CheckItemSetContent
                                 };
                                 if (string.IsNullOrEmpty(rectifyNotices.CheckSpecialDetailId))
                                 {
@@ -298,7 +299,8 @@ namespace BLL
                         foreach (var item in getUnitDItem)
                         {
                             Model.PunishNoticeItemItem newPItem = new Model.PunishNoticeItemItem();
-                            newPItem.PunishContent = item.Unqualified;
+                            //newPItem.PunishContent = item.Unqualified;
+                            newPItem.PunishContent = item.CheckItemSetContent;
                             newPItem.SortIndex = item.SortIndex;
                             punishNotice.PunishNoticeItemItem.Add(newPItem);
                             if (string.IsNullOrEmpty(punishNotice.CheckSpecialDetailId))
@@ -335,7 +337,8 @@ namespace BLL
                         foreach (var item in getUnitDItem)
                         {
                             Model.RectifyNoticesItemItem newRItem = new Model.RectifyNoticesItemItem();
-                            pauseNotice.ThirdContent += item.Unqualified;
+                            //pauseNotice.ThirdContent += item.Unqualified;
+                            pauseNotice.ThirdContent += item.CheckItemSetContent;
                             string checkAreaName= UnitWorkService.GetNameById(item.CheckArea);
                             if (!string.IsNullOrEmpty(checkAreaName))
                             {

SGGL/BLL/ProjectData/ProjectService.cs

@@ -138,6 +138,8 @@
                 HJProjectCode = project.HJProjectCode,
                 KZProjectCode = project.KZProjectCode,
                 Progress = project.Progress,
+                ProjType = project.ProjType,
+                ProjPhase = project.ProjPhase,
             };
             db.Base_Project.InsertOnSubmit(newProject);
             db.SubmitChanges();
@@ -186,6 +188,8 @@
                 newProject.HJProjectCode = project.HJProjectCode;
                 newProject.KZProjectCode = project.KZProjectCode;
                 newProject.Progress = project.Progress;
+                newProject.ProjType = project.ProjType;
+                newProject.ProjPhase = project.ProjPhase;
                 db.SubmitChanges();
                 HSEDataCollectService.ProjectHSEDataCollectSubmission(newProject);
             }

SGGL/BLL/SysManage/UnitService.cs

@@ -761,5 +761,21 @@ namespace BLL
                 return q;
             }
         }
+
+        /// <summary>
+        /// 获取问题类型名称
+        /// </summary>
+        /// <param name="UnitId"></param>
+        /// <returns></returns>
+        public static string GetQuestionTypeId(string RegisterTypesId)
+        {
+            string name = string.Empty;
+            var unit = Funs.DB.HSSE_Hazard_HazardRegisterTypes.FirstOrDefault(x => x.RegisterTypesId == RegisterTypesId);
+            if (unit != null)
+            {
+                name = unit.RegisterTypesName;
+            }
+            return name;
+        }
     }
 }

SGGL/FineUIPro.Web/ErrLog.txt

@@ -3193,3 +3193,25 @@ IP地址:::1
 
 出错时间:09/26/2023 18:55:14
 
+
+错误信息开始=====>
+错误类型:JsonReaderException
+错误信息:Error reading JArray from JsonReader. Current JsonReader item is not an array: StartObject. Path '', line 1, position 1.
+错误堆栈:
+   在 Newtonsoft.Json.Linq.JArray.Load(JsonReader reader, JsonLoadSettings settings)
+   在 Newtonsoft.Json.Linq.JArray.Parse(String json, JsonLoadSettings settings)
+   在 Newtonsoft.Json.Linq.JArray.Parse(String json)
+   在 FineUIPro.Web.ProjectData.Installation.btnMenuDown_Click(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\ProjectData\Installation.aspx.cs:行号 257
+   在 FineUIPro.MenuButton.OnClick(EventArgs e)
+   在 (MenuButton , EventArgs )
+   在 FineUIPro.MenuButton.RaisePostBackEvent(String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:10/07/2023 16:42:46
+出错文件:http://localhost:8579/ProjectData/Installation.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:10/07/2023 16:42:46
+

SGGL/FineUIPro.Web/File/Word/HSSE/专项检查.doc

@@ -1,9 +1,61 @@
-
+PK
-                                  专项检查
+‡Nâ@	docProps/PK‡Nâ@NËN\
qdocProps/app.xml<6D>‘Qo‚0…ß—ì?Þ¡Å9S0çÓ²™ˆóÑ4åÍ mÚjô߯ŒEÙëÞî9·=ùÚC–—®õΠ
—"õ£û&K.êÔß›`î{ÆRQÒV
-项目名称：                                         编号：
+Hý+™=><3E>­–
-
+´å`<!Lê7ÖªB†5ÐQºµp›JêŽZ'u<>dUqkÉN‹bŒg.D	e n<C2A0>þ<EFBFBD>¸8Ûÿ†–’õ|泸*œ‘:ÕRÙ{<7B>Ó†¥´A7—li
&‹r<>º4&hHÞPM™uÿÔ›#EÞ¸p7<70>9.IÓZSÕü˜#E
-|检查类别       |                               |检查日期        |                 |
+ii[ðúÓwAvŒ¶<C592>;ܬ¢­
‚îFŸþeöª<C3B6>ëþwÿ×±¸mvŠ²
èN9òÉJ©–3j]ßÙa»ó>~:9FqèÊ£$Šñq½N⧗<ˆgÏy0<79>$e°Š’8ÀIžLñã8_4N"®Ô°“æöÚ?o,ݧު;
PK‡Nâ@+J
}docProps/core.xml<6D>’OOà ‡ï&~‡†{í2ãHÛÅ?ÙÉ%&Îh¼x·%€ëv3~U¿ˆ´ëj<C3AB><¾ý=<ü(ä󽪢X'k] 4!(Ík!õ¦@<40>«E|‰"癬ª5èÍËó³œÊk÷¶6`½“v”›m½7cÇ· ˜K¡C¸®­b>Œvƒ
ã¯l8#ä+ðL0Ïp+ŒÍ`D½RðAiÞlÕ	ÇP<C387>íN“³¬r.è’©¤?˜p¦¾îØ-ø1轓Ø4MÒLº¡ŠŸ—wÝQc©ÛÅ
•¹àÝv”[`Dô¸Ý)yšÜÜ®¨ÌH6‰É,Φ+rIÓ)%ä%Ç'ª_ß
-|参检人员       |                                                                 |
+<EFBFBD>®Ú–WÆÊêóý£¥†<EFBFBD>í<EFBFBD>TÌùe¸¼µq}q¿³¡ êùÿ7œQ25<	ʶ<C38A>…<EFBFBD>lßR™æx<vÓÏS~
PK‡Nâ@Åý’r*
docProps/custom.xml¥‘MKÃ@†ï‚ÿaÙûf?Úm³%IÉGâAAíUB²iÙÝ<C399>ÝT‹øßÝR«xð¢Çážyf&Z¿ªäh;£cH<02>Ôµi:½‹áÓc‰B¬«tSõFË¥…ëäú*ºÍ G×I<BÛî<>VÛz/UekŸ´fT•óå¸Ã¦m»Z¦ž”Ô3B¸ž¬3
-
+
_8xæ­î¯ÈÆÔ';»}<^7‰>áGÐ*×51|+x^œpÄ6"G”Ð‰™X"Â2–—"ݼC0œšºR~õÛ‡;<3B>m¦ÚeS×7[9zôÁ­úáź1a„3DYàoPN‰ðwá‹Ã?mf››|ûc<å|FiZn8™çaŠeΉÈèb^0ž¦Ï”þ&„O×:ÿ2ùPK
-
+‡Nâ@word/PK‡Nâ@ú%ËÕ	Óeword/styles.xmlµ]KrãÈÝ;Âw@`e/$ê7Ò´¢ÙÝ”duŒ¤<C592>Mɳ.E²¦
\D©¯à¥ïáø6ö=œUø"ÁjV¹’ˆÏ{Y•™õ>þòGÞW™<57>ÉØ?><ò=ž2Ébì??Ýüì{YÎ’<C38E>E2ácÿ<63>gþ/Ÿþø‡<C3B8>«Ë,‹xæ
@’]ÆÁØ_æyz9eÁ’Ç,;”)Oàä\ª˜åðS-F1Sߊô <20>qÊr1‘ÈßF'GGç~#Ç~¡’Ë
-序号 |单位工程 |受检单位 |问题描述 |问题类型 |处理结果 |隐患类别 | |
+â <16>’™œçú–K9Ÿ‹€Wê;Ô>¼å<C2BC>W2(bžä†q¤x6È$[Š4«Ñb,qYƒ¼Ø
+ñGõu«}ÈVR…©’
Ï2ðI•ÆÇL$
ÌñÙPSq‡Pq£²ø#
·™ÿZvÙ,®ª]ß]SfÑc‡·K/Þ‰™bªt3@Ëî4›Y.ã+–³oµZ®Òì0H*³[^;>Á©õM¾—_‰TlAp®ŽÏüO™¡®øœQžéŸêQU?«_æÏ<C3A6>LòÌ[]²,â	Bb
X·Ÿ“Løpf©ÿé<ÃY–ÎkŸ¼®Žé;ƒ,o
~¡ðGŸ>ŽŒ)õß–Iic`yÕ†ý§µÓ2Ý\I>öOÎ!W¡¬|þדbc¿>ðœ,EÈ[òä9ã!¤uuá”ÇâV„!ש^{þú¨„T<E2809E>ˆcÿÇêà<C3AA>¾ñpš±FÕõeáõkÀS<C380>2@û<>šÓà„Æ<E2809E>B¬‘Í<E28098>¬Eo$LWúƒ¶>ÒDɲäL‹šw¼Ѧ奡5ÄIˆÓþgý!~êqÞâ¢?ÄÏý!>tBô
+l‘„üuGÀ
܆wçÀÝ!;pw ÜÞwýÀÝ©00A‚ä2 H
K<>– 54,AbhX‚´Ð°I¡a	RBÃ$„†%H‡²!ä}…ÇF’ÿ8šK™'2ç^Î_	àYà¦GED ›_\ÑÔnùø¯<1A><>fo4¢»[<5B>
3mîN€^²žëN“'çÞ\,
+ýú®x/ž¼ð:†C  dP<‡<>ƒá‹Ð$<24>âs®`h„ÏÑÊB–H$ÜKŠxFë)[Ð<>ó$4ºEX95<05>46™ÆŠ|©ûÚ‚"ÛbƒeÃGg.™g±^
+q'2‚G‘Fõ¾QÄ©ÀˆòÈXNÐv5¸<04>Wƒ{6|Ð\‚æ«Á-#ƒ¢‹Ð†§ªíÊzªJ¯à©ê¾L²º¯à©ê¾‚§ªû
+¾»î7‹}F\ŸD´c&‘ÔsëÁT,í»n›1SèVCðÞ#Sl¡Xºôô¤Àðö‘á›÷DÒëj Éº<C389>FÓ&P/")ºлàÕðdºÐP)CC@¥

A·:ôòÁ=ôÍtþvw“d;æ{¦Å,§ )‹Šrbø†IJ‚è_§ï<C2A7>PÐh¥ûéæ¡H·=¤‰äI°.A#y
N kðÒÇu¿ÅAQŽ憉f·o)W0Nñmøô½‘Q$W<´S©r¹’;ÚB²\Çé’e"¾Â®ªÅ2Þ=K‡GŒ`!Q]À*“ȳ7{=/«<>ú?ýÆg¾nnŸîï¼Ï0–“¼ÅTèTã±Æö‰ xT–Ð2$x
+hèˆ†æ$Á(²!ø•¿Í$ƒETƒ<54>³øG5ë€rNE1eqJÑq4ö?<3F>ø¯`l”bxÚü<>)¡§<:ë£ÉíåKÞÓNè^RӚȊÙï< èžÓA/µs)æãßá´ÛÞá4yJüIÄ`	&É‚…÷d5T—€¼ŠúÀUÉHªyÑEé¤f óBÍ@çq’‘V’! ¬#C@^E”‘jJ@0ZS¦Â_”é<lÐÉÜkÐÉ|kÐÉkÐi½J°¾ª3ˬZè«­Jt3ݽx»W«…NïÆv²x7èdñnÐÉâÝ “Å»A'‹wƒNï§WŸÏ¡½Oøoq<6F>Å~‹ƒ,ôÜ<08>SؤÞ:{w(ÄuÄŒbr° G%çz‹—Lvl… zâ…´‡Wâ“…·Ñµx48©åÑÿ…Á 6lÇ¢™Z^?Õ©rÊlŸÃ<C5B8>—›ßvÌ0Þ‰Å2÷¦Ë“Pçf_›_ë?Òø½ÏÎ
+®›™HðSø=E×UƒÍ¦ó³ý)<29>9uþÓ<C3BE>)ÌÙ$<‡-Ç;]PÕ’ÁÇÚñc|Ó•ÀÚû²d¿ÁÇÚo¶‚îѪ~>RÖ.l;B¯`›¸‡O¯[î6<½äá–Á
E<>"Ø’¸Áï!¶ê'Ÿ0Àv´TØ|Q™4ëÉbsGÉb‚µ'‹Í)›ÊÚ·Þ\$¶/×ÞZÛ—hoÑíK´·úö%Ú[†ûí­Ç=‰öæ¾$6Uhä­Rè¾\6mh¸¡›<4DCè<43>³xc
67m‹7–Åæ mñƲؼ³K¼±\ñÆr9‹7–ÈY¼±DÎâ<C38E>%ro,‘³x#‰ÜÄKbS…Fç6ÄËeÓ††«-ÞX"›<4DmñFí?pQ?÷<>=¬=G0ú²Ø´-Þزؼ³K¼±\ñÆr9‹7–ÈY¼±DÎâ<C38E>%ro,‘³x#‰ÜÄK‚o,—MMm‹7–È&
Q[¼‘Dîâ<C3AE>œ—uo,‹ÍAÛâ<C39B>e±yg—xc¹0â<30>åro,‘³xc‰œÅKä,ÞX"gñF¹‰7–#ÞX.›64šÚo,‘M¢¶x#‰ÜŹìÅQ¼±,6m‹7–Åæ<C385>]â<>åˆ7–ËY¼±DÎâ<C38E>%ro,‘³xc‰œÅIä&ÞXŒxc¹lÚÐhj[¼±D6yhˆÚâ<C39A>$roäªBGñƲØ´-ÞX›wv‰7–#ÞX.gñÆ9‹7–ÈY¼±DÎâ<C38E>%ro$‘›xcI0â<30>å²iC£©mñÆÙä¡!j‹·!‚×Ø·ßH¯_Ûn>
ë‘rØÃ9öÓúu:z‰¼Ÿ^¿ˆ¿zá¼¹ð«y%½¾Oï „k^|O ýøj7¦Ù(»~<7E>|}åQ¹0Þš¯1V"”+½XÉhãŠßƒúÀLÂçl¯nƒ<6E>è»Õ»ÏŒý'Ã7-øÊû›Œ|c¡ú@ç™ú3cÿÿþçÿó/}u<>m_jÊñ<C38A>+ýâ|SÖjî ûÞ¨–<C2A8>eß'ú›åEu?‡Ákë«c<9xžjš5õ÷åÁäAšÁgÆ>SÓÏUQM¡È¦Ö·ý,ÁQ<C381>ÞpwïðÓ©yùÛO¶—&­×‹™"ïáÆÝÖåfCínËN¶,«¶å›u«eˆ¸Û1<‹ÊЀ&<Šî™	”\¦`|²ÃL¾—<C2BE>¾²’'âó¼<{|dvã<„|çb÷ýÊ,X5ð]PImcÊŸÚÈuíÕÿeŸþPK‡Nâ@S•‹Å‚´
+word/settings.xmlµV[Oã8~_iÿC•÷Ò¦7JD
¥PÔ3) í›“¸<E2809C>Á—ÈvšiýÇqSm
<01>fµOqÎå;÷cŸûÉhcƒ¥"‚<><ÿ¤í50<35>EBøzä=/&Í¡×PñQÁñÈÛbå}»øû¯ó"PXkS
€à*`ñÈKµÎ‚VKÅ)fH<66>ˆs`®„dHï\·’ïyÖŒË<>&¡Do[<5B>v{àU0bäå’D“‘X
+%VÚ¨bµ"1®>NCþŽ]«9qÎ0ץŖÄ|\¥$S<0E>ý)„˜:<3A>ÍWAlur…ßþJ²
+·2ÙküŽ{F!“"ÆJA<4A>µá2DøÆï
íS}©nYÛ-ê~»<Õž+z¤ÿAµmg$’HÚ2Cx‘©ë\iÁÆH£=^Q'E¦Nb^9qP5¿ÛV­ä5XL×\HQhÏÂïyЛ;!X£2,c(÷ȶ½–¡cá$Ü*<2A>ÙDp­Jb1ŒŃÐa.¥Èyr‡Ðbƒ Rßj$8B	&UŸ=I`ƦÇ	s„›þy•?	^¡œêŠB-2g®×ql‰
+¨à­$É–šÄˆ†Š<>äDýþÀú–•Q´½’ì 2Dǵî
øÖi8h+ï`?“îXô8EÅheþLHA¦g	Ýö”óXçåPUz圛Ì+ðO„|žÙœ#ŠxŒC…â«­Æc‘CÍé•$:-…S‘F|…âwE‘J/Í*™9]HDÊ|XB)}ó3ƒe¦d¥`
›¤”EÉôÙŒp|‡É:ÕS§ŽÂ“›ÚŠ\—²v5…v¹A€1h,K­Ö\$ØV.ɾkÝÎûtŠŒ‚m¦ÞanþmH@­ Ü¸t0Ô[
+Iã:$;|É“{ˆ‚À
+´þs¾rs“šGXÝ‹m†'Aaéÿ?ÆÊšM(ÉææNNyÓñ_<C3B1>µŠÀ–ËôŒâ’ª>B û’2
›FûÒàí½XÞÒ÷é› lÉþÙ=ï–·/ï»åÛ|ñ½»\,Ó‡Åòmù÷_§½ù"¥Ë×9Y}<1F>LNÁò<C381>=¸T“Ò°9ü€=á:`pêŸõOoNm×qÚý³vçt\Íè!ÇïúƒÁÙœîø¬Û¹ì<0F>ÑzÃÓaçêºÌù܃Áðf쮺U8U,0×Û“¼8·'Ó“
fûù±HÔ˜›’À‚H¾_îø†½‡9a9f³iŠ!J'°c£”f­<66>ñª„¥s$×5n%!?¤Âb½ßc™;Ë[X왵VH”Ù^sæü^¯Â#st•G¡Óâp‰°à–xÜHتÓSÞ>åÌÎP½¦1o>‡¦Í0RúR¸ívióúÁhC·Rš'ž£,³Ë=Zû#<23>š]å5
	<<3C>ÊŸhÝ©x<C2A9>’†Wþ ØÒÕÁØ#HU‡šÖu´nMƒ‡<C692>•ëÕ´¾£õkÚÀÑàéV)ì
+I	‡…莆¾”Š'wŽ8òŽH6	å*˜ò˜æ	†<06>9RSjx8š×ÏÍ‹_PK
+‡Nâ@word/theme/PK‡Nâ@ݵò
+»word/theme/theme1.xmlíYÍ<59>7¿Wêÿ0š;ì$äcY‘E›<45>e»°"
ÄÑÉ83f=ãÈvvÉ­‚c¥JUiÕC‘zë¡j‹R/ô¯Ù–ª¥ÿBŸíÉÄNœ® ¨Bˆœf<¿÷ü>~ïù#—.ßÏhpŒ¹ ,o…•óQà|Äb’'­ðÖ`÷Üf‰òQ–ãV8Ã"¼¼ýñG—ЖLq†<03>ÏÅj…©”“­<E2809C>
1‚a$γ	ÎáÛ˜ñIxåÉFÌÑ	èÍèF5Š"yä(µwûáö\g<>‚â\
+50¢¼¯4â%`|TQŸÅLt(Žm… ;f'|_†
EB‡Vé_¸±}imBT®‘µävõ¯<C3B5>+⣪ž“'ÃrÒZ­^kì”ú5€ÊU\¯Ùkô¥>
@£¸ilqtn6k<36>v<EFBFBD>µ@æÑ£»·Y­î:xKÿ…›w«í<C2AB>¨êà5È语à›õv·æâ5Èàë+øQ'j×ýdð<64>|¯^ëÔ{^ƒRJò£tU½z<C2BD>.!cF÷¼ðf¯²»Ó-à°¡¤–šbÌré%Z†î1¾_Š"Iò@Î&xŒF@Û¢dÈI°O’Tª9ÐFÖw34+Cjº@Œ8™ÈVxu‚ Z_=ÿñÕó§Áéƒg§~9}øðôÁÏF‘#µ‡òÄ–zùý?þ4øëéw/}åÇÿûOŸýöë—~ TÐÂœ_?ùãÙ“ß|þç<0F><ðŽ†6|@2,‚ëø$¸É2pLGŵùëIRDl‰<6C><(Gj<16>þžLôõ¢Èƒkc7‚·9tðÊôžcp?åSI<¯¥™<`Œ¶÷FáššË
+ó`š'þÉùÔÆÝDèØ7wåN~{Ó	ôMâSÙI±cæ!E¹D	αÔ7v„±Ç»»„8q= #ÎËà.	ÚˆxC2 C‡M¡=’A^f>!ßNlnmF}^wñ±‹„ª@ÔcüS'ŒWÐT¢Ì§r€2j|ÉÔgdÆG6®'$d:Á”½ᓹÁÁ_+é× <C397>øÓ~@g™‹ä’ùtî#Æld—uR”M|Ø>ÉSû‰8Š¢à<C2A2>Iü€¹¢Þ!(_›îÛ;é>»Ü‚Þi›´ ˆú2åž\^ÁÌáoFÇëV}ÝéØÉÏlßf†·×¸¡U¾øö±Çîwµeïpâ­™½¥F½·Üž;ŒÇäÝïÎ]4Í1Äêõ¡9hÎá{ßœ×ÕóÛoÉ‹.
ZmÍ^[ï¼3ÿÆ{L(íËÅûBï½,<ñ.*!}ÊÄå)l’£*cÐîàŽJ™DšL˜€³a¸V•ú@§Ù<C2A7>ñØœ-+ÍzÍ'ÐçQ˜PO—ècê\eÅ7×ê5&*°´4ö
ìZaµiäáh€(Ž•‰…„í‡ýüš>¥S\út®Z‡sø;â–¢ÅRÂin§ŸæÁ	\P¨…ÁMZáNcð˜M NBíSMàc$¹Éë›ðeÂ…ì"‘š¬k*™Õ!#ó€’¬nš™ÄÐ\Så½2î¿<14>C°šæלÃeÍþuSñÔÍåxéò<10>Çx$mfZ#Šæµh5l
+´é§ñI0¤S~
U+Q¥¡8
gÿztR/pWU¯Õ¿ rÀ™¼CdÚOÑîÎèXˆNRd¨S¬©ìÒ$<24>ËZpÕëŠöuÅ3ŽÇ
׆p?¸£QÂåa/ŠÇCÕfµWs«ÊÉeŬž+ZgQÅC8‚-ûn*î<>-._ä¢Þ¬ÔËTT.FæåuRaßÛ©€s*Tv& e	¸Ž|iÎYypóRk˜¨¥Ð¦¡³î•µfØ°v}<[Hy—^Ò(º¨Òl:¢@ò€Åf¸¢×­¢æʹµcÎóβ”ÚŠŽY¹ÎÓ3ØnY51¬þ¶U†“@OQŒT7>À¿ð!RÝÊ냻Æ­Zé|'`Gy)`‹ÉÓ”Åó@Z¦-F]ÓæÜðº¦<C2BA>µýXŠDc®v)nÿ¾-ÊT•;—²w­ß¹€Ü2kah<ßþi¶èÿìû6¼]¦÷­S*…é´ýPK‡Nâ@ãZ¾»ÖIword/document.xmlí\ÝoÇ<0F>ÿ<EFBFBD>¸w‰¤D+a2<61>é<EFBFBD>pTÕtêö©X—ä™w·‡»¥ÎÒS @€Àpƒ uÐ
ÒÂh€Fò”ïÿÆ´â§ü™™Ý½£ŽMR6lÇ«‘·¼<C2B7>ýš™ýÍìÌ^|ûNà—yœx"l8ÕõŠSâ¡+º^Øo8ïݼº¶í”ÉÂ.óEÈÎOœ·›o¾q1­w…;
+x(K@"Lêiä6œ<36>”Q½\NÜ
X²xn,Ñ“ë®Ê¢×ó\^NEÜ-oTªúÅÂåIíµXxÈG“¦©‰ˆ‡ÐVOÄ
“ɺˆûå€ÅÃQ´Ô#&½Žç{òhW¶ÑpFqX×ZË:„UêªCúÃÔˆ§F1£]Uó²ž
j±sú ÂdàEù0V¥C˜.ÎÄaà›÷Ò¨Z›j/ò"kp9f),ENpŠÜŒÉèªJ<C2AA>¯æ
×7_Õ"ÅEž¦`è̳Ž­6Љ©ªVæMªæìHÞä…©¾Ï<C2BE>Û
âï‰&#©óȵXŒ¢¬;‘w>j{á0£…’½DÏ*[SCK–"0%ûí
‹xÖ<78>(i<>)‚ËL²Œnš¦ëi”¬»¡V$ÒWÝ,ÃOy%§¸õ½~(bÖñaliµVJ«J( NtWGt<47>ð3¢1~9<>öùYJë‡Ìo8§lŠ¯{!O
+åëóK1gÃK4/üšz]‘¶D(cá~za"†#"Žv+f=ÐÃ=_¤£Ð•T"E„MSA<53>
+IÑŽ˜Ë/_¡Wóç}zîx]¯X¥{¦õ†×Ƚ°Ko%!‹nŠk±§<1F> ˆ?Ôó¡Ù†³¹û<>z¸1‰ÄVÔ´xaá=‰3¥¿¶,N çÛ™üžýH-ßv¡ͳ{<08>U	ó¿ë{ý<>6ýBÞh¬V*¾
+‹ëÁ×1?üèÑÏŸ`'»a’¨‰P=6Íml«¦’ãV¶¤ª¬œÖ©
øŒtCÈÅF^ãâ,‘»‰Ç°ÕçÓ<C3A7>´.›<>¾ûäÉß?þßßþà"ôK6ñ?°+ö‘x—þYÖ|^®œËËñ°.•ZIõåµáD1Ox|È<>&¬íÉ¿Žÿ~÷äÿ_ÿúÓ?K§–µ”"ÂiK£ZòºZžB<00>ƒXÜæ®Ü‡ÅÒæý+$›êmâ~ÒoOáãEú[Zðï䧌ï}#Z`@U” 5 Ö€»ÃvÄ]<5D>ù-Ñ=sTU5Üg6ªB/‰î+V˜€S5<53>LÊŽ<C38A>R	zñ;~[ùÙ±¡u]Ç5ƒG%z5ÁMP~€Á·sõ9U
+;„Ü
Ý<>”Š¼J:OÄǦ7%,ƒ¶£?#­ê[æñ/ Î«yÓR>‹à]RÂ!‡ç¬_· 8m8Ûµ
+õEEÀnÝ;,{
öõÊ¿_‚}
Œ
+š‘5‚(ߧþ¹ÂÇ!<21>fBÉqéaGµ„è­'
+©ƒËÖí	bÕÚ´y­Zöw¯Ëß9_õ?­VxÖ~rú;þuv$F8‘jqÒ{žÌÖ²Å}ÿ]¦˜žÖ
+V~Ö²êÕ€_«°
+
¹Œ-²?£¾™Ó3¨žg<C5BE>Q<EFBFBD>™!DAnêÃg‹ ’ÙÙÞRÃ8U¼±
(<28>ô^¡xóÂŒâêΫM;RÍŠð•;Zš'gÕ2õr¢¬dâ2uÆ(À‡/×jž1»üG4lDºV#ùhL-¯#˜DÖD4u\â:WK€«U2±ü´ì…­C_«ÏCBÒ¦fÉ4¡‰Zãç•6~
+vÈ~6ÒŒA„“²JÊ]!®¿^—˜;TjѼœÃGx•ôè"Høl;ˆv~ÓúSmœ²ÇáÁ0Œ04•	tòÍ<C3B2>ã¿š
ºPp´ÀÌÚ Õ’±b£}¯‘Ï`U±Ù@È£¤¦=ŠÈTÙ“<hs<68>¤¦¥‡À6Ê¢Rìóù°‰åOëÓÖi÷ÒLµþ²èãÇ÷<þ÷ç+ècÝ–ß-¿/ÆïF·N˜Í\“2†Ã‚3F›ùæš
ƒ2ñ¬¡wÚéò²y/¬¡7é{³ˆõµG¬°m>ÅЂ7ÌñTv8FvÜƸ¥<19>’÷•‡kïµQáæt<C3A6>k­}­WÉLC¤«¼/ž,ßcؚ㻟>úùîøÛ'_~´<02>±†%ÚÛèR~í£
î³€|(Ãò–ˆ‡»S°?çH<C3A7>\ÛÖª´‘KEJ˜óyì!C‡@—ö}ΘäQúÌvÚË· ÚÊÒg†ñZ{÷w°ïÜ»>Mµû¬°ïXÚî;:ª Ú3F³ör8ª}çO"\õ XnÞÖcÎI­ýôØkFÏ@¿KÇÏlzõ˜<C3B5>±›ã{^šEŸÙ`Ñg,ªôd—÷ØȧÀ)kECàÕD¬†hËÚýhE?¹ÿðÉ?ÃãÙÿX+Ú†tŸ#¤{U4?æxö<78>#ž`"Î<(Cqc‹YÑ5È'šq6‹±eàó(š<ÖAûÚ;hg ðSœ† Çž=Í
+øµ ù‚æ*EÖÛ C»?çíøÅ÷€5æbs|ï}p¦=úá‡ñÇŸ­àLÛªAÀ8À‡Bt`q‡§(6ÖV<C396>õ¼AƒsSº2ÊR
+WÅŸ”g£¼i<07>­µ@þøÔTp«ñ¿å¡µoÙ<6F><14>¸Åò€,,°° Oȶ‰× 8/8ñÚúÒÔ9çü†<05>6'ìEô¥ýòŃñX0£<30>’u
+Š½5<EFBFBD>[–»aU0CéiÓ`jgºVa–ŸÝ*#Z]sAigMFôîä.<É:g
§<>8A¾0ä¿«˜³¨ßÆ`Ì
+­îàý?Yß·¶7õ}Q’\¡òà ¼V#Ÿž¾¤r®éQ¥°æ?+-k~pIÍ<49>}<7D>,ëžpoEÃÙÙ¡Ô<C2A1>þHÒ£æW@6x½„Ž­­m¨ÓÖQÄÕÈàú$L6ÅQz5Þ¸
×<06>ÎÀ?<éB÷1aJ\¸Vƒ 7&æ*ma“«î2<C3AE>/æB¦æoPK‡Nâ@ÝäÓ¼Ì	word/fontTable.xml½UAnÛ0¼èÞ‘Š)F” q# —Ú=Ó2eI<>”£ú
=ýG?Pä7í¡¿è’´ã8–HBÁ†´Ú],G3ÃóËo¢
+î˜6\É‘cŒ&5árš¡Ï·ùQŠÓP9¡•’,CfÐåÅÛ7çí°T²1
ÔK3E†fMSÃÐ3&¨9V5“ð²TZÐõ4T<54>×G…5mø˜W¼Y„ƧhÙFïÓE•%/Ø;UÌ“<>«5« £’fÆk³êÖîÓ­UzRkU0c`Ï¢òýåò¡
‰·	^heTÙÃfB?Qh[A9ÁîNT(ÅðýT*MÇ`×’],<2C>Ú¡¤‚·\0|`mðQ	*]BM¥2Œ@έ2„#¸Nñ	à~ÜÅ(´<>ŠÕ†5‰Ø‡K*xµXEµëëòkÞ³UüŽjnó5†OáÅÜŒq†à“àä*M<><4D><EFBFBD>¥±k‰`(¿€®êä!âr
+×Ç¥<EFBFBD><·9<10>>Ë*7gè)´…Èß_ßÿÜÿì
‚ ««ˆô´:o”<6F>oà0a%<25>WÍ6nX@{
C”¦¹<C2A6>nÁÞ	CEä0¾­M'7ÜÆ_'8z6$Öû~ü!ý¾×„XaÓIˆÇ4ÚŸWÀÓª…_b'+’¨O¤Órcü‹ýqD7žÏ €a‘$\oâl!,ð†.rX6h§éÓÅ¿ß?vëâ°x
]¸¯];Y{NÒQžŒò«§0<C2A7>ÐÅHÍ5gÚZf'ð‡3Çk–ñAœj´|RÄ+ßXkãHñi!ƪ[8+@pĈà)ñûzzjtZDß©±Û--…½#¼²GŒhÅÇš÷0"wǦóàF¯KtŸ‡»È{Û%¢89Ð%ì)¼é6`׆K,íÂ\üPK
+‡Nâ@_rels/PK‡Nâ@
""ýá_rels/.rels­’ÝJ1…ïß!Ì}7Û*"ÒloDè<44>H}€!™Ý
Ýü<C39D>Lµ}{ƒ¸°®½ðr2gÎ|sÈzstƒx¡”mð
+–U
‚¼ÆúNÁóîaq"3zƒCð¤àD6ÍåÅú‰ä2”{³(.>+è™ã<E284A2>”Y÷ä0W!’/<2F>6$‡\ÊÔɈz<CB86>ÉU]ßÈôÓš‘§Øik®AìN±lþÛ;´­ÕtôÁ‘ç‰r¬(Θ:b¯!i>«‚ršfu>Íï—JGŒ¥‰1•œÛ’ì7Pay,Ïù]1´<h|üT<tdò†Ì<Æ8GtõŸDú<44>9¸yžÍ’}Ìæ
PK
+‡Nâ@word/_rels/PK‡Nâ@ÈPç¨word/_rels/document.xml.rels­’ÏjÃ0ÆƒÑ}qÒ<71>1F<31>^Ơב=€ç(˜cKËÛOÚµPºK.†OÂß÷CÒv÷3yõ<79>™ÆTE	
+ƒ‹ízïÍëÝ(bZëc@3ìêÛ›ízËò‰†1‘—@æô¬5¹
'KEL¤ÓÅ<Y™{<7B>¬û´=êMY>ê|ê
õ™§Ú·ò¾}ÕÌI’ÿ÷Ž]7:|‰îkÂÀ"t7öã˜ÚÜ#8–
+!}â~M–áœ,R/ou<6F>a³&!³¬˜þæp¨\C¨VEàÙË1A‹>Äë³ûª
PK‡Nâ@|ÉI~b
[Content_Types].xmlµ”ËnÂ0E÷•ú‘·Ub袪*‹>–-ú
®3
«~É3PøûNa
JQ7‘Û÷ßXŒ–ÎfHh‚/E¿è‰¼•ñÓR¼O^ò{‘!)_)<”b(FÃë«Ád
3^í±3¢ø %ê8…Eˆày¤É)â×4•QéO5yÛëÝI<<3C>§œš1<A­æ–²ç%^›$°(²ÇõĆU
+£5Z›Ê…¯v(ù†PðÊvÎLÄÖò ¡ù°Y÷ÆÕ$SA6V‰^•c
Y=N!¢d¡âxÊ
ÍP×FgÌWP@³å
+ª<r$$2°u>ÊÖ!Áùð®£fõÙÄ9Rpç3w6¬Û˜_¿Bªš¾×]]Úu“Æ5k@äãíl±MvÊø½õ¨ù0NÔ‡ýCï;ì‰l£OJ ±<^üöºäÓ
+´²ðmîI<ñ²}ö/n¡<6E>é<EFBFBD>²½Ó†ßPK
‡Nâ@|ÉI~b

 +([Content_Types].xmlPK

+‡Nâ@—%_rels/PK
‡Nâ@
""ýá
 »%_rels/.relsPK

+‡Nâ@	docProps/PK
‡Nâ@NËN\
q
 'docProps/app.xmlPK
‡Nâ@+J
}
 ±
docProps/core.xmlPK
‡Nâ@Åý’r*

 *docProps/custom.xmlPK

+‡Nâ@…word/PK

+‡Nâ@á&word/_rels/PK
‡Nâ@ÈPç¨
 
+'word/_rels/document.xml.relsPK
‡Nâ@ãZ¾»ÖI
 Áword/document.xmlPK
‡Nâ@ÝäÓ¼Ì	
 «"word/fontTable.xmlPK
‡Nâ@S•‹Å‚´
+
 ªword/settings.xmlPK
‡Nâ@ú%ËÕ	Óe
 ¨word/styles.xmlPK

+‡Nâ@[word/theme/PK
‡Nâ@ݵò
+»
 „word/theme/theme1.xmlPKо)

SGGL/FineUIPro.Web/HSSE/Check/CheckSpecial.aspx.cs

@@ -1,4 +1,5 @@
 using Aspose.Words;
+using Aspose.Words.Tables;
 using BLL;
 using System;
 using System.Collections.Generic;
@@ -45,7 +46,7 @@ namespace FineUIPro.Web.HSSE.Check
                 Technique_CheckItemSetService.InitCheckItemSetDropDownList(this.drpSupCheckItemSet, "2", "0", true);
                 ////权限按钮方法
                 this.GetButtonPower();
-                btnNew.OnClientClick = Window1.GetShowReference("CheckSpecialEdit.aspx") + "return false;";
+                //btnNew.OnClientClick = Window1.GetShowReference("CheckSpecialEdit.aspx") + "return false;";
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 BindGrid();
@@ -203,7 +204,9 @@ namespace FineUIPro.Web.HSSE.Check
                 }
                 else
                 {
-                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CheckSpecialEdit.aspx?CheckSpecialId={0}", CheckSpecialId, "编辑 - ")));
+                    //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CheckSpecialEdit.aspx?CheckSpecialId={0}", CheckSpecialId, "编辑 - ")));
+                    //pc端只有台账
+                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CheckSpecialView.aspx?CheckSpecialId={0}", CheckSpecialId, "查看 - ")));
                 }
             }
         }
@@ -254,7 +257,7 @@ namespace FineUIPro.Web.HSSE.Check
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
                 {
-                    this.btnNew.Hidden = false;
+                    //this.btnNew.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnModify))
                 {
@@ -357,7 +360,7 @@ namespace FineUIPro.Web.HSSE.Check
             initTemplatePath = "File\\Word\\HSSE\\专项检查.doc";
             uploadfilepath = rootPath + initTemplatePath;
             newUrl = uploadfilepath.Replace(".doc", string.Format("{0:yyyy-MM}", DateTime.Now) + ".doc");
-            filePath = initTemplatePath.Replace(".doc", string.Format("{0:yyyy-MM}", DateTime.Now) + ".pdf");
+            //filePath = initTemplatePath.Replace(".doc", string.Format("{0:yyyy-MM}", DateTime.Now) + ".pdf");
             if (File.Exists(newUrl)) {
                 File.Delete(newUrl);
             }
@@ -427,6 +430,65 @@ namespace FineUIPro.Web.HSSE.Check
                 }
 
             }
+            Bookmark bookmarkWorkAreaName = doc.Range.Bookmarks["WorkAreaName"];
+            if (bookmarkWorkAreaName != null)
+            {
+                if (checkSpecial != null)
+                {
+                    if (!string.IsNullOrEmpty(checkSpecial.WorkAreaId))
+                    {
+                        bookmarkWorkAreaName.Text = UnitWorkService.GetUnitWorkName(checkSpecial.WorkAreaId);
+                    }
+
+                }
+
+            }
+
+            Bookmark bookmarkResponsibleName = doc.Range.Bookmarks["ResponsibleName"];
+            if (bookmarkResponsibleName != null)
+            {
+                if (checkSpecial != null)
+                {
+                    if (!string.IsNullOrEmpty(checkSpecial.ResponsibleUnit))
+                    {
+                        bookmarkResponsibleName.Text = UnitService.GetUnitNameByUnitId(checkSpecial.ResponsibleUnit);
+                    }
+
+                }
+
+            }
+
+            Bookmark bookmarkQuestionName = doc.Range.Bookmarks["QuestionName"];
+            if (bookmarkQuestionName != null)
+            {
+                if (checkSpecial != null)
+                {
+                    if (!string.IsNullOrEmpty(checkSpecial.QuestionType))
+                    {
+                        bookmarkQuestionName.Text = UnitService.GetQuestionTypeId(checkSpecial.QuestionType);
+                    }
+
+                }
+
+            }
+
+            Bookmark bookmarkPartInPersonNames = doc.Range.Bookmarks["PartInPersonNames"];
+            if (bookmarkPartInPersonNames != null)
+            {
+                if (checkSpecial != null)
+                {
+                    if (!string.IsNullOrEmpty(checkSpecial.PartInPersonNames))
+                    {
+                        bookmarkPartInPersonNames.Text = checkSpecial.PartInPersonNames;
+                    }
+
+                }
+
+            }
+            //WorkAreaName
+            //    ResponsibleName
+            //    QuestionName
+            //    PartInPersonNames
             //专项检查列表
             Aspose.Words.DocumentBuilder builder = new Aspose.Words.DocumentBuilder(doc);
             builder.MoveToBookmark("tab");
@@ -443,6 +505,57 @@ namespace FineUIPro.Web.HSSE.Check
                                        orderby x.SortIndex
                                        select x).ToList();
             int num = 1;
+            #region 插入表头
+            builder.InsertCell();
+            builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
+            builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
+            builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
+            builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
+            builder.CellFormat.Width = 40;
+            builder.Write("序号");
+
+            builder.InsertCell();
+            builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
+            builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
+            builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
+            builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
+            builder.CellFormat.Width = 100;
+            builder.Write("问题描述");
+
+            builder.InsertCell();
+            builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
+            builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
+            builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
+            builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
+            builder.CellFormat.Width = 250;
+            builder.CellFormat.WrapText = true;
+            builder.Write("检查内容");
+
+            //builder.InsertCell();
+            //builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
+            //builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
+            //builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
+            //builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
+            //builder.CellFormat.Width = 60;
+            //builder.Write("处理结果");
+
+            builder.InsertCell();
+            builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
+            builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
+            builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
+            builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
+            builder.CellFormat.Width = 60;
+            builder.Write("整改期限");
+
+            builder.InsertCell();
+            builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
+            builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
+            builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
+            builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
+            builder.CellFormat.Width = 60;
+            builder.Write("处理措施");
+            builder.EndRow();
+            #endregion
             foreach (Model.View_CheckSpecialDetail detail in checkSpecialDetails)
             {
                 //序号
@@ -451,80 +564,89 @@ namespace FineUIPro.Web.HSSE.Check
                 builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
                 builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
                 builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
-                builder.CellFormat.Width = 20;
+                builder.CellFormat.Width = 40;
                 builder.Write(num.ToString());
-                //单位工程
+                ////单位工程
-                builder.InsertCell();
+                //builder.InsertCell();
-                builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
+                //builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
-                builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
+                //builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
-                builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
+                //builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
-                builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
+                //builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
-                builder.CellFormat.Width = 55;
+                //builder.CellFormat.Width = 60;
-                builder.Write(string.IsNullOrEmpty(detail.CheckAreaName) ? "" : detail.CheckAreaName);
+                //builder.Write(string.IsNullOrEmpty(detail.CheckAreaName) ? "" : detail.CheckAreaName);
-                //单位
+                ////单位
-                builder.InsertCell();
+                //builder.InsertCell();
-                builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
+                //builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
-                builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
+                //builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
-                builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
+                //builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
-                builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
+                //builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
-                builder.CellFormat.Width = 120;
+                //builder.CellFormat.Width = 120;
-                builder.Write(string.IsNullOrEmpty(detail.UnitName) ? "" : detail.UnitName);
+                //builder.Write(string.IsNullOrEmpty(detail.UnitName) ? "" : detail.UnitName);
                 //问题描述
                 builder.InsertCell();
                 builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
                 builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
                 builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
                 builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
-                builder.CellFormat.Width = 40;
-                builder.Write(string.IsNullOrEmpty(detail.Unqualified) ? "" : detail.Unqualified);
-                //问题类型
-                builder.InsertCell();
-                builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
-                builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
-                builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
-                builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
                 builder.CellFormat.Width = 100;
-                builder.Write(string.IsNullOrEmpty(detail.CheckItemName)?"": detail.CheckItemName);
+                builder.Write(string.IsNullOrEmpty(detail.Unqualified) ? "" : detail.Unqualified);
+                //问题内容
+                builder.InsertCell();
+                builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
+                builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
+                builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
+                builder.ParagraphFormat.Alignment = ParagraphAlignment.Left;//水平居中对齐
+                builder.CellFormat.Width = 250;
+                builder.CellFormat.WrapText = true;
+                builder.Write(string.IsNullOrEmpty(detail.CheckItemSetContent)?"": detail.CheckItemSetContent);
 
-                //处理结果
+                ////处理结果
+                //builder.InsertCell();
+                //builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
+                //builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
+                //builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
+                //builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
+                //builder.CellFormat.Width = 60;
+                //builder.Write(string.IsNullOrEmpty(detail.CompleteStatusName) ? "" : detail.CompleteStatusName);
+                //整改期限
                 builder.InsertCell();
                 builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
                 builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
                 builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
                 builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
-                builder.CellFormat.Width = 50;
+                builder.CellFormat.Width = 60;
-                builder.Write(string.IsNullOrEmpty(detail.CompleteStatusName) ? "" : detail.CompleteStatusName);
+                builder.Write(string.Format("{0:yyyy-MM-dd}", detail.Rectification_Date)); 
                 //隐患类别
                 builder.InsertCell();
                 builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
                 builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
                 builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
                 builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
-                builder.CellFormat.Width = 50;
+                builder.CellFormat.Width = 60;
-                builder.Write(string.IsNullOrEmpty(detail.HiddenHazardTypeName) ? "" : detail.HiddenHazardTypeName);
+                builder.Write(string.IsNullOrEmpty(detail.HandleStepLink) ? "" : detail.HandleStepLink);
                 builder.EndRow();
                 num++;
             }
             builder.EndTable();
             doc.Save(newUrl);
             //生成PDF文件
-            string pdfUrl = newUrl.Replace(".doc", ".pdf");
+            //string pdfUrl = newUrl.Replace(".doc", ".pdf");
             Document doc1 = new Aspose.Words.Document(newUrl);
             //验证参数
-            if (doc1 == null) { throw new Exception("Word文件无效"); }
+            //if (doc1 == null) { throw new Exception("Word文件无效"); }
-            doc1.Save(pdfUrl, Aspose.Words.SaveFormat.Pdf);//还可以改成其它格式
+            //doc1.Save(pdfUrl, Aspose.Words.SaveFormat.Pdf);//还可以改成其它格式
-            string fileName = Path.GetFileName(filePath);
+            string fileName = Path.GetFileName(newUrl);
-            FileInfo info = new FileInfo(pdfUrl);
+            FileInfo info = new FileInfo(newUrl);
             long fileSize = info.Length;
             Response.Clear();
             Response.ContentType = "application/x-zip-compressed";
             Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
             Response.AddHeader("Content-Length", fileSize.ToString());
-            Response.TransmitFile(pdfUrl, 0, fileSize);
+            Response.TransmitFile(newUrl, 0, fileSize);
             Response.Flush();
             Response.Close();
             File.Delete(newUrl);
-            File.Delete(pdfUrl);
+            //File.Delete(pdfUrl);
         }
         #endregion
     }

SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx

@@ -33,6 +33,18 @@
                     </f:TextBox>
                 </Items>
             </f:FormRow>
+
+            <f:FormRow>
+                <Items>
+                     <f:TextBox ID="txtResponsibleUnit" runat="server" Label="受检单位" Readonly="true">
+                    </f:TextBox>
+                    <f:TextBox ID="txtWorkAreaId" runat="server" Label="单位工程" Readonly="true" Width="200px">
+                    </f:TextBox>
+                      <f:TextBox ID="txtQuestionType" runat="server" Label="问题类型" Readonly="true">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
+
             <f:FormRow>
                 <Items>
                      <f:TextBox ID="txtPartInPersons" runat="server" Label="参检人员" Readonly="true" MaxLength="200">
@@ -50,28 +62,28 @@
                         <Columns>      
                             <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
                                   TextAlign="Center" />
-                            <f:RenderField Width="130px" ColumnID="CheckAreaName" DataField="CheckAreaName" SortField="CheckAreaName"
+                         <%--   <f:RenderField Width="130px" ColumnID="CheckAreaName" DataField="CheckAreaName" SortField="CheckAreaName"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="单位工程">
-                            </f:RenderField>
+                            </f:RenderField>--%>
-                            <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
+                          <%--  <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="受检单位">
-                            </f:RenderField>
+                            </f:RenderField>--%>
-                                  <f:RenderField Width="200px" ColumnID="Unqualified" DataField="Unqualified" SortField="Unqualified"
+                        <f:RenderField Width="200px" ColumnID="Unqualified" DataField="Unqualified" SortField="Unqualified"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="问题描述" >                              
                             </f:RenderField>
-                            <f:RenderField Width="160px" ColumnID="CheckItemName" DataField="CheckItemName" SortField="CheckItemName"
+                          <%--  <f:RenderField Width="160px" ColumnID="CheckItemName" DataField="CheckItemName" SortField="CheckItemName"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="问题类型">                                
-                            </f:RenderField>
+                            </f:RenderField>--%>
-                            <f:RenderField Width="250px" ColumnID="CheckItemSetContent" DataField="CheckItemSetContent" SortField="CheckItemSetContent"
+                            <f:RenderField Width="650px" ColumnID="CheckItemSetContent" DataField="CheckItemSetContent" SortField="CheckItemSetContent"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="检查内容">                                
                             </f:RenderField>
                             <f:RenderField Width="160px" ColumnID="Rectification_Date" DataField="Rectification_Date" SortField="Rectification_Date"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="整改期限">                                
                             </f:RenderField>
 
-                            <f:RenderField Width="80px" ColumnID="CompleteStatusName" DataField="CompleteStatusName" SortField="CompleteStatusName"
+                          <f:RenderField Width="80px" ColumnID="CompleteStatusName" DataField="CompleteStatusName" SortField="CompleteStatusName"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="处理结果">
-                            </f:RenderField>   
+                            </f:RenderField> 
                             <f:LinkButtonField Width="150px" ColumnID="HandleStepLink" DataTextField="HandleStepLink" DataToolTipField="HandleStepLink" HeaderText="处理措施"
                                  CommandName="click" EnableAjax="false"  />                            
                             <f:RenderField Width="80px" ColumnID="HiddenHazardTypeName" DataField="HiddenHazardTypeName" SortField="HiddenHazardTypeName"

SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx.cs

@@ -66,6 +66,10 @@ namespace FineUIPro.Web.HSSE.Check
                                            where x.CheckSpecialId == this.CheckSpecialId
                                            orderby x.UnitName, x.SortIndex
                                            select x).ToList();
+                    //新增加的三项
+                    this.txtResponsibleUnit.Text = UnitService.GetUnitNameByUnitId(checkSpecial.ResponsibleUnit);
+                    this.txtWorkAreaId.Text = UnitWorkService.GetUnitWorkName(checkSpecial.WorkAreaId);
+                    this.txtQuestionType.Text = UnitService.GetQuestionTypeId(checkSpecial.QuestionType);
                 }
                 Grid1.DataSource = checkSpecialDetails;
                 Grid1.DataBind();

SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Check {
+namespace FineUIPro.Web.HSSE.Check
-    
+{
-    
+
-    public partial class CheckSpecialView {
+
-        
+    public partial class CheckSpecialView
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// txtCheckSpecialCode 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCheckSpecialCode;
-        
+
         /// <summary>
         /// rbType 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rbType;
-        
+
         /// <summary>
         /// txtSupCheckItemSet 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtSupCheckItemSet;
-        
+
         /// <summary>
         /// txtCheckDate 控件。
         /// </summary>
@@ -74,7 +76,34 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCheckDate;
-        
+
+        /// <summary>
+        /// txtResponsibleUnit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtResponsibleUnit;
+
+        /// <summary>
+        /// txtWorkAreaId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWorkAreaId;
+
+        /// <summary>
+        /// txtQuestionType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtQuestionType;
+
         /// <summary>
         /// txtPartInPersons 控件。
         /// </summary>
@@ -83,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtPartInPersons;
-        
+
         /// <summary>
         /// txtPartInPersonNames 控件。
         /// </summary>
@@ -92,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtPartInPersonNames;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -101,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -110,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// lbTemp 控件。
         /// </summary>
@@ -119,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label lbTemp;
-        
+
         /// <summary>
         /// btnAttachUrl 控件。
         /// </summary>
@@ -128,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAttachUrl;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -137,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -146,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-        
+
         /// <summary>
         /// hdId 控件。
         /// </summary>
@@ -155,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdId;
-        
+
         /// <summary>
         /// hdAttachUrl 控件。
         /// </summary>
@@ -164,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdAttachUrl;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -173,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/InformationAnalysis/CheckAnalysis.aspx.cs

@@ -59,37 +59,66 @@ namespace FineUIPro.Web.HSSE.InformationAnalysis
             dtCheck.Columns.Add("检查类型", typeof(string));
             dtCheck.Columns.Add("数量", typeof(string));
 
-            List<Model.SpResourceCollection> newCheckAnalyseView = new List<Model.SpResourceCollection>();
+            //List<Model.SpResourceCollection> newCheckAnalyseView = new List<Model.SpResourceCollection>();
-            var checkAnalyseView = from x in Funs.DB.View_CheckAnalysis
+            //var checkAnalyseView = from x in Funs.DB.View_CheckAnalysis
-                                   where x.ProjectId == this.ProjectId
+            //                       where x.ProjectId == this.ProjectId
-                                   select x;
+            //                       select x;
-            if (!string.IsNullOrEmpty(this.txtStarTime.Text))
+            //if (!string.IsNullOrEmpty(this.txtStarTime.Text))
-            {
+            //{
-                checkAnalyseView = checkAnalyseView.Where(x => x.CheckTime >= Funs.GetNewDateTime(this.txtStarTime.Text));
+            //    checkAnalyseView = checkAnalyseView.Where(x => x.CheckTime >= Funs.GetNewDateTime(this.txtStarTime.Text));
-            }
+            //}
-            if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+            //if (!string.IsNullOrEmpty(this.txtEndTime.Text))
-            {
+            //{
-                checkAnalyseView = checkAnalyseView.Where(x => x.CheckTime <= Funs.GetNewDateTime(this.txtEndTime.Text));
+            //    checkAnalyseView = checkAnalyseView.Where(x => x.CheckTime <= Funs.GetNewDateTime(this.txtEndTime.Text));
-            }
+            //}
-            if (checkAnalyseView.Count() > 0)
+            //if (checkAnalyseView.Count() > 0)
-            {
+            //{
-                foreach (var item in checkAnalyseView)
+            //    foreach (var item in checkAnalyseView)
-                {
+            //    {
-                    Model.SpResourceCollection view = new Model.SpResourceCollection
+            //        Model.SpResourceCollection view = new Model.SpResourceCollection
-                    {
+            //        {
-                        UnitName = BLL.Check_ProjectCheckItemSetService.ConvertCheckItemType(item.CheckItem),
+            //            UnitName = BLL.Check_ProjectCheckItemSetService.ConvertCheckItemType(item.CheckItem),
-                        TotalCount = 1
+            //            TotalCount = 1
-                    };
+            //        };
-                    newCheckAnalyseView.Add(view);
+            //        newCheckAnalyseView.Add(view);
-                }
+            //    }
-            }
+            //}
 
-            var checkType = newCheckAnalyseView.Select(x => x.UnitName).Distinct();
+            //var checkType = newCheckAnalyseView.Select(x => x.UnitName).Distinct();
-            foreach (var itemType in checkType)
+            string[] TypeArray = { "HSE巡检", "专项检查", "综合检查", "开工前检查", "季节性/节假日前检查" };
+            #region 加载各项数据的子数据
+            var count1 = Funs.DB.View_Hazard_HazardRegister.Where(x => x.ProjectId == this.ProjectId).ToList().Count();
+
+            var count2 = (from x in Funs.DB.Check_CheckSpecialDetail
+                          join y in Funs.DB.Check_CheckSpecial on x.CheckSpecialId equals y.CheckSpecialId
+                          select x).ToList().Count();
+
+            var count3 = (from x in Funs.DB.Check_CheckColligationDetail
+                          join y in Funs.DB.Check_CheckColligation on x.CheckColligationId equals y.CheckColligationId
+                          where y.ProjectId == this.ProjectId
+                          select x).ToList().Count();
+
+            var count4 = (from x in Funs.DB.Check_CheckWorkDetail
+                          join y in Funs.DB.Check_CheckWork on x.CheckWorkId equals y.CheckWorkId
+                          where y.ProjectId == this.ProjectId
+                          select x).ToList().Count;
+
+            var count5 = (from x in Funs.DB.Check_CheckHolidayDetail
+                          join y in Funs.DB.Check_CheckHoliday on x.CheckHolidayId equals y.CheckHolidayId
+                          select x).ToList().Count();
+
+            List<CheckAnalysisModel> list = new List<CheckAnalysisModel>();
+            list.Add(new CheckAnalysisModel() { itemType = TypeArray[0], count = count1 });
+            list.Add(new CheckAnalysisModel() { itemType = TypeArray[1], count = count2 });
+            list.Add(new CheckAnalysisModel() { itemType = TypeArray[2], count = count3 });
+            list.Add(new CheckAnalysisModel() { itemType = TypeArray[3], count = count4 });
+            list.Add(new CheckAnalysisModel() { itemType = TypeArray[4], count = count5 });
+            #endregion
+            foreach (var itemType in list)
             {
                 DataRow rowUnit = dtCheck.NewRow();
-                rowUnit["检查类型"] = itemType;
+                rowUnit["检查类型"] = itemType.itemType;
-                rowUnit["数量"] = newCheckAnalyseView.Where(x => x.UnitName == itemType).Count();
+                rowUnit["数量"] = itemType.count;
                 dtCheck.Rows.Add(rowUnit);
             }
 
@@ -97,6 +126,11 @@ namespace FineUIPro.Web.HSSE.InformationAnalysis
             this.gvCheck.DataBind();
             this.ChartCostTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtCheck, "危险因素分析", this.drpChartType.SelectedValue, 1150, 450, this.ckbShow.Checked));
         }
+
+        public class CheckAnalysisModel {
+            public string itemType { get; set; }
+            public int count { get; set; }
+        }
         #endregion
 
         #region 统计查询

SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQuality.aspx

@@ -36,7 +36,8 @@
                             </f:ToolbarFill>
                             <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true"
                                 runat="server">
-                            </f:Button>                           
+                            </f:Button>       
+                              <f:Button ID="btnQR" runat="server"  ToolTip="导出二维码" EnableAjax="false"  EnableAjaxLoading="false" Icon="ArrowInout"  OnClick="btnQR_Click"></f:Button>
                             <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
                                 EnableAjax="false" DisableControlBeforePostBack="false">
                             </f:Button>

SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQuality.aspx.cs

@@ -1,10 +1,13 @@
 using BLL;
+using BLL.Common;
 using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
+using System.IO;
 using System.Linq;
 using System.Text;
+using ThoughtWorks.QRCode.Codec;
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HSSE.QualityAudit
@@ -294,5 +297,120 @@ namespace FineUIPro.Web.HSSE.QualityAudit
             }
         }
         #endregion
+
+        protected void btnQR_Click(object sender, EventArgs e)
+        {
+            string strSql = @"SELECT  EquipmentQuality.EquipmentQualityId,   CodeRecords.Code AS EquipmentQualityCode, 
+                           EquipmentQuality.FactoryCode ,EquipmentQuality.QRCodeAttachUrl 
+                             FROM QualityAudit_EquipmentQuality AS EquipmentQuality  
+                           LEFT JOIN Sys_CodeRecords AS CodeRecords ON EquipmentQuality.EquipmentQualityId = CodeRecords.DataId  
+                             LEFT JOIN Base_SpecialEquipment AS SpecialEquipment ON SpecialEquipment.SpecialEquipmentId = EquipmentQuality.SpecialEquipmentId  WHERE 1=1 ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                strSql += " AND EquipmentQuality.ProjectId = @ProjectId";
+                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            }
+            if (!string.IsNullOrEmpty(this.txtEquipmentQualityCode.Text.Trim()))
+            {
+                strSql += " AND EquipmentQualityCode LIKE @EquipmentQualityCode";
+                listStr.Add(new SqlParameter("@EquipmentQualityCode", "%" + this.txtEquipmentQualityCode.Text.Trim() + "%"));
+            }
+            if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+            {
+                strSql += " AND EquipmentQuality.UnitId = @UnitId";
+                listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue.Trim()));
+            }
+            if (!string.IsNullOrEmpty(this.txtSpecialEquipmentName.Text.Trim()))
+            {
+                strSql += " AND SpecialEquipmentName LIKE @SpecialEquipmentName";
+                listStr.Add(new SqlParameter("@SpecialEquipmentName", "%" + this.txtSpecialEquipmentName.Text.Trim() + "%"));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            NPOIExcel excel = new NPOIExcel();
+            excel.SetColumnWidth(0, 50);
+            excel.SetColumnWidth(1, 50);
+            excel.SetColumnWidth(2, 50);
+            for (int i = 0; i < tb.Rows.Count; i++)
+            {
+                if (i % 3 == 0)
+                {
+                    excel.SetRowHeight(2 * (int)(i / 3), 200);
+                }
+                string QRCodeAttachUrl = tb.Rows[i]["QRCodeAttachUrl"].ToString();
+                string EquipmentQualityCode = tb.Rows[i]["EquipmentQualityCode"].ToString();
+                if (string.IsNullOrEmpty(QRCodeAttachUrl))
+                {
+                    try
+                    {
+                        var equipmentQuality = Funs.DB.QualityAudit_EquipmentQuality.FirstOrDefault(x => x.EquipmentQualityId == tb.Rows[i]["EquipmentQualityId"].ToString());
+                        equipmentQuality.QRCodeAttachUrl = CreateCode_Simple("equipment$" + tb.Rows[i]["FactoryCode"].ToString());
+                        QRCodeAttachUrl = equipmentQuality.QRCodeAttachUrl;
+                        Funs.DB.SubmitChanges();
+                    }
+                    catch (Exception e1) { }
+
+                }
+                //add picture data to this workbook.
+                excel.SetPicValue(2 * (int)(i / 3), i % 3, Server.MapPath("~/") + QRCodeAttachUrl);
+                excel.SetValue(2 * (int)(i / 3) + 1, i % 3, EquipmentQualityCode);
+            }
+            string initTemplatePath = Const.ExcelUrl + Funs.GetNewFileName() + ".xls";
+            string uploadfilepath = Server.MapPath("~/") + initTemplatePath;
+            string fileName = Path.GetFileName(initTemplatePath);
+            excel.Save(uploadfilepath);
+            FileInfo info = new FileInfo(uploadfilepath);
+
+            long fileSize = info.Length;
+            Response.ClearContent();
+            Response.ContentType = "application/x-zip-compressed";
+            Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+            Response.AddHeader("Content-Length", fileSize.ToString());
+            Response.TransmitFile(uploadfilepath, 0, fileSize);
+            Response.Flush();
+            Response.End();
+
+
+
+        }
+
+        private string CreateCode_Simple(string nr)
+        {
+            try
+            {
+                string imageUrl = string.Empty;
+                QRCodeEncoder qrCodeEncoder = new QRCodeEncoder
+                {
+                    QRCodeEncodeMode = QRCodeEncoder.ENCODE_MODE.BYTE,
+                    QRCodeScale = nr.Length,
+                    QRCodeVersion = 0,
+                    QRCodeErrorCorrect = QRCodeEncoder.ERROR_CORRECTION.M
+                };
+                System.Drawing.Image image = qrCodeEncoder.Encode(nr, Encoding.UTF8);
+                string filepath = Server.MapPath("~/") + UploadFileService.QRCodeImageFilePath;
+                //如果文件夹不存在，则创建
+                if (!Directory.Exists(filepath))
+                {
+                    Directory.CreateDirectory(filepath);
+                }
+                string filename = DateTime.Now.ToString("yyyymmddhhmmssfff").ToString() + ".jpg";
+                imageUrl = filepath + filename;
+                FileStream fs = new FileStream(imageUrl, FileMode.OpenOrCreate, FileAccess.Write);
+                image.Save(fs, System.Drawing.Imaging.ImageFormat.Jpeg);
+                fs.Close();
+                image.Dispose();
+                return UploadFileService.QRCodeImageFilePath + filename;
+            }
+
+            catch (Exception ex)
+
+            {
+            }
+            return "";
+        }
+
+
     }
 }

SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQuality.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.QualityAudit {
+namespace FineUIPro.Web.HSSE.QualityAudit
-    
+{
-    
+
-    public partial class EquipmentQuality {
+
-        
+    public partial class EquipmentQuality
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtEquipmentQualityCode 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtEquipmentQualityCode;
-        
+
         /// <summary>
         /// drpUnitId 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitId;
-        
+
         /// <summary>
         /// txtSpecialEquipmentName 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtSpecialEquipmentName;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -101,7 +103,16 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
+        /// <summary>
+        /// btnQR 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnQR;
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/QualityAudit/GeneralEquipmentQuality.aspx

@@ -38,7 +38,8 @@
                             </f:ToolbarFill>
                             <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true"
                                 runat="server">
-                            </f:Button>                          
+                            </f:Button>      
+                             <f:Button ID = "btnQR" runat="server"  ToolTip="导出二维码" EnableAjax="false"  EnableAjaxLoading="false" Icon="ArrowInout"  OnClick="btnQR_Click"></f:Button>
                             <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
                                 EnableAjax="false" DisableControlBeforePostBack="false">
                             </f:Button>

SGGL/FineUIPro.Web/HSSE/QualityAudit/GeneralEquipmentQuality.aspx.cs

@@ -1,10 +1,13 @@
 using BLL;
+using BLL.Common;
 using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
+using System.IO;
 using System.Linq;
 using System.Text;
+using ThoughtWorks.QRCode.Codec;
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HSSE.QualityAudit
@@ -50,7 +53,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
                     Grid1.PageSize = this.CurrUser.PageSize.Value;
-                } 
+                }
                 this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 this.BindGrid();
@@ -109,7 +112,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
             Grid1.RecordCount = tb.Rows.Count;
-           
+
             var table = this.GetPagedDataTable(Grid1, tb);
             Grid1.DataSource = table;
             Grid1.DataBind();
@@ -265,11 +268,134 @@ namespace FineUIPro.Web.HSSE.QualityAudit
             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 = this.Grid1.RecordCount;
+            this.Grid1.PageSize = this.Grid1.RecordCount;
             BindGrid();
             Response.Write(GetGridTableHtml(Grid1));
             Response.End();
         }
         #endregion
+
+
+
+
+
+        protected void btnQR_Click(object sender, EventArgs e)
+        {
+            string strSql = @"SELECT GeneralEquipmentQuality.GeneralEquipmentQualityId,"
+                          + @"CodeRecords.Code AS GeneralEquipmentQualityCode,"
+                          + @"GeneralEquipmentQuality.GeneralEquipmentQualityCode,"
+                          + @"GeneralEquipmentQuality.QRCodeAttachUrl,"
+                          + @"SpecialEquipment.SpecialEquipmentName"
+                          + @" FROM QualityAudit_GeneralEquipmentQuality AS GeneralEquipmentQuality "
+                          + @" LEFT JOIN Base_SpecialEquipment AS SpecialEquipment ON SpecialEquipment.SpecialEquipmentId = GeneralEquipmentQuality.SpecialEquipmentId "
+                          + @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON GeneralEquipmentQuality.GeneralEquipmentQualityId = CodeRecords.DataId  WHERE 1=1 ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                strSql += " AND GeneralEquipmentQuality.ProjectId = @ProjectId";
+                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            }
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                strSql += " AND GeneralEquipmentQuality.UnitId = @UnitId";  ///状态为已完成
+                listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
+            }
+            if (!string.IsNullOrEmpty(this.txtGeneralEquipmentQualityCode.Text.Trim()))
+            {
+                strSql += " AND GeneralEquipmentQualityCode LIKE @GeneralEquipmentQualityCode";
+                listStr.Add(new SqlParameter("@GeneralEquipmentQualityCode", "%" + this.txtGeneralEquipmentQualityCode.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(this.txtUnitName.Text.Trim()))
+            {
+                strSql += " AND UnitName LIKE @UnitName";
+                listStr.Add(new SqlParameter("@UnitName", "%" + this.txtUnitName.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(this.txtSpecialEquipmentName.Text.Trim()))
+            {
+                strSql += " AND SpecialEquipmentName LIKE @SpecialEquipmentName";
+                listStr.Add(new SqlParameter("@SpecialEquipmentName", "%" + this.txtSpecialEquipmentName.Text.Trim() + "%"));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            NPOIExcel excel = new NPOIExcel();
+            excel.SetColumnWidth(0, 50);
+            excel.SetColumnWidth(1, 50);
+            excel.SetColumnWidth(2, 50);
+            for (int i = 0; i < tb.Rows.Count; i++)
+            {
+                if (i % 3 == 0)
+                {
+                    excel.SetRowHeight(2 * (int)(i / 3), 200);
+                }
+                string QRCodeAttachUrl = tb.Rows[i]["QRCodeAttachUrl"].ToString();
+                string GeneralEquipmentQualityCode = tb.Rows[i]["GeneralEquipmentQualityCode"].ToString();
+                if (string.IsNullOrEmpty(QRCodeAttachUrl))
+                {
+                    try
+                    {
+                        var equipmentQuality = Funs.DB.QualityAudit_GeneralEquipmentQuality.FirstOrDefault(x => x.GeneralEquipmentQualityId == tb.Rows[i]["GeneralEquipmentQualityId"].ToString());
+                        equipmentQuality.QRCodeAttachUrl = CreateCode_Simple("equipments$" + tb.Rows[i]["GeneralEquipmentQualityId"].ToString());
+                        QRCodeAttachUrl = equipmentQuality.QRCodeAttachUrl;
+                        Funs.DB.SubmitChanges();
+                    }
+                    catch (Exception e1) { }
+                }
+                //add picture data to this workbook.
+                excel.SetPicValue(2 * (int)(i / 3), i % 3, Server.MapPath("~/") + QRCodeAttachUrl);
+                excel.SetValue(2 * (int)(i / 3) + 1, i % 3, GeneralEquipmentQualityCode);
+            }
+            string initTemplatePath = Const.ExcelUrl + Funs.GetNewFileName() + ".xls";
+            string uploadfilepath = Server.MapPath("~/") + initTemplatePath;
+            string fileName = Path.GetFileName(initTemplatePath);
+            excel.Save(uploadfilepath);
+            FileInfo info = new FileInfo(uploadfilepath);
+
+            long fileSize = info.Length;
+            Response.ClearContent();
+            Response.ContentType = "application/x-zip-compressed";
+            Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+            Response.AddHeader("Content-Length", fileSize.ToString());
+            Response.TransmitFile(uploadfilepath, 0, fileSize);
+            Response.Flush();
+            Response.End();
+
+
+
+        }
+        private string CreateCode_Simple(string nr)
+        {
+            try
+            {
+                string imageUrl = string.Empty;
+                QRCodeEncoder qrCodeEncoder = new QRCodeEncoder
+                {
+                    QRCodeEncodeMode = QRCodeEncoder.ENCODE_MODE.BYTE,
+                    QRCodeScale = nr.Length,
+                    QRCodeVersion = 0,
+                    QRCodeErrorCorrect = QRCodeEncoder.ERROR_CORRECTION.M
+                };
+                System.Drawing.Image image = qrCodeEncoder.Encode(nr, Encoding.UTF8);
+                string filepath = Server.MapPath("~/") + UploadFileService.QRCodeImageFilePath;
+                //如果文件夹不存在，则创建
+                if (!Directory.Exists(filepath))
+                {
+                    Directory.CreateDirectory(filepath);
+                }
+                string filename = DateTime.Now.ToString("yyyymmddhhmmssfff").ToString() + ".jpg";
+                imageUrl = filepath + filename;
+                FileStream fs = new FileStream(imageUrl, FileMode.OpenOrCreate, FileAccess.Write);
+                image.Save(fs, System.Drawing.Imaging.ImageFormat.Jpeg);
+                fs.Close();
+                image.Dispose();
+                return UploadFileService.QRCodeImageFilePath + filename;
+            }
+
+            catch (Exception ex)
+
+            {
+            }
+            return "";
+        }
     }
 }

SGGL/FineUIPro.Web/HSSE/QualityAudit/GeneralEquipmentQuality.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.QualityAudit {
+namespace FineUIPro.Web.HSSE.QualityAudit
-    
+{
-    
+
-    public partial class GeneralEquipmentQuality {
+
-        
+    public partial class GeneralEquipmentQuality
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtGeneralEquipmentQualityCode 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtGeneralEquipmentQualityCode;
-        
+
         /// <summary>
         /// txtUnitName 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtUnitName;
-        
+
         /// <summary>
         /// txtSpecialEquipmentName 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtSpecialEquipmentName;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -101,7 +103,16 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
+        /// <summary>
+        /// btnQR 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnQR;
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/QualityAudit/GeneralEquipmentQualityEdit.aspx.cs

@@ -215,7 +215,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                 this.SaveData(false);
             }
 
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/Controls/SeeQRImage.aspx?GeneralEquipmentQualityId={0}&strCode={1}", this.GeneralEquipmentQualityId, "equipment$" + this.GeneralEquipmentQualityId), "二维码查看", 400, 400));            
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/Controls/SeeQRImage.aspx?GeneralEquipmentQualityId={0}&strCode={1}", this.GeneralEquipmentQualityId, "equipments$" + this.GeneralEquipmentQualityId), "二维码查看", 400, 400));            
         }
     }
 }

SGGL/FineUIPro.Web/ProjectData/Installation.aspx.cs

@@ -249,384 +249,401 @@ namespace FineUIPro.Web.ProjectData
                     }
                     Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
                     string contenttype = "application/json;charset=utf-8";
-                    var returndata = BLL.APIGetHttpService.ControlHttp(Funs.ControlApiUrl + "/Projects/GetConstructionWbsList?ProjId=" + project.KZProjectCode, "GET", contenttype, null, null);
+                    var returndata0 = BLL.APIGetHttpService.ControlHttp(Funs.ControlApiUrl + "/Projects/GetProjectList?Code=" + project.KZProjectCode, "GET", contenttype, null, null);
-                    if (!string.IsNullOrEmpty(returndata))
+                    //string returndata0 = "{'result':{'items':[{'code':'22373','name':'甘肃能化金昌能源化工开发有限公司低阶煤高效利用制氢及50万吨尿基复合肥项目','shortName':'金昌能化50万吨尿基复合肥项目','projTypeId':1,'projType':'工程咨询','projPhaseId':65,'projPhase':'工程咨询','ownerName':'甘肃能化金昌能源化工开发有限公司','address':'境内','nature':'新建','level':'3级','productId':0,'productName':'','productSize':'','initiationDate':'2023-01-19T00:00:00','planStart':'2023-01-19T00:00:00','planFinish':'2023-02-10T00:00:00','realStart':null,'realFinish':null,'contractAmount':0.0000,'contractNumber':'','basicProcess':'','remark':'','isFinished':false,'communityArea':'2亿Nm3/年氢气，30万吨/年合成氨，50万吨/年尿基复合肥','isBreakdown':false,'isSpecial':false,'isKey':false,'status':'COMPLETION','guid':'73c4f36d-1ed2-41ba-9c6e-04619de214de','createdAt':'2023-01-19T09:21:20.213','updatedAt':'2023-01-19T09:21:20.213','id':34961},{'code':'22373','name':'甘肃能化金昌能源化工开发有限公司低阶煤高效利用制氢及50万吨尿基复合肥项目','shortName':'低阶煤高效利用制氢及50 万吨/年高浓度尿基复合肥项目','projTypeId':5,'projType':'工程总承包','projPhaseId':14,'projPhase':'EPC','ownerName':'甘肃能化金昌能源化工开发有限公司','address':'境内','nature':'新建','level':'1级','productId':0,'productName':'合成氨、尿素（中间产品）、尿基复合肥、氢气','productSize':'合成氨40万吨/年； 尿素30万吨/年； 氢气2亿m3/年； 尿基复合肥50万吨/年','initiationDate':'2023-04-23T00:00:00','planStart':'2023-04-23T00:00:00','planFinish':'2025-06-30T00:00:00','realStart':null,'realFinish':null,'contractAmount':0.0000,'contractNumber':'','basicProcess':'氨合成采用南京聚拓专利，尿素装置采用中国五环自有尿素专利技术。','remark':'','isFinished':false,'communityArea':'1.总体院；\n2.40万吨/年合成氨装置：合成气压缩、冷冻、氨合成、氨回收、PSA制氢（2亿m3/年氢气）、尾气压缩、输煤CO2压缩、尿素CO2压缩；\n3.30万吨/年尿素装置：主装置、原料贮运、成品包装贮运；\n4.50万吨/年尿基复合肥装置；\n5.公用工程：循环水、脱盐水、污水、中水回用、零排放、变电所、机柜间、中控室、综合泵站、生产消防水池等；\n6.辅助生产设施：生产分析室、维修车间、综合仓库、危废暂存库、化学品库、火炬等；\n7.储运系统：液氨常压罐、事故甲醇罐、液氨球罐、装车栈台、泡沫站等。','isBreakdown':true,'isSpecial':false,'isKey':false,'status':'EXECUTION','guid':'10142090-f850-47ae-be6c-43597e6dc4d1','createdAt':'2023-04-23T14:39:53.98','updatedAt':'2023-08-16T18:45:05.997','id':35120},{'code':'22373','name':'甘肃能化金昌能源化工开发有限公司低阶煤高效利用制氢及50万吨尿基复合肥项目','shortName':'甘肃能化金昌能化阶煤高效利用制氢及尿基复合肥项目','projTypeId':6,'projType':'投标','projPhaseId':18,'projPhase':'EPC投标','ownerName':'甘肃能化金昌能源化工开发有限公司','address':'境内','nature':'新建','level':'','productId':0,'productName':'合成氨及尿基复合肥','productSize':'合成氨30万吨/年（其中17.4万吨生产尿素）、尿素30万吨/年（中间产品）、尿基复合肥50万吨/年','initiationDate':'2023-02-01T00:00:00','planStart':'2023-02-01T00:00:00','planFinish':'2023-04-15T00:00:00','realStart':null,'realFinish':null,'contractAmount':0.0000,'contractNumber':'','basicProcess':'合成氨采用国有专利，尿素采用五环公司高效合成、低能耗尿素工艺技术。\n','remark':'','isFinished':true,'communityArea':'一、气化采用航天粉煤气化技术，生产氢气2亿Nm3/年、合成氨30万吨/年（其中17.4万吨生产尿素）、尿素30万吨/年、尿基复合肥50万吨/年、硫磺2.24万吨/年。\n二、本次投标范围为：空分装置，净化装置，合成氨装置，罐区，尿素装置，尿基复合肥装置，硫回收装置，锅炉装置（2x220t/h循环流化床锅炉）、水处理系统装置等全厂公辅，全厂总图、外线、地管、道路、控制室、变电所等，总体院。','isBreakdown':false,'isSpecial':false,'isKey':false,'status':'COMPLETION','guid':'9ffcd266-7196-4df1-9432-b818a5c91a6f','createdAt':'2023-02-01T15:30:18.013','updatedAt':'2023-07-27T16:58:14.37','id':34964}]},'targetUrl':null,'success':true,'error':null,'unAuthorizedRequest':false,'__abp':true}";
+                    if (!string.IsNullOrEmpty(returndata0))
                     {
-                        JObject obj = JObject.Parse(returndata);
+                        JObject obj0 = JObject.Parse(returndata0);
-                        JArray arr = JArray.Parse(obj["result"].ToString());
+                        JArray arr0 = JArray.Parse(obj0["result"]["items"].ToString());
-                        Model.SGGLDB db = Funs.DB;
+                        string proId = string.Empty;
-                        //专业
+                        foreach (var item in arr0)
-                        var cnProfessionInits = from x in db.WBS_CnProfessionInit select x;
-                        //单位工程及子单位工程
-                        var unitProjectInits = from x in db.Wbs_UnitProjectInit orderby x.SuperUnitProject select x;
-                        //分部/子分部/分项/子分项
-                        var wbsSetInits = (from x in db.WBS_WbsSetInit orderby x.SuperWbsSetCode select x).ToList();
-                        //费用清单对应关系
-                        var wbsSetMatchCostControlInits = from x in db.WBS_WbsSetMatchCostControlInit orderby x.WbsSetCode select x;
-                        //费用清单项
-                        var totalCostControlInits = from x in db.WBS_CostControlInit orderby x.CostControlInitCode select x;
-                        string sgId = string.Empty;
-                        foreach (var item in arr)
                         {
-                            string id = item["id"].ToString();   //记录Id，主键
+                            string projType = item["projType"].ToString();
-                            string parentId = item["parentId"].ToString();   //上一级记录Id
+                            string projPhase = item["projPhase"].ToString();
-                            string code = item["code"].ToString();   //WBS编码
+                            if (project.ProjType == projType && project.ProjPhase == projPhase)
-                            string name = item["name"].ToString();   //WBS名称
-                            string level = item["level"].ToString();   //级别，0-7依次表示：项目、阶段（施工）、装置、工序、主项、专业、分部工程、分项工程
-                            string isLeaf = item["isLeaf"].ToString();   //是否末级
-                            string ppsId = item["ppsId"].ToString();   //阶段ID，3代表施工
-                            string projId = item["projId"].ToString();   //项目ID
-                            string planStart = item["planStart"].ToString();   //计划开始日期
-                            string planFinish = item["planFinish"].ToString();   //计划完成日期
-                            string remark = item["remark"].ToString();   //备注
-                            if (level == "0" || level == "1" || level == "2" || level == "3" || level == "4")
                             {
-                                Model.Project_Installation installation = new Model.Project_Installation();
+                                proId= item["id"].ToString();
-                                installation.InstallationId = id;
-                                installation.ProjectId = this.CurrUser.LoginProjectId;
-                                installation.InstallationCode = code;
-                                installation.InstallationName = name;
-                                installation.SuperInstallationId = parentId == "-1" ? "0" : parentId;
-                                installation.StartDate = Funs.GetNewDateTime(planStart);
-                                installation.EndDate = Funs.GetNewDateTime(planFinish);
-                                installation.IsEnd = Convert.ToBoolean(isLeaf);
-                                installation.Def = remark;
-                                db.Project_Installation.InsertOnSubmit(installation);
-                                db.SubmitChanges();
-                                if (name == "施工")
-                                {
-                                    sgId = id;
-                                }
-                            }
-                            else if (level == "5")
-                            {
-                                var cn = cnProfessionInits.FirstOrDefault(x => x.CnProfessionName.Contains(name.Substring(0, 2)));
-                                //拷贝专业
-                                if (cn != null)
-                                {
-                                    if (cn.CnProfessionName != "防腐绝热" && cn.CnProfessionName != "地勘" && cn.CnProfessionName != "全厂地下主管网" && cn.CnProfessionName != "临时设施" && cn.CnProfessionName != "总图")
-                                    {
-                                        Model.WBS_CnProfession cnProfession = new Model.WBS_CnProfession();
-                                        cnProfession.CnProfessionId = id;
-                                        cnProfession.CnProfessionName = cn.CnProfessionName;
-                                        cnProfession.CnProfessionCode = cn.CnProfessionCode;
-                                        cnProfession.InstallationId = parentId;
-                                        cnProfession.ProjectId = this.CurrUser.LoginProjectId;
-                                        cnProfession.StartDate = Funs.GetNewDateTime(planStart);
-                                        cnProfession.EndDate = Funs.GetNewDateTime(planFinish);
-                                        cnProfession.OldId = cn.CnProfessionId;
-                                        db.WBS_CnProfession.InsertOnSubmit(cnProfession);
-                                        db.SubmitChanges();
-                                        //单位工程
-                                        var unitProjects = unitProjectInits.Where(x => x.CnProfessionId == cn.CnProfessionId);
-                                        foreach (var unitProjectInit in unitProjects)
-                                        {
-                                            Model.Wbs_UnitProject unitProject = new Model.Wbs_UnitProject();
-                                            unitProject.UnitProjectId = SQLHelper.GetNewID(typeof(Model.Wbs_UnitProject));
-                                            unitProject.UnitProjectCode = unitProjectInit.UnitProjectCode;
-                                            unitProject.UnitProjectName = unitProjectInit.UnitProjectName;
-                                            unitProject.InstallationId = parentId;
-                                            unitProject.SortIndex = unitProjectInit.SortIndex;
-                                            unitProject.SuperUnitProjectId = null;
-                                            unitProject.ProjectId = this.CurrUser.LoginProjectId;
-                                            unitProject.CnProfessionId = id;
-                                            unitProject.StartDate = Funs.GetNewDateTime(planStart);
-                                            unitProject.EndDate = Funs.GetNewDateTime(planFinish);
-                                            unitProject.Remark = unitProjectInit.Remark;
-                                            unitProject.IsIn = true;
-                                            db.Wbs_UnitProject.InsertOnSubmit(unitProject);
-                                            db.SubmitChanges();
-                                        }
-                                        //分部分项
-                                        var wbsSets = wbsSetInits.Where(x => x.CnProfessionId == cn.CnProfessionId);
-                                        foreach (var wbsSetInit in wbsSets)
-                                        {
-                                            Model.Wbs_WbsSet wbsSet = new Model.Wbs_WbsSet();
-                                            wbsSet.WbsSetId = SQLHelper.GetNewID(typeof(Model.Wbs_WbsSet));
-                                            wbsSet.WbsSetCode = wbsSetInit.WbsSetCode;
-                                            wbsSet.WbsSetName = wbsSetInit.WbsSetName;
-                                            wbsSet.InstallationId = parentId;
-                                            wbsSet.CnProfessionId = id;
-                                            wbsSet.UnitProjectId = (from x in db.Wbs_UnitProject where x.UnitProjectCode == wbsSetInit.UnitProjectCode && x.CnProfessionId == id select x.UnitProjectId).FirstOrDefault();
-                                            if (wbsSetInit.SuperWbsSetCode == null)
-                                            {
-                                                wbsSet.SuperWbsSetId = null;
-                                            }
-                                            else
-                                            {
-                                                wbsSet.SuperWbsSetId = (from x in db.Wbs_WbsSet
-                                                                        where x.WbsSetCode == wbsSetInit.SuperWbsSetCode && x.InstallationId == parentId && x.CnProfessionId == id
-                                                                        select x.WbsSetId).FirstOrDefault();
-                                            }
-                                            wbsSet.ProjectId = this.CurrUser.LoginProjectId;
-                                            wbsSet.StartDate = Funs.GetNewDateTime(planStart);
-                                            wbsSet.EndDate = Funs.GetNewDateTime(planFinish);
-                                            wbsSet.Flag = wbsSetInit.Flag;
-                                            wbsSet.Way = wbsSetInit.Way;
-                                            wbsSet.Weights = wbsSetInit.Weights;
-                                            wbsSet.ControlItemDef = wbsSetInit.ControlItemDef;
-                                            wbsSet.ControlPoint = wbsSetInit.ControlPoint;
-                                            wbsSet.Remark = wbsSetInit.Remark;
-                                            wbsSet.IsIn = true;
-                                            db.Wbs_WbsSet.InsertOnSubmit(wbsSet);
-                                            db.SubmitChanges();
-                                            var wbsSetMatchCostControls = wbsSetMatchCostControlInits.Where(x => x.WbsSetCode == wbsSetInit.WbsSetCode);
-                                            foreach (var wbsSetMatchCostControlInit in wbsSetMatchCostControls)
-                                            {
-                                                Model.WBS_WbsSetMatchCostControl wbsSetMatchCostControl = new Model.WBS_WbsSetMatchCostControl();
-                                                wbsSetMatchCostControl.WbsSetMatchCostControlId = SQLHelper.GetNewID();
-                                                wbsSetMatchCostControl.WbsSetId = wbsSet.WbsSetId;
-                                                wbsSetMatchCostControl.CostControlCode = wbsSetMatchCostControlInit.CostControlInitCode;
-                                                if (wbsSetMatchCostControl.WbsSetId != null)
-                                                {
-                                                    db.WBS_WbsSetMatchCostControl.InsertOnSubmit(wbsSetMatchCostControl);
-                                                    db.SubmitChanges();
-                                                    //拷贝费用清单项
-                                                    var costControlInits = from x in totalCostControlInits where x.CostControlInitCode == wbsSetMatchCostControlInit.CostControlInitCode orderby x.CostControlInitCode select x;
-                                                    foreach (var costControlInit in costControlInits)
-                                                    {
-                                                        Model.WBS_CostControl costControl = new Model.WBS_CostControl();
-                                                        costControl.CostControlId = SQLHelper.GetNewID();
-                                                        costControl.ProjectId = this.CurrUser.LoginProjectId;
-                                                        costControl.WbsSetId = wbsSetMatchCostControl.WbsSetId;
-                                                        costControl.CostControlCode = costControlInit.CostControlInitCode;
-                                                        costControl.CostControlName = costControlInit.CostControlInitName;
-                                                        costControl.Unit = costControlInit.Unit;
-                                                        db.WBS_CostControl.InsertOnSubmit(costControl);
-                                                        db.SubmitChanges();
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                    else
-                                    {
-                                        var oldInstallation = Funs.DB.Project_Installation.FirstOrDefault(x => x.InstallationName == name);
-                                        if (oldInstallation == null)
-                                        {
-                                            Model.Project_Installation installation = new Model.Project_Installation();
-                                            installation.InstallationId = id;
-                                            installation.ProjectId = this.CurrUser.LoginProjectId;
-                                            installation.InstallationCode = code;
-                                            installation.InstallationName = name;
-                                            installation.SuperInstallationId = sgId;
-                                            installation.StartDate = Funs.GetNewDateTime(planStart);
-                                            installation.EndDate = Funs.GetNewDateTime(planFinish);
-                                            installation.IsEnd = true;
-                                            installation.Def = remark;
-                                            db.Project_Installation.InsertOnSubmit(installation);
-                                            db.SubmitChanges();
-                                            // 拷贝总图等专业下WBS内容
-                                            //拷贝单位工程及子单位工程
-                                            var unitProjects = unitProjectInits.Where(x => x.CnProfessionId == cn.CnProfessionId);
-                                            foreach (var unitProjectInit in unitProjects)
-                                            {
-                                                Model.Wbs_UnitProject unitProject = new Model.Wbs_UnitProject();
-                                                unitProject.UnitProjectId = SQLHelper.GetNewID(typeof(Model.Wbs_UnitProject));
-                                                unitProject.UnitProjectCode = unitProjectInit.UnitProjectCode;
-                                                unitProject.UnitProjectName = unitProjectInit.UnitProjectName;
-                                                if (unitProjectInit.SuperUnitProject == null)
-                                                {
-                                                    unitProject.SuperUnitProjectId = null;
-                                                }
-                                                else
-                                                {
-                                                    unitProject.SuperUnitProjectId = (from x in Funs.DB.Wbs_UnitProject
-                                                                                      where x.UnitProjectCode == unitProjectInit.SuperUnitProject && x.InstallationId == id
-                                                                                      select x.UnitProjectId).FirstOrDefault();
-                                                }
-                                                unitProject.InstallationId = id;
-                                                unitProject.SortIndex = unitProjectInit.SortIndex;
-                                                unitProject.ProjectId = this.CurrUser.LoginProjectId;
-                                                unitProject.StartDate = Funs.GetNewDateTime(planStart);
-                                                unitProject.EndDate = Funs.GetNewDateTime(planFinish);
-                                                unitProject.Remark = unitProjectInit.Remark;
-                                                unitProject.IsIn = true;
-                                                db.Wbs_UnitProject.InsertOnSubmit(unitProject);
-                                                db.SubmitChanges();
-                                            }
-                                            //拷贝分部/子分部/分项/子分项
-                                            var wbsSets = wbsSetInits.Where(x => x.CnProfessionId == cn.CnProfessionId);
-                                            foreach (var wbsSetInit in wbsSets)
-                                            {
-                                                Model.Wbs_WbsSet wbsSet = new Model.Wbs_WbsSet();
-                                                wbsSet.WbsSetId = SQLHelper.GetNewID(typeof(Model.Wbs_WbsSet));
-                                                wbsSet.WbsSetCode = wbsSetInit.WbsSetCode;
-                                                wbsSet.WbsSetName = wbsSetInit.WbsSetName;
-                                                wbsSet.InstallationId = id;
-                                                wbsSet.UnitProjectId = (from x in Funs.DB.Wbs_UnitProject where x.UnitProjectCode == wbsSetInit.UnitProjectCode && x.InstallationId == id select x.UnitProjectId).FirstOrDefault();
-                                                if (wbsSetInit.SuperWbsSetCode == null)
-                                                {
-                                                    wbsSet.SuperWbsSetId = null;
-                                                }
-                                                else
-                                                {
-                                                    wbsSet.SuperWbsSetId = (from x in Funs.DB.Wbs_WbsSet
-                                                                            where x.WbsSetCode == wbsSetInit.SuperWbsSetCode && x.InstallationId == id
-                                                                            select x.WbsSetId).FirstOrDefault();
-                                                }
-                                                wbsSet.ProjectId = this.CurrUser.LoginProjectId;
-                                                wbsSet.StartDate = Funs.GetNewDateTime(planStart);
-                                                wbsSet.EndDate = Funs.GetNewDateTime(planFinish);
-                                                wbsSet.Flag = wbsSetInit.Flag;
-                                                wbsSet.Way = wbsSetInit.Way;
-                                                wbsSet.Weights = wbsSetInit.Weights;
-                                                wbsSet.ControlItemDef = wbsSetInit.ControlItemDef;
-                                                wbsSet.ControlPoint = wbsSetInit.ControlPoint;
-                                                wbsSet.Remark = wbsSetInit.Remark;
-                                                wbsSet.IsIn = true;
-                                                db.Wbs_WbsSet.InsertOnSubmit(wbsSet);
-                                                db.SubmitChanges();
-                                                var wbsSetMatchCostControls = wbsSetMatchCostControlInits.Where(x => x.WbsSetCode == wbsSetInit.WbsSetCode);
-                                                foreach (var wbsSetMatchCostControlInit in wbsSetMatchCostControls)
-                                                {
-                                                    Model.WBS_WbsSetMatchCostControl wbsSetMatchCostControl = new Model.WBS_WbsSetMatchCostControl();
-                                                    wbsSetMatchCostControl.WbsSetMatchCostControlId = SQLHelper.GetNewID();
-                                                    wbsSetMatchCostControl.WbsSetId = wbsSet.WbsSetId;
-                                                    wbsSetMatchCostControl.CostControlCode = wbsSetMatchCostControlInit.CostControlInitCode;
-                                                    if (wbsSetMatchCostControl.WbsSetId != null)
-                                                    {
-                                                        db.WBS_WbsSetMatchCostControl.InsertOnSubmit(wbsSetMatchCostControl);
-                                                        db.SubmitChanges();
-                                                        //拷贝费用清单项
-                                                        var costControlInits = from x in totalCostControlInits where x.CostControlInitCode == wbsSetMatchCostControlInit.CostControlInitCode orderby x.CostControlInitCode select x;
-                                                        foreach (var costControlInit in costControlInits)
-                                                        {
-                                                            Model.WBS_CostControl costControl = new Model.WBS_CostControl();
-                                                            costControl.CostControlId = SQLHelper.GetNewID();
-                                                            costControl.ProjectId = this.CurrUser.LoginProjectId;
-                                                            costControl.WbsSetId = wbsSetMatchCostControl.WbsSetId;
-                                                            costControl.CostControlCode = costControlInit.CostControlInitCode;
-                                                            costControl.CostControlName = costControlInit.CostControlInitName;
-                                                            costControl.Unit = costControlInit.Unit;
-                                                            db.WBS_CostControl.InsertOnSubmit(costControl);
-                                                            db.SubmitChanges();
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                            else if (level == "6" || level == "7")
-                            {
-                                if (name.Contains("防腐绝热") || name.Contains("地勘") || name.Contains("全厂地下主管网") || name.Contains("临时设施") || name.Contains("总图"))
-                                {
-                                    var cn = cnProfessionInits.FirstOrDefault(x => x.CnProfessionName.Contains(name.Substring(0, 2)));
-                                    if (cn != null)
-                                    {
-                                        var oldInstallation = Funs.DB.Project_Installation.FirstOrDefault(x => x.InstallationName == name);
-                                        if (oldInstallation == null)
-                                        {
-                                            Model.Project_Installation installation = new Model.Project_Installation();
-                                            installation.InstallationId = id;
-                                            installation.ProjectId = this.CurrUser.LoginProjectId;
-                                            installation.InstallationCode = code;
-                                            installation.InstallationName = name;
-                                            installation.SuperInstallationId = sgId;
-                                            installation.StartDate = Funs.GetNewDateTime(planStart);
-                                            installation.EndDate = Funs.GetNewDateTime(planFinish);
-                                            installation.IsEnd = true;
-                                            installation.Def = remark;
-                                            db.Project_Installation.InsertOnSubmit(installation);
-                                            db.SubmitChanges();
-                                            // 拷贝总图等专业下WBS内容
-                                            //拷贝单位工程及子单位工程
-                                            var unitProjects = unitProjectInits.Where(x => x.CnProfessionId == cn.CnProfessionId);
-                                            foreach (var unitProjectInit in unitProjects)
-                                            {
-                                                Model.Wbs_UnitProject unitProject = new Model.Wbs_UnitProject();
-                                                unitProject.UnitProjectId = SQLHelper.GetNewID(typeof(Model.Wbs_UnitProject));
-                                                unitProject.UnitProjectCode = unitProjectInit.UnitProjectCode;
-                                                unitProject.UnitProjectName = unitProjectInit.UnitProjectName;
-                                                if (unitProjectInit.SuperUnitProject == null)
-                                                {
-                                                    unitProject.SuperUnitProjectId = null;
-                                                }
-                                                else
-                                                {
-                                                    unitProject.SuperUnitProjectId = (from x in Funs.DB.Wbs_UnitProject
-                                                                                      where x.UnitProjectCode == unitProjectInit.SuperUnitProject && x.InstallationId == id
-                                                                                      select x.UnitProjectId).FirstOrDefault();
-                                                }
-                                                unitProject.InstallationId = id;
-                                                unitProject.SortIndex = unitProjectInit.SortIndex;
-                                                unitProject.ProjectId = this.CurrUser.LoginProjectId;
-                                                unitProject.StartDate = Funs.GetNewDateTime(planStart);
-                                                unitProject.EndDate = Funs.GetNewDateTime(planFinish);
-                                                unitProject.Remark = unitProjectInit.Remark;
-                                                unitProject.IsIn = true;
-                                                db.Wbs_UnitProject.InsertOnSubmit(unitProject);
-                                                db.SubmitChanges();
-                                            }
-                                            //拷贝分部/子分部/分项/子分项
-                                            var wbsSets = wbsSetInits.Where(x => x.CnProfessionId == cn.CnProfessionId);
-                                            foreach (var wbsSetInit in wbsSets)
-                                            {
-                                                Model.Wbs_WbsSet wbsSet = new Model.Wbs_WbsSet();
-                                                wbsSet.WbsSetId = SQLHelper.GetNewID(typeof(Model.Wbs_WbsSet));
-                                                wbsSet.WbsSetCode = wbsSetInit.WbsSetCode;
-                                                wbsSet.WbsSetName = wbsSetInit.WbsSetName;
-                                                wbsSet.InstallationId = id;
-                                                wbsSet.UnitProjectId = (from x in Funs.DB.Wbs_UnitProject where x.UnitProjectCode == wbsSetInit.UnitProjectCode && x.InstallationId == id select x.UnitProjectId).FirstOrDefault();
-                                                if (wbsSetInit.SuperWbsSetCode == null)
-                                                {
-                                                    wbsSet.SuperWbsSetId = null;
-                                                }
-                                                else
-                                                {
-                                                    wbsSet.SuperWbsSetId = (from x in Funs.DB.Wbs_WbsSet
-                                                                            where x.WbsSetCode == wbsSetInit.SuperWbsSetCode && x.InstallationId == id
-                                                                            select x.WbsSetId).FirstOrDefault();
-                                                }
-                                                wbsSet.ProjectId = this.CurrUser.LoginProjectId;
-                                                wbsSet.StartDate = Funs.GetNewDateTime(planStart);
-                                                wbsSet.EndDate = Funs.GetNewDateTime(planFinish);
-                                                wbsSet.Flag = wbsSetInit.Flag;
-                                                wbsSet.Way = wbsSetInit.Way;
-                                                wbsSet.Weights = wbsSetInit.Weights;
-                                                wbsSet.ControlItemDef = wbsSetInit.ControlItemDef;
-                                                wbsSet.ControlPoint = wbsSetInit.ControlPoint;
-                                                wbsSet.Remark = wbsSetInit.Remark;
-                                                wbsSet.IsIn = true;
-                                                db.Wbs_WbsSet.InsertOnSubmit(wbsSet);
-                                                db.SubmitChanges();
-                                                var wbsSetMatchCostControls = wbsSetMatchCostControlInits.Where(x => x.WbsSetCode == wbsSetInit.WbsSetCode);
-                                                foreach (var wbsSetMatchCostControlInit in wbsSetMatchCostControls)
-                                                {
-                                                    Model.WBS_WbsSetMatchCostControl wbsSetMatchCostControl = new Model.WBS_WbsSetMatchCostControl();
-                                                    wbsSetMatchCostControl.WbsSetMatchCostControlId = SQLHelper.GetNewID();
-                                                    wbsSetMatchCostControl.WbsSetId = wbsSet.WbsSetId;
-                                                    wbsSetMatchCostControl.CostControlCode = wbsSetMatchCostControlInit.CostControlInitCode;
-                                                    if (wbsSetMatchCostControl.WbsSetId != null)
-                                                    {
-                                                        db.WBS_WbsSetMatchCostControl.InsertOnSubmit(wbsSetMatchCostControl);
-                                                        db.SubmitChanges();
-                                                        //拷贝费用清单项
-                                                        var costControlInits = from x in totalCostControlInits where x.CostControlInitCode == wbsSetMatchCostControlInit.CostControlInitCode orderby x.CostControlInitCode select x;
-                                                        foreach (var costControlInit in costControlInits)
-                                                        {
-                                                            Model.WBS_CostControl costControl = new Model.WBS_CostControl();
-                                                            costControl.CostControlId = SQLHelper.GetNewID();
-                                                            costControl.ProjectId = this.CurrUser.LoginProjectId;
-                                                            costControl.WbsSetId = wbsSetMatchCostControl.WbsSetId;
-                                                            costControl.CostControlCode = costControlInit.CostControlInitCode;
-                                                            costControl.CostControlName = costControlInit.CostControlInitName;
-                                                            costControl.Unit = costControlInit.Unit;
-                                                            db.WBS_CostControl.InsertOnSubmit(costControl);
-                                                            db.SubmitChanges();
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
                             }
                         }
-                        ShowNotify("抽取成功！", MessageBoxIcon.Success);
+                        var returndata = BLL.APIGetHttpService.ControlHttp(Funs.ControlApiUrl + "/Projects/GetConstructionWbsList?ProjId=" + proId, "GET", contenttype, null, null);
-                        InitTreeMenu();
+                        if (!string.IsNullOrEmpty(returndata))
+                        {
+                            JObject obj = JObject.Parse(returndata);
+                            JArray arr = JArray.Parse(obj["result"].ToString());
+                            Model.SGGLDB db = Funs.DB;
+                            //专业
+                            var cnProfessionInits = from x in db.WBS_CnProfessionInit select x;
+                            //单位工程及子单位工程
+                            var unitProjectInits = from x in db.Wbs_UnitProjectInit orderby x.SuperUnitProject select x;
+                            //分部/子分部/分项/子分项
+                            var wbsSetInits = (from x in db.WBS_WbsSetInit orderby x.SuperWbsSetCode select x).ToList();
+                            //费用清单对应关系
+                            var wbsSetMatchCostControlInits = from x in db.WBS_WbsSetMatchCostControlInit orderby x.WbsSetCode select x;
+                            //费用清单项
+                            var totalCostControlInits = from x in db.WBS_CostControlInit orderby x.CostControlInitCode select x;
+                            string sgId = string.Empty;
+                            foreach (var item in arr)
+                            {
+                                string id = item["id"].ToString();   //记录Id，主键
+                                string parentId = item["parentId"].ToString();   //上一级记录Id
+                                string code = item["code"].ToString();   //WBS编码
+                                string name = item["name"].ToString();   //WBS名称
+                                string level = item["level"].ToString();   //级别，0-7依次表示：项目、阶段（施工）、装置、工序、主项、专业、分部工程、分项工程
+                                string isLeaf = item["isLeaf"].ToString();   //是否末级
+                                string ppsId = item["ppsId"].ToString();   //阶段ID，3代表施工
+                                string projId = item["projId"].ToString();   //项目ID
+                                string planStart = item["planStart"].ToString();   //计划开始日期
+                                string planFinish = item["planFinish"].ToString();   //计划完成日期
+                                string remark = item["remark"].ToString();   //备注
+                                if (level == "0" || level == "1" || level == "2" || level == "3" || level == "4")
+                                {
+                                    Model.Project_Installation installation = new Model.Project_Installation();
+                                    installation.InstallationId = id;
+                                    installation.ProjectId = this.CurrUser.LoginProjectId;
+                                    installation.InstallationCode = code;
+                                    installation.InstallationName = name;
+                                    installation.SuperInstallationId = parentId == "-1" ? "0" : parentId;
+                                    installation.StartDate = Funs.GetNewDateTime(planStart);
+                                    installation.EndDate = Funs.GetNewDateTime(planFinish);
+                                    installation.IsEnd = Convert.ToBoolean(isLeaf);
+                                    installation.Def = remark;
+                                    db.Project_Installation.InsertOnSubmit(installation);
+                                    db.SubmitChanges();
+                                    if (name == "施工")
+                                    {
+                                        sgId = id;
+                                    }
+                                }
+                                else if (level == "5")
+                                {
+                                    var cn = cnProfessionInits.FirstOrDefault(x => x.CnProfessionName.Contains(name.Substring(0, 2)));
+                                    //拷贝专业
+                                    if (cn != null)
+                                    {
+                                        if (cn.CnProfessionName != "防腐绝热" && cn.CnProfessionName != "地勘" && cn.CnProfessionName != "全厂地下主管网" && cn.CnProfessionName != "临时设施" && cn.CnProfessionName != "总图")
+                                        {
+                                            Model.WBS_CnProfession cnProfession = new Model.WBS_CnProfession();
+                                            cnProfession.CnProfessionId = id;
+                                            cnProfession.CnProfessionName = cn.CnProfessionName;
+                                            cnProfession.CnProfessionCode = cn.CnProfessionCode;
+                                            cnProfession.InstallationId = parentId;
+                                            cnProfession.ProjectId = this.CurrUser.LoginProjectId;
+                                            cnProfession.StartDate = Funs.GetNewDateTime(planStart);
+                                            cnProfession.EndDate = Funs.GetNewDateTime(planFinish);
+                                            cnProfession.OldId = cn.CnProfessionId;
+                                            db.WBS_CnProfession.InsertOnSubmit(cnProfession);
+                                            db.SubmitChanges();
+                                            //单位工程
+                                            var unitProjects = unitProjectInits.Where(x => x.CnProfessionId == cn.CnProfessionId);
+                                            foreach (var unitProjectInit in unitProjects)
+                                            {
+                                                Model.Wbs_UnitProject unitProject = new Model.Wbs_UnitProject();
+                                                unitProject.UnitProjectId = SQLHelper.GetNewID(typeof(Model.Wbs_UnitProject));
+                                                unitProject.UnitProjectCode = unitProjectInit.UnitProjectCode;
+                                                unitProject.UnitProjectName = unitProjectInit.UnitProjectName;
+                                                unitProject.InstallationId = parentId;
+                                                unitProject.SortIndex = unitProjectInit.SortIndex;
+                                                unitProject.SuperUnitProjectId = null;
+                                                unitProject.ProjectId = this.CurrUser.LoginProjectId;
+                                                unitProject.CnProfessionId = id;
+                                                unitProject.StartDate = Funs.GetNewDateTime(planStart);
+                                                unitProject.EndDate = Funs.GetNewDateTime(planFinish);
+                                                unitProject.Remark = unitProjectInit.Remark;
+                                                unitProject.IsIn = true;
+                                                db.Wbs_UnitProject.InsertOnSubmit(unitProject);
+                                                db.SubmitChanges();
+                                            }
+                                            //分部分项
+                                            var wbsSets = wbsSetInits.Where(x => x.CnProfessionId == cn.CnProfessionId);
+                                            foreach (var wbsSetInit in wbsSets)
+                                            {
+                                                Model.Wbs_WbsSet wbsSet = new Model.Wbs_WbsSet();
+                                                wbsSet.WbsSetId = SQLHelper.GetNewID(typeof(Model.Wbs_WbsSet));
+                                                wbsSet.WbsSetCode = wbsSetInit.WbsSetCode;
+                                                wbsSet.WbsSetName = wbsSetInit.WbsSetName;
+                                                wbsSet.InstallationId = parentId;
+                                                wbsSet.CnProfessionId = id;
+                                                wbsSet.UnitProjectId = (from x in db.Wbs_UnitProject where x.UnitProjectCode == wbsSetInit.UnitProjectCode && x.CnProfessionId == id select x.UnitProjectId).FirstOrDefault();
+                                                if (wbsSetInit.SuperWbsSetCode == null)
+                                                {
+                                                    wbsSet.SuperWbsSetId = null;
+                                                }
+                                                else
+                                                {
+                                                    wbsSet.SuperWbsSetId = (from x in db.Wbs_WbsSet
+                                                                            where x.WbsSetCode == wbsSetInit.SuperWbsSetCode && x.InstallationId == parentId && x.CnProfessionId == id
+                                                                            select x.WbsSetId).FirstOrDefault();
+                                                }
+                                                wbsSet.ProjectId = this.CurrUser.LoginProjectId;
+                                                wbsSet.StartDate = Funs.GetNewDateTime(planStart);
+                                                wbsSet.EndDate = Funs.GetNewDateTime(planFinish);
+                                                wbsSet.Flag = wbsSetInit.Flag;
+                                                wbsSet.Way = wbsSetInit.Way;
+                                                wbsSet.Weights = wbsSetInit.Weights;
+                                                wbsSet.ControlItemDef = wbsSetInit.ControlItemDef;
+                                                wbsSet.ControlPoint = wbsSetInit.ControlPoint;
+                                                wbsSet.Remark = wbsSetInit.Remark;
+                                                wbsSet.IsIn = true;
+                                                db.Wbs_WbsSet.InsertOnSubmit(wbsSet);
+                                                db.SubmitChanges();
+                                                var wbsSetMatchCostControls = wbsSetMatchCostControlInits.Where(x => x.WbsSetCode == wbsSetInit.WbsSetCode);
+                                                foreach (var wbsSetMatchCostControlInit in wbsSetMatchCostControls)
+                                                {
+                                                    Model.WBS_WbsSetMatchCostControl wbsSetMatchCostControl = new Model.WBS_WbsSetMatchCostControl();
+                                                    wbsSetMatchCostControl.WbsSetMatchCostControlId = SQLHelper.GetNewID();
+                                                    wbsSetMatchCostControl.WbsSetId = wbsSet.WbsSetId;
+                                                    wbsSetMatchCostControl.CostControlCode = wbsSetMatchCostControlInit.CostControlInitCode;
+                                                    if (wbsSetMatchCostControl.WbsSetId != null)
+                                                    {
+                                                        db.WBS_WbsSetMatchCostControl.InsertOnSubmit(wbsSetMatchCostControl);
+                                                        db.SubmitChanges();
+                                                        //拷贝费用清单项
+                                                        var costControlInits = from x in totalCostControlInits where x.CostControlInitCode == wbsSetMatchCostControlInit.CostControlInitCode orderby x.CostControlInitCode select x;
+                                                        foreach (var costControlInit in costControlInits)
+                                                        {
+                                                            Model.WBS_CostControl costControl = new Model.WBS_CostControl();
+                                                            costControl.CostControlId = SQLHelper.GetNewID();
+                                                            costControl.ProjectId = this.CurrUser.LoginProjectId;
+                                                            costControl.WbsSetId = wbsSetMatchCostControl.WbsSetId;
+                                                            costControl.CostControlCode = costControlInit.CostControlInitCode;
+                                                            costControl.CostControlName = costControlInit.CostControlInitName;
+                                                            costControl.Unit = costControlInit.Unit;
+                                                            db.WBS_CostControl.InsertOnSubmit(costControl);
+                                                            db.SubmitChanges();
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        else
+                                        {
+                                            var oldInstallation = Funs.DB.Project_Installation.FirstOrDefault(x => x.InstallationName == name);
+                                            if (oldInstallation == null)
+                                            {
+                                                Model.Project_Installation installation = new Model.Project_Installation();
+                                                installation.InstallationId = id;
+                                                installation.ProjectId = this.CurrUser.LoginProjectId;
+                                                installation.InstallationCode = code;
+                                                installation.InstallationName = name;
+                                                installation.SuperInstallationId = sgId;
+                                                installation.StartDate = Funs.GetNewDateTime(planStart);
+                                                installation.EndDate = Funs.GetNewDateTime(planFinish);
+                                                installation.IsEnd = true;
+                                                installation.Def = remark;
+                                                db.Project_Installation.InsertOnSubmit(installation);
+                                                db.SubmitChanges();
+                                                // 拷贝总图等专业下WBS内容
+                                                //拷贝单位工程及子单位工程
+                                                var unitProjects = unitProjectInits.Where(x => x.CnProfessionId == cn.CnProfessionId);
+                                                foreach (var unitProjectInit in unitProjects)
+                                                {
+                                                    Model.Wbs_UnitProject unitProject = new Model.Wbs_UnitProject();
+                                                    unitProject.UnitProjectId = SQLHelper.GetNewID(typeof(Model.Wbs_UnitProject));
+                                                    unitProject.UnitProjectCode = unitProjectInit.UnitProjectCode;
+                                                    unitProject.UnitProjectName = unitProjectInit.UnitProjectName;
+                                                    if (unitProjectInit.SuperUnitProject == null)
+                                                    {
+                                                        unitProject.SuperUnitProjectId = null;
+                                                    }
+                                                    else
+                                                    {
+                                                        unitProject.SuperUnitProjectId = (from x in Funs.DB.Wbs_UnitProject
+                                                                                          where x.UnitProjectCode == unitProjectInit.SuperUnitProject && x.InstallationId == id
+                                                                                          select x.UnitProjectId).FirstOrDefault();
+                                                    }
+                                                    unitProject.InstallationId = id;
+                                                    unitProject.SortIndex = unitProjectInit.SortIndex;
+                                                    unitProject.ProjectId = this.CurrUser.LoginProjectId;
+                                                    unitProject.StartDate = Funs.GetNewDateTime(planStart);
+                                                    unitProject.EndDate = Funs.GetNewDateTime(planFinish);
+                                                    unitProject.Remark = unitProjectInit.Remark;
+                                                    unitProject.IsIn = true;
+                                                    db.Wbs_UnitProject.InsertOnSubmit(unitProject);
+                                                    db.SubmitChanges();
+                                                }
+                                                //拷贝分部/子分部/分项/子分项
+                                                var wbsSets = wbsSetInits.Where(x => x.CnProfessionId == cn.CnProfessionId);
+                                                foreach (var wbsSetInit in wbsSets)
+                                                {
+                                                    Model.Wbs_WbsSet wbsSet = new Model.Wbs_WbsSet();
+                                                    wbsSet.WbsSetId = SQLHelper.GetNewID(typeof(Model.Wbs_WbsSet));
+                                                    wbsSet.WbsSetCode = wbsSetInit.WbsSetCode;
+                                                    wbsSet.WbsSetName = wbsSetInit.WbsSetName;
+                                                    wbsSet.InstallationId = id;
+                                                    wbsSet.UnitProjectId = (from x in Funs.DB.Wbs_UnitProject where x.UnitProjectCode == wbsSetInit.UnitProjectCode && x.InstallationId == id select x.UnitProjectId).FirstOrDefault();
+                                                    if (wbsSetInit.SuperWbsSetCode == null)
+                                                    {
+                                                        wbsSet.SuperWbsSetId = null;
+                                                    }
+                                                    else
+                                                    {
+                                                        wbsSet.SuperWbsSetId = (from x in Funs.DB.Wbs_WbsSet
+                                                                                where x.WbsSetCode == wbsSetInit.SuperWbsSetCode && x.InstallationId == id
+                                                                                select x.WbsSetId).FirstOrDefault();
+                                                    }
+                                                    wbsSet.ProjectId = this.CurrUser.LoginProjectId;
+                                                    wbsSet.StartDate = Funs.GetNewDateTime(planStart);
+                                                    wbsSet.EndDate = Funs.GetNewDateTime(planFinish);
+                                                    wbsSet.Flag = wbsSetInit.Flag;
+                                                    wbsSet.Way = wbsSetInit.Way;
+                                                    wbsSet.Weights = wbsSetInit.Weights;
+                                                    wbsSet.ControlItemDef = wbsSetInit.ControlItemDef;
+                                                    wbsSet.ControlPoint = wbsSetInit.ControlPoint;
+                                                    wbsSet.Remark = wbsSetInit.Remark;
+                                                    wbsSet.IsIn = true;
+                                                    db.Wbs_WbsSet.InsertOnSubmit(wbsSet);
+                                                    db.SubmitChanges();
+                                                    var wbsSetMatchCostControls = wbsSetMatchCostControlInits.Where(x => x.WbsSetCode == wbsSetInit.WbsSetCode);
+                                                    foreach (var wbsSetMatchCostControlInit in wbsSetMatchCostControls)
+                                                    {
+                                                        Model.WBS_WbsSetMatchCostControl wbsSetMatchCostControl = new Model.WBS_WbsSetMatchCostControl();
+                                                        wbsSetMatchCostControl.WbsSetMatchCostControlId = SQLHelper.GetNewID();
+                                                        wbsSetMatchCostControl.WbsSetId = wbsSet.WbsSetId;
+                                                        wbsSetMatchCostControl.CostControlCode = wbsSetMatchCostControlInit.CostControlInitCode;
+                                                        if (wbsSetMatchCostControl.WbsSetId != null)
+                                                        {
+                                                            db.WBS_WbsSetMatchCostControl.InsertOnSubmit(wbsSetMatchCostControl);
+                                                            db.SubmitChanges();
+                                                            //拷贝费用清单项
+                                                            var costControlInits = from x in totalCostControlInits where x.CostControlInitCode == wbsSetMatchCostControlInit.CostControlInitCode orderby x.CostControlInitCode select x;
+                                                            foreach (var costControlInit in costControlInits)
+                                                            {
+                                                                Model.WBS_CostControl costControl = new Model.WBS_CostControl();
+                                                                costControl.CostControlId = SQLHelper.GetNewID();
+                                                                costControl.ProjectId = this.CurrUser.LoginProjectId;
+                                                                costControl.WbsSetId = wbsSetMatchCostControl.WbsSetId;
+                                                                costControl.CostControlCode = costControlInit.CostControlInitCode;
+                                                                costControl.CostControlName = costControlInit.CostControlInitName;
+                                                                costControl.Unit = costControlInit.Unit;
+                                                                db.WBS_CostControl.InsertOnSubmit(costControl);
+                                                                db.SubmitChanges();
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                                else if (level == "6" || level == "7")
+                                {
+                                    if (name.Contains("防腐绝热") || name.Contains("地勘") || name.Contains("全厂地下主管网") || name.Contains("临时设施") || name.Contains("总图"))
+                                    {
+                                        var cn = cnProfessionInits.FirstOrDefault(x => x.CnProfessionName.Contains(name.Substring(0, 2)));
+                                        if (cn != null)
+                                        {
+                                            var oldInstallation = Funs.DB.Project_Installation.FirstOrDefault(x => x.InstallationName == name);
+                                            if (oldInstallation == null)
+                                            {
+                                                Model.Project_Installation installation = new Model.Project_Installation();
+                                                installation.InstallationId = id;
+                                                installation.ProjectId = this.CurrUser.LoginProjectId;
+                                                installation.InstallationCode = code;
+                                                installation.InstallationName = name;
+                                                installation.SuperInstallationId = sgId;
+                                                installation.StartDate = Funs.GetNewDateTime(planStart);
+                                                installation.EndDate = Funs.GetNewDateTime(planFinish);
+                                                installation.IsEnd = true;
+                                                installation.Def = remark;
+                                                db.Project_Installation.InsertOnSubmit(installation);
+                                                db.SubmitChanges();
+                                                // 拷贝总图等专业下WBS内容
+                                                //拷贝单位工程及子单位工程
+                                                var unitProjects = unitProjectInits.Where(x => x.CnProfessionId == cn.CnProfessionId);
+                                                foreach (var unitProjectInit in unitProjects)
+                                                {
+                                                    Model.Wbs_UnitProject unitProject = new Model.Wbs_UnitProject();
+                                                    unitProject.UnitProjectId = SQLHelper.GetNewID(typeof(Model.Wbs_UnitProject));
+                                                    unitProject.UnitProjectCode = unitProjectInit.UnitProjectCode;
+                                                    unitProject.UnitProjectName = unitProjectInit.UnitProjectName;
+                                                    if (unitProjectInit.SuperUnitProject == null)
+                                                    {
+                                                        unitProject.SuperUnitProjectId = null;
+                                                    }
+                                                    else
+                                                    {
+                                                        unitProject.SuperUnitProjectId = (from x in Funs.DB.Wbs_UnitProject
+                                                                                          where x.UnitProjectCode == unitProjectInit.SuperUnitProject && x.InstallationId == id
+                                                                                          select x.UnitProjectId).FirstOrDefault();
+                                                    }
+                                                    unitProject.InstallationId = id;
+                                                    unitProject.SortIndex = unitProjectInit.SortIndex;
+                                                    unitProject.ProjectId = this.CurrUser.LoginProjectId;
+                                                    unitProject.StartDate = Funs.GetNewDateTime(planStart);
+                                                    unitProject.EndDate = Funs.GetNewDateTime(planFinish);
+                                                    unitProject.Remark = unitProjectInit.Remark;
+                                                    unitProject.IsIn = true;
+                                                    db.Wbs_UnitProject.InsertOnSubmit(unitProject);
+                                                    db.SubmitChanges();
+                                                }
+                                                //拷贝分部/子分部/分项/子分项
+                                                var wbsSets = wbsSetInits.Where(x => x.CnProfessionId == cn.CnProfessionId);
+                                                foreach (var wbsSetInit in wbsSets)
+                                                {
+                                                    Model.Wbs_WbsSet wbsSet = new Model.Wbs_WbsSet();
+                                                    wbsSet.WbsSetId = SQLHelper.GetNewID(typeof(Model.Wbs_WbsSet));
+                                                    wbsSet.WbsSetCode = wbsSetInit.WbsSetCode;
+                                                    wbsSet.WbsSetName = wbsSetInit.WbsSetName;
+                                                    wbsSet.InstallationId = id;
+                                                    wbsSet.UnitProjectId = (from x in Funs.DB.Wbs_UnitProject where x.UnitProjectCode == wbsSetInit.UnitProjectCode && x.InstallationId == id select x.UnitProjectId).FirstOrDefault();
+                                                    if (wbsSetInit.SuperWbsSetCode == null)
+                                                    {
+                                                        wbsSet.SuperWbsSetId = null;
+                                                    }
+                                                    else
+                                                    {
+                                                        wbsSet.SuperWbsSetId = (from x in Funs.DB.Wbs_WbsSet
+                                                                                where x.WbsSetCode == wbsSetInit.SuperWbsSetCode && x.InstallationId == id
+                                                                                select x.WbsSetId).FirstOrDefault();
+                                                    }
+                                                    wbsSet.ProjectId = this.CurrUser.LoginProjectId;
+                                                    wbsSet.StartDate = Funs.GetNewDateTime(planStart);
+                                                    wbsSet.EndDate = Funs.GetNewDateTime(planFinish);
+                                                    wbsSet.Flag = wbsSetInit.Flag;
+                                                    wbsSet.Way = wbsSetInit.Way;
+                                                    wbsSet.Weights = wbsSetInit.Weights;
+                                                    wbsSet.ControlItemDef = wbsSetInit.ControlItemDef;
+                                                    wbsSet.ControlPoint = wbsSetInit.ControlPoint;
+                                                    wbsSet.Remark = wbsSetInit.Remark;
+                                                    wbsSet.IsIn = true;
+                                                    db.Wbs_WbsSet.InsertOnSubmit(wbsSet);
+                                                    db.SubmitChanges();
+                                                    var wbsSetMatchCostControls = wbsSetMatchCostControlInits.Where(x => x.WbsSetCode == wbsSetInit.WbsSetCode);
+                                                    foreach (var wbsSetMatchCostControlInit in wbsSetMatchCostControls)
+                                                    {
+                                                        Model.WBS_WbsSetMatchCostControl wbsSetMatchCostControl = new Model.WBS_WbsSetMatchCostControl();
+                                                        wbsSetMatchCostControl.WbsSetMatchCostControlId = SQLHelper.GetNewID();
+                                                        wbsSetMatchCostControl.WbsSetId = wbsSet.WbsSetId;
+                                                        wbsSetMatchCostControl.CostControlCode = wbsSetMatchCostControlInit.CostControlInitCode;
+                                                        if (wbsSetMatchCostControl.WbsSetId != null)
+                                                        {
+                                                            db.WBS_WbsSetMatchCostControl.InsertOnSubmit(wbsSetMatchCostControl);
+                                                            db.SubmitChanges();
+                                                            //拷贝费用清单项
+                                                            var costControlInits = from x in totalCostControlInits where x.CostControlInitCode == wbsSetMatchCostControlInit.CostControlInitCode orderby x.CostControlInitCode select x;
+                                                            foreach (var costControlInit in costControlInits)
+                                                            {
+                                                                Model.WBS_CostControl costControl = new Model.WBS_CostControl();
+                                                                costControl.CostControlId = SQLHelper.GetNewID();
+                                                                costControl.ProjectId = this.CurrUser.LoginProjectId;
+                                                                costControl.WbsSetId = wbsSetMatchCostControl.WbsSetId;
+                                                                costControl.CostControlCode = costControlInit.CostControlInitCode;
+                                                                costControl.CostControlName = costControlInit.CostControlInitName;
+                                                                costControl.Unit = costControlInit.Unit;
+                                                                db.WBS_CostControl.InsertOnSubmit(costControl);
+                                                                db.SubmitChanges();
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                            ShowNotify("抽取成功！", MessageBoxIcon.Success);
+                            InitTreeMenu();
+                        }
                     }
                 }
                 else

SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx

@@ -147,6 +147,12 @@
                     <f:TextBox ID="txtKZProjectCode" runat="server" Label="控制软件项目编号" LabelWidth="150px" MaxLength="50" ></f:TextBox>
                 </Items>
             </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:TextBox ID="txtProjType" runat="server" Label="控制软件项目类型" LabelWidth="150px" MaxLength="50" ></f:TextBox>
+                    <f:TextBox ID="txtProjPhase" runat="server" Label="控制软件项目阶段" LabelWidth="150px" MaxLength="50" ></f:TextBox>
+                </Items>
+            </f:FormRow>
             <f:FormRow>
                  <Items>                   
                     <f:NumberBox runat="server" ID="txtProgress" Label="项目进度(%)" NoNegative="true" ></f:NumberBox>

SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs

@@ -168,6 +168,8 @@ namespace FineUIPro.Web.ProjectData
                         this.txtEnglishRemark.Text = project.EnglishRemark;
                         this.txtHJProjectCode.Text = project.HJProjectCode;
                         this.txtKZProjectCode.Text = project.KZProjectCode;
+                        this.txtProjType.Text = project.ProjType;
+                        this.txtProjPhase.Text = project.ProjPhase;
                         if (project.Progress != null)
                         {
                             this.txtProgress.Text = project.Progress.ToString();
@@ -209,6 +211,8 @@ namespace FineUIPro.Web.ProjectData
                 City = this.txtCity.Text.Trim(),
                 EnglishRemark = this.txtEnglishRemark.Text.Trim(),
                 Progress = Funs.GetNewDecimal(this.txtProgress.Text),
+                ProjType = this.txtProjType.Text.Trim(),
+                ProjPhase = this.txtProjPhase.Text.Trim(),
             };
             if (string.IsNullOrEmpty(project.JTProjectCode))
             {

SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs

@@ -7,13 +7,11 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.ProjectData
+namespace FineUIPro.Web.ProjectData {
-{
+    
-
+    
-
+    public partial class ProjectSetSave {
-    public partial class ProjectSetSave
+        
-    {
-
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -22,7 +20,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+        
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -31,7 +29,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-
+        
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -40,7 +38,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-
+        
         /// <summary>
         /// txtProjectName 控件。
         /// </summary>
@@ -49,7 +47,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectName;
-
+        
         /// <summary>
         /// txtProjectCode 控件。
         /// </summary>
@@ -58,7 +56,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectCode;
-
+        
         /// <summary>
         /// txtShortName 控件。
         /// </summary>
@@ -67,7 +65,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtShortName;
-
+        
         /// <summary>
         /// drpProjectType 控件。
         /// </summary>
@@ -76,7 +74,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProjectType;
-
+        
         /// <summary>
         /// drpProjectState 控件。
         /// </summary>
@@ -85,7 +83,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProjectState;
-
+        
         /// <summary>
         /// drpProjectState2 控件。
         /// </summary>
@@ -94,7 +92,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProjectState2;
-
+        
         /// <summary>
         /// txtStartDate 控件。
         /// </summary>
@@ -103,7 +101,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartDate;
-
+        
         /// <summary>
         /// txtEndDate 控件。
         /// </summary>
@@ -112,7 +110,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndDate;
-
+        
         /// <summary>
         /// txtContractNo 控件。
         /// </summary>
@@ -121,7 +119,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtContractNo;
-
+        
         /// <summary>
         /// txtDuration 控件。
         /// </summary>
@@ -130,7 +128,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtDuration;
-
+        
         /// <summary>
         /// drpProjectManager 控件。
         /// </summary>
@@ -139,7 +137,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProjectManager;
-
+        
         /// <summary>
         /// drpConstructionManager 控件。
         /// </summary>
@@ -148,7 +146,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpConstructionManager;
-
+        
         /// <summary>
         /// drpQAManager 控件。
         /// </summary>
@@ -157,7 +155,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpQAManager;
-
+        
         /// <summary>
         /// drpHSSEManager 控件。
         /// </summary>
@@ -166,7 +164,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpHSSEManager;
-
+        
         /// <summary>
         /// drpDriveManager 控件。
         /// </summary>
@@ -175,7 +173,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpDriveManager;
-
+        
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -184,7 +182,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-
+        
         /// <summary>
         /// txtProjectAddress 控件。
         /// </summary>
@@ -193,7 +191,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectAddress;
-
+        
         /// <summary>
         /// txtJTProjectCode 控件。
         /// </summary>
@@ -202,7 +200,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtJTProjectCode;
-
+        
         /// <summary>
         /// ckbIsForeign 控件。
         /// </summary>
@@ -211,7 +209,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox ckbIsForeign;
-
+        
         /// <summary>
         /// txtWorkRange 控件。
         /// </summary>
@@ -220,7 +218,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtWorkRange;
-
+        
         /// <summary>
         /// txtRemark 控件。
         /// </summary>
@@ -229,7 +227,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtRemark;
-
+        
         /// <summary>
         /// txtProjectMoney 控件。
         /// </summary>
@@ -238,7 +236,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtProjectMoney;
-
+        
         /// <summary>
         /// txtConstructionMoney 控件。
         /// </summary>
@@ -247,7 +245,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtConstructionMoney;
-
+        
         /// <summary>
         /// txtTelephone 控件。
         /// </summary>
@@ -256,7 +254,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtTelephone;
-
+        
         /// <summary>
         /// drpCountry 控件。
         /// </summary>
@@ -265,7 +263,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCountry;
-
+        
         /// <summary>
         /// drpProvince 控件。
         /// </summary>
@@ -274,7 +272,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProvince;
-
+        
         /// <summary>
         /// txtCity 控件。
         /// </summary>
@@ -283,7 +281,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCity;
-
+        
         /// <summary>
         /// txtMapCoordinates 控件。
         /// </summary>
@@ -292,7 +290,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtMapCoordinates;
-
+        
         /// <summary>
         /// bottomPanel 控件。
         /// </summary>
@@ -301,7 +299,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ContentPanel bottomPanel;
-
+        
         /// <summary>
         /// txtEnglishRemark 控件。
         /// </summary>
@@ -310,7 +308,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtEnglishRemark;
-
+        
         /// <summary>
         /// txtHJProjectCode 控件。
         /// </summary>
@@ -319,7 +317,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtHJProjectCode;
-
+        
         /// <summary>
         /// txtKZProjectCode 控件。
         /// </summary>
@@ -328,7 +326,25 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtKZProjectCode;
-
+        
+        /// <summary>
+        /// txtProjType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProjType;
+        
+        /// <summary>
+        /// txtProjPhase 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProjPhase;
+        
         /// <summary>
         /// txtProgress 控件。
         /// </summary>
@@ -337,7 +353,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtProgress;
-
+        
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -346,7 +362,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-
+        
         /// <summary>
         /// ckIsUpTotalMonth 控件。
         /// </summary>
@@ -355,7 +371,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox ckIsUpTotalMonth;
-
+        
         /// <summary>
         /// btnAttachUrl 控件。
         /// </summary>
@@ -364,7 +380,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAttachUrl;
-
+        
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -373,7 +389,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-
+        
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -382,7 +398,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-
+        
         /// <summary>
         /// hdCompileMan 控件。
         /// </summary>
@@ -391,7 +407,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdCompileMan;
-
+        
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>

SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx

@@ -106,6 +106,12 @@
                     <f:TextBox ID="txtKZProjectCode" runat="server" Label="控制软件项目编号" LabelWidth="150px" MaxLength="50" Readonly="true"></f:TextBox>
                 </Items>
             </f:FormRow>  
+            <f:FormRow>
+                <Items>
+                    <f:TextBox ID="txtProjType" runat="server" Label="控制软件项目类型" LabelWidth="150px" MaxLength="50" Readonly="true"></f:TextBox>
+                    <f:TextBox ID="txtProjPhase" runat="server" Label="控制软件项目阶段" LabelWidth="150px" MaxLength="50" Readonly="true"></f:TextBox>
+                </Items>
+            </f:FormRow>
             <f:FormRow>
                  <Items>
                     <f:TextBox ID="txtEnglishRemark" runat="server" Label="英文简称" Readonly="true"></f:TextBox>

SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.cs

@@ -102,6 +102,8 @@ namespace FineUIPro.Web.ProjectData
                         this.txtEnglishRemark.Text = project.EnglishRemark;
                         this.txtHJProjectCode.Text = project.HJProjectCode;
                         this.txtKZProjectCode.Text = project.KZProjectCode;
+                        this.txtProjType.Text = project.ProjType;
+                        this.txtProjPhase.Text = project.ProjPhase;
                         if (project.Progress != null)
                         {
                             this.txtProgress.Text = project.Progress.ToString();

SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.designer.cs

@@ -300,6 +300,24 @@ namespace FineUIPro.Web.ProjectData {
         /// </remarks>
         protected global::FineUIPro.TextBox txtKZProjectCode;
         
+        /// <summary>
+        /// txtProjType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProjType;
+        
+        /// <summary>
+        /// txtProjPhase 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProjPhase;
+        
         /// <summary>
         /// txtEnglishRemark 控件。
         /// </summary>

SGGL/Model/APIItem/HSSE/CheckSpecialDetailItem.cs

@@ -203,5 +203,9 @@ namespace Model
         /// </summary>
         public string Rectification_Date { get; set; }
 
+        /// <summary>
+        /// 处理意见
+        /// </summary>
+        public string CheckOpinions { get; set; }
     }
 }

SGGL/Model/APIItem/HSSE/CheckSpecialItem.cs

@@ -180,5 +180,71 @@ namespace Model
             get;
             set;
         }
+
+        /// <summary>
+        ///  受检单位
+        /// </summary>
+        public string ResponsibleUnit
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        ///  受检单位
+        /// </summary>
+        public string ResponsibleUnitName
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        ///  单位工程ID
+        /// </summary>
+        public string WorkAreaId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        ///  单位工程ID
+        /// </summary>
+        public string WorkAreaName
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        ///  问题类型
+        /// </summary>
+        public string QuestionType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        ///  问题类型
+        /// </summary>
+        public string QuestionTypeName
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 审核人
+        /// </summary>
+        public string ResponsibleMan { get; set; }
+
+        /// <summary>
+        /// 审核状态
+        /// </summary>
+        public string AuditState { get; set; }
+
+        /// <summary>
+        /// 接收人
+        /// </summary>
+        public string ReceiveMan { get; set; }
+
+        public string ReceiveManName { get; set; }
     }
 }

SGGL/Model/APIItem/HSSE/EquipmentQualityItem.cs

@@ -95,5 +95,13 @@ namespace Model
         /// 附件
         /// </summary>
         public string AttachUrl { get; set; }
+        /// <summary>
+        /// 是否合格
+        /// </summary>
+        public string IsQualified { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public string EquipmentCount { get; set; }
     }
 }

SGGL/Model/Model.cs

@@ -9179,6 +9179,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<View_QualityAudit_GeneralEquipmentQuality> View_QualityAudit_GeneralEquipmentQuality
+		{
+			get
+			{
+				return this.GetTable<View_QualityAudit_GeneralEquipmentQuality>();
+			}
+		}
+		
 		public System.Data.Linq.Table<View_QualityAudit_PersonQuality> View_QualityAudit_PersonQuality
 		{
 			get
@@ -25021,6 +25029,10 @@ namespace Model
 		
 		private string _ProjectAttribute;
 		
+		private string _ProjType;
+		
+		private string _ProjPhase;
+		
 		private EntitySet<Accident_AccidentHandle> _Accident_AccidentHandle;
 		
 		private EntitySet<Accident_AccidentPersonRecord> _Accident_AccidentPersonRecord;
@@ -25675,6 +25687,10 @@ namespace Model
     partial void OnCLProjectCodeChanged();
     partial void OnProjectAttributeChanging(string value);
     partial void OnProjectAttributeChanged();
+    partial void OnProjTypeChanging(string value);
+    partial void OnProjTypeChanged();
+    partial void OnProjPhaseChanging(string value);
+    partial void OnProjPhaseChanged();
     #endregion
 		
 		public Base_Project()
@@ -26699,6 +26715,46 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjType", DbType="NVarChar(50)")]
+		public string ProjType
+		{
+			get
+			{
+				return this._ProjType;
+			}
+			set
+			{
+				if ((this._ProjType != value))
+				{
+					this.OnProjTypeChanging(value);
+					this.SendPropertyChanging();
+					this._ProjType = value;
+					this.SendPropertyChanged("ProjType");
+					this.OnProjTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjPhase", DbType="NVarChar(50)")]
+		public string ProjPhase
+		{
+			get
+			{
+				return this._ProjPhase;
+			}
+			set
+			{
+				if ((this._ProjPhase != value))
+				{
+					this.OnProjPhaseChanging(value);
+					this.SendPropertyChanging();
+					this._ProjPhase = value;
+					this.SendPropertyChanged("ProjPhase");
+					this.OnProjPhaseChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentHandle_Base_Project", Storage="_Accident_AccidentHandle", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
 		public EntitySet<Accident_AccidentHandle> Accident_AccidentHandle
 		{
@@ -59583,6 +59639,16 @@ namespace Model
 		
 		private string _CheckItemSetId;
 		
+		private string _ResponsibleUnit;
+		
+		private string _WorkAreaId;
+		
+		private string _QuestionType;
+		
+		private string _ResponsibleMan;
+		
+		private string _ReceiveMan;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Technique_CheckItemSet> _Technique_CheckItemSet;
@@ -59623,6 +59689,16 @@ namespace Model
     partial void OnPartInPersonNamesChanged();
     partial void OnCheckItemSetIdChanging(string value);
     partial void OnCheckItemSetIdChanged();
+    partial void OnResponsibleUnitChanging(string value);
+    partial void OnResponsibleUnitChanged();
+    partial void OnWorkAreaIdChanging(string value);
+    partial void OnWorkAreaIdChanged();
+    partial void OnQuestionTypeChanging(string value);
+    partial void OnQuestionTypeChanged();
+    partial void OnResponsibleManChanging(string value);
+    partial void OnResponsibleManChanged();
+    partial void OnReceiveManChanging(string value);
+    partial void OnReceiveManChanged();
     #endregion
 		
 		public Check_CheckSpecial()
@@ -59960,6 +60036,106 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibleUnit", DbType="NVarChar(50)")]
+		public string ResponsibleUnit
+		{
+			get
+			{
+				return this._ResponsibleUnit;
+			}
+			set
+			{
+				if ((this._ResponsibleUnit != value))
+				{
+					this.OnResponsibleUnitChanging(value);
+					this.SendPropertyChanging();
+					this._ResponsibleUnit = value;
+					this.SendPropertyChanged("ResponsibleUnit");
+					this.OnResponsibleUnitChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(50)")]
+		public string WorkAreaId
+		{
+			get
+			{
+				return this._WorkAreaId;
+			}
+			set
+			{
+				if ((this._WorkAreaId != value))
+				{
+					this.OnWorkAreaIdChanging(value);
+					this.SendPropertyChanging();
+					this._WorkAreaId = value;
+					this.SendPropertyChanged("WorkAreaId");
+					this.OnWorkAreaIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QuestionType", DbType="NVarChar(50)")]
+		public string QuestionType
+		{
+			get
+			{
+				return this._QuestionType;
+			}
+			set
+			{
+				if ((this._QuestionType != value))
+				{
+					this.OnQuestionTypeChanging(value);
+					this.SendPropertyChanging();
+					this._QuestionType = value;
+					this.SendPropertyChanged("QuestionType");
+					this.OnQuestionTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibleMan", DbType="NVarChar(50)")]
+		public string ResponsibleMan
+		{
+			get
+			{
+				return this._ResponsibleMan;
+			}
+			set
+			{
+				if ((this._ResponsibleMan != value))
+				{
+					this.OnResponsibleManChanging(value);
+					this.SendPropertyChanging();
+					this._ResponsibleMan = value;
+					this.SendPropertyChanged("ResponsibleMan");
+					this.OnResponsibleManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReceiveMan", DbType="NVarChar(2000)")]
+		public string ReceiveMan
+		{
+			get
+			{
+				return this._ReceiveMan;
+			}
+			set
+			{
+				if ((this._ReceiveMan != value))
+				{
+					this.OnReceiveManChanging(value);
+					this.SendPropertyChanging();
+					this._ReceiveMan = value;
+					this.SendPropertyChanged("ReceiveMan");
+					this.OnReceiveManChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -60099,6 +60275,8 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _Rectification_Date;
 		
+		private string _CheckOpinions;
+		
 		private EntityRef<Base_Unit> _Base_Unit;
 		
 		private EntityRef<WBS_UnitWork> _WBS_UnitWork;
@@ -60151,6 +60329,8 @@ namespace Model
     partial void OnCheckItemSetContentChanged();
     partial void OnRectification_DateChanging(System.Nullable<System.DateTime> value);
     partial void OnRectification_DateChanged();
+    partial void OnCheckOpinionsChanging(string value);
+    partial void OnCheckOpinionsChanged();
     #endregion
 		
 		public Check_CheckSpecialDetail()
@@ -60608,6 +60788,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckOpinions", DbType="NVarChar(2000)")]
+		public string CheckOpinions
+		{
+			get
+			{
+				return this._CheckOpinions;
+			}
+			set
+			{
+				if ((this._CheckOpinions != value))
+				{
+					this.OnCheckOpinionsChanging(value);
+					this.SendPropertyChanging();
+					this._CheckOpinions = value;
+					this.SendPropertyChanged("CheckOpinions");
+					this.OnCheckOpinionsChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecialDetail_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)]
 		public Base_Unit Base_Unit
 		{
@@ -392840,6 +393040,303 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_QualityAudit_GeneralEquipmentQuality")]
+	public partial class View_QualityAudit_GeneralEquipmentQuality
+	{
+		
+		private string _GeneralEquipmentQualityId;
+		
+		private string _ProjectId;
+		
+		private string _GeneralEquipmentQualityCode;
+		
+		private string _UnitId;
+		
+		private string _UnitName;
+		
+		private string _SpecialEquipmentId;
+		
+		private string _SpecialEquipmentName;
+		
+		private System.Nullable<bool> _IsQualified;
+		
+		private System.Nullable<int> _EquipmentCount;
+		
+		private System.Nullable<System.DateTime> _InDate;
+		
+		private string _Remark;
+		
+		private string _CompileMan;
+		
+		private string _CompileManName;
+		
+		private System.Nullable<System.DateTime> _CompileDate;
+		
+		private string _QRCodeAttachUrl;
+		
+		private string _AttachUrl;
+		
+		public View_QualityAudit_GeneralEquipmentQuality()
+		{
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GeneralEquipmentQualityId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		public string GeneralEquipmentQualityId
+		{
+			get
+			{
+				return this._GeneralEquipmentQualityId;
+			}
+			set
+			{
+				if ((this._GeneralEquipmentQualityId != value))
+				{
+					this._GeneralEquipmentQualityId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this._ProjectId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GeneralEquipmentQualityCode", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		public string GeneralEquipmentQualityCode
+		{
+			get
+			{
+				return this._GeneralEquipmentQualityCode;
+			}
+			set
+			{
+				if ((this._GeneralEquipmentQualityCode != value))
+				{
+					this._GeneralEquipmentQualityCode = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		public string UnitId
+		{
+			get
+			{
+				return this._UnitId;
+			}
+			set
+			{
+				if ((this._UnitId != value))
+				{
+					this._UnitId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitName", DbType="NVarChar(200)")]
+		public string UnitName
+		{
+			get
+			{
+				return this._UnitName;
+			}
+			set
+			{
+				if ((this._UnitName != value))
+				{
+					this._UnitName = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecialEquipmentId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		public string SpecialEquipmentId
+		{
+			get
+			{
+				return this._SpecialEquipmentId;
+			}
+			set
+			{
+				if ((this._SpecialEquipmentId != value))
+				{
+					this._SpecialEquipmentId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecialEquipmentName", DbType="NVarChar(50)")]
+		public string SpecialEquipmentName
+		{
+			get
+			{
+				return this._SpecialEquipmentName;
+			}
+			set
+			{
+				if ((this._SpecialEquipmentName != value))
+				{
+					this._SpecialEquipmentName = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsQualified", DbType="Bit")]
+		public System.Nullable<bool> IsQualified
+		{
+			get
+			{
+				return this._IsQualified;
+			}
+			set
+			{
+				if ((this._IsQualified != value))
+				{
+					this._IsQualified = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EquipmentCount", DbType="Int")]
+		public System.Nullable<int> EquipmentCount
+		{
+			get
+			{
+				return this._EquipmentCount;
+			}
+			set
+			{
+				if ((this._EquipmentCount != value))
+				{
+					this._EquipmentCount = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> InDate
+		{
+			get
+			{
+				return this._InDate;
+			}
+			set
+			{
+				if ((this._InDate != value))
+				{
+					this._InDate = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(500)")]
+		public string Remark
+		{
+			get
+			{
+				return this._Remark;
+			}
+			set
+			{
+				if ((this._Remark != value))
+				{
+					this._Remark = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")]
+		public string CompileMan
+		{
+			get
+			{
+				return this._CompileMan;
+			}
+			set
+			{
+				if ((this._CompileMan != value))
+				{
+					this._CompileMan = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileManName", DbType="NVarChar(50)")]
+		public string CompileManName
+		{
+			get
+			{
+				return this._CompileManName;
+			}
+			set
+			{
+				if ((this._CompileManName != value))
+				{
+					this._CompileManName = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CompileDate
+		{
+			get
+			{
+				return this._CompileDate;
+			}
+			set
+			{
+				if ((this._CompileDate != value))
+				{
+					this._CompileDate = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QRCodeAttachUrl", DbType="NVarChar(200)")]
+		public string QRCodeAttachUrl
+		{
+			get
+			{
+				return this._QRCodeAttachUrl;
+			}
+			set
+			{
+				if ((this._QRCodeAttachUrl != value))
+				{
+					this._QRCodeAttachUrl = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttachUrl", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		public string AttachUrl
+		{
+			get
+			{
+				return this._AttachUrl;
+			}
+			set
+			{
+				if ((this._AttachUrl != value))
+				{
+					this._AttachUrl = value;
+				}
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_QualityAudit_PersonQuality")]
 	public partial class View_QualityAudit_PersonQuality
 	{

SGGL/WebAPI/Controllers/HSSE/CheckSpecialController.cs

@@ -16,12 +16,12 @@ namespace WebAPI.Controllers
         /// </summary>
         /// <param name="CheckSpecialId"></param>
         /// <returns></returns>
-        public Model.ResponeData getCheckSpecialById(string CheckSpecialId)
+        public Model.ResponeData getCheckSpecialById(string CheckSpecialId,string state="0")
         {
             var responeData = new Model.ResponeData();
             try
             {
-                 responeData.data = APICheckSpecialService.getCheckSpecialById(CheckSpecialId);
+                 responeData.data = APICheckSpecialService.getCheckSpecialById(CheckSpecialId, state);
             }
             catch (Exception ex)
             {
@@ -41,12 +41,12 @@ namespace WebAPI.Controllers
         /// <param name="states"></param>
         /// <param name="pageIndex"></param>
         /// <returns></returns>
-        public Model.ResponeData getCheckSpecialList(string projectId, string states, int pageIndex)
+        public Model.ResponeData getCheckSpecialList(string projectId, string states, int pageIndex,string userid)
         {
             var responeData = new Model.ResponeData();
             try
             {
-                var getDataList = APICheckSpecialService.getCheckSpecialList(projectId, states);
+                var getDataList = APICheckSpecialService.getCheckSpecialList(projectId, states, userid);
                 int pageCount = getDataList.Count();
                 if (pageCount > 0 && pageIndex > 0)
                 {
@@ -133,5 +133,24 @@ namespace WebAPI.Controllers
             return responeData;
         }
         #endregion
+
+        /// <summary>
+        /// 加载措施
+        /// </summary>
+        /// <returns></returns>
+        public Model.ResponeData getGroup_HandleStep()
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = ConstValue.drpConstItemList(BLL.ConstValue.Group_HandleStep);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
     }
 }

SGGL/WebAPI/Controllers/HSSE/GeneralEquipmentQualityController.cs

@@ -0,0 +1,160 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using BLL;
+
+namespace WebAPI.Controllers
+{
+    /// <summary>
+    ///  一般机具设备资质
+    /// </summary>
+    public class GeneralEquipmentQualityController : ApiController
+    {
+        #region 根据equipmentQualityId获取机具设备资质信息
+        /// <summary>
+        /// 根据equipmentQualityId获取机具设备资质信息
+        /// </summary>
+        /// <param name="equipmentQualityId"></param>
+        /// <returns></returns>
+        public Model.ResponeData getEquipmentQualityByEquipmentQualityId(string equipmentQualityId)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = APIGeneralEquipmentQualityService.getEquipmentQualityByEquipmentQualityIdFactoryCode(equipmentQualityId);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+
+        
+
+        #region 根据projectId、unitid获取机具设备资质信息
+        /// <summary>
+        /// 根据projectId、unitid获取机具设备资质信息
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="unitId"></param>
+        /// <param name="pageIndex"></param>
+        /// <returns></returns>
+        public Model.ResponeData getEquipmentQualityByProjectIdUnitId(string projectId, string unitId, int pageIndex)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var getDataList = APIGeneralEquipmentQualityService.getEquipmentQualityList(projectId, unitId, null);
+                int pageCount = getDataList.Count();
+                if (pageCount > 0 && pageIndex > 0)
+                {
+                    getDataList = getDataList.Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
+                }
+                responeData.data = new { pageCount, getDataList };
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+        #endregion
+
+        #region 根据projectId、unitid获取机具设备资质信息-查询
+        /// <summary>
+        /// 根据projectId、unitid获取机具设备资质信息
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="unitId"></param>
+        /// <param name="pageIndex"></param>
+        ///  <param name="strParam">查询条件</param>
+        /// <returns></returns>
+        public Model.ResponeData getEquipmentQualityByProjectIdUnitIdQuery(string projectId, string unitId, string strParam, int pageIndex)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var getDataList = APIGeneralEquipmentQualityService.getEquipmentQualityList(projectId, unitId, strParam);
+                int pageCount = getDataList.Count();
+                if (pageCount > 0 && pageIndex > 0)
+                {
+                    getDataList = getDataList.Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
+                }
+                responeData.data = new { pageCount, getDataList };
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+        #endregion
+
+        #region 根据projectId、unitid获取特岗机具设备资质资质各状态数
+        /// <summary>
+        /// 根据projectId、unitid获取特岗机具设备资质资质各状态数
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="unitId"></param>
+        /// <returns></returns>
+        public Model.ResponeData getEquipmentQualityCount(string projectId, string unitId)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var getDataList = new Model.SGGLDB(Funs.ConnString).QualityAudit_GeneralEquipmentQuality.Where(x => x.ProjectId == projectId);
+                if (ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(projectId, unitId))
+                {
+                    getDataList = getDataList.Where(x => x.UnitId == unitId);
+                }
+                ////总数
+                int tatalCount = getDataList.Count(); 
+
+                responeData.data = new { tatalCount  };
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+
+        
+
+        #region 保存QualityAudit_EquipmentQuality
+        /// <summary>
+        /// 保存QualityAudit_EquipmentQuality
+        /// </summary>
+        /// <param name="newitem">机具设备资质</param>
+        /// <returns></returns>
+        [HttpPost]
+        public Model.ResponeData SaveEquipmentQuality([FromBody] Model.EquipmentQualityItem newitem)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                APIGeneralEquipmentQualityService.SaveEquipmentQuality(newitem);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+    }
+}

SGGL/WebAPI/Controllers/PersonController.cs

@@ -1083,5 +1083,28 @@ namespace WebAPI.Controllers
             return responeData;
         }
         #endregion
+
+        #region 二维码扫码获取人员
+        /// <summary>
+        /// 二维码扫码获取人员
+        /// </summary>
+        /// <param name="personId"></param>
+        /// <returns></returns>
+        public Model.ResponeData getPersonByPersonIdQrcode(string personId)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = APIPersonService.getPersonByPersonIdQrcode(personId);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
     }
 }

SGGL/WebAPI/WebAPI.csproj

@@ -153,6 +153,7 @@
     <Compile Include="Controllers\FaceController.cs" />
     <Compile Include="Controllers\DoorServerController.cs" />
     <Compile Include="Controllers\HJGL\GetHJDataController.cs" />
+    <Compile Include="Controllers\HSSE\GeneralEquipmentQualityController.cs" />
     <Compile Include="Controllers\HSSE\HSSELogController.cs" />
     <Compile Include="Controllers\HSSE\TestingController.cs" />
     <Compile Include="Controllers\Person\PersonCheckController.cs" />