提交代码

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

@@ -0,0 +1,39 @@
+--专项检查受检单位
+alter table Check_CheckSpecial add ResponsibleUnit nvarchar(50)  null;
+--单位工程
+alter table Check_CheckSpecial add WorkAreaId nvarchar(50)  null;
+--问题类型
+alter table Check_CheckSpecial add QuestionType nvarchar(50)  null;
+--审核人
+alter table Check_CheckSpecial add ResponsibleMan nvarchar(50) null;
+--子表添加处理意见字段
+alter table Check_CheckSpecialDetail add CheckOpinions nvarchar(2000) null;
+
+----------------------------------------------------------修改人员表状态
+
+--1.禁用触发器
+alter table SitePerson_Person disable trigger SitePerson_Person_Bak_TRIGGER;
+
+--创建游标
+DECLARE @projectid nvarchar(50)  --定义变量
+ 
+DECLARE mycursor CURSOR FOR select projectid from base_project where ProjectState='3' --声明游标
+ 
+OPEN mycursor  --打开游标
+ 
+FETCH NEXT FROM mycursor INTO @projectid
+ 
+WHILE(@@FETCH_STATUS = 0)  --遍历所有的数据，@@FETCH_STATUS函数返回值为0表示FETCH语句执行成功
+BEGIN
+	update SitePerson_Person set IsUsed=0 where ProjectId=@projectid;--修改数据
+	FETCH NEXT FROM mycursor INTO @projectid --取下一条游标数据
+END
+ 
+CLOSE mycursor --关闭游标
+ 
+DEALLOCATE mycursor --删除游标
+GO
+
+--启用触发器
+alter table SitePerson_Person enable trigger SitePerson_Person_Bak_TRIGGER;
+

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

@@ -43,6 +43,18 @@ namespace BLL
                                   States = x.States,
                                   AttachUrl1 = APIUpLoadFileService.getFileUrl(x.CheckSpecialId, null),
                                   CheckSpecialDetailItems = getCheckSpecialDetailList(x.CheckSpecialId),
+
+                                  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,
+
+
+
                               };
                 return getInfo.FirstOrDefault();
             }
@@ -117,18 +129,38 @@ 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
                 };
                 //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 +199,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;
             }
@@ -238,6 +271,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.ToList();
             }
@@ -290,6 +324,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 +351,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 +360,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 +407,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/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/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/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,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Check {
+namespace FineUIPro.Web.HSSE.Check
+{
 
 
-    public partial class CheckSpecialView {
+    public partial class CheckSpecialView
+    {
 
         /// <summary>
         /// form1 控件。
@@ -75,6 +77,33 @@ 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>

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/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,65 @@ 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; }
+
     }
 }

SGGL/Model/Model.cs

@@ -59583,6 +59583,14 @@ namespace Model
 		
 		private string _CheckItemSetId;
 		
+		private string _ResponsibleUnit;
+		
+		private string _WorkAreaId;
+		
+		private string _QuestionType;
+		
+		private string _ResponsibleMan;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Technique_CheckItemSet> _Technique_CheckItemSet;
@@ -59623,6 +59631,14 @@ 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();
     #endregion
 		
 		public Check_CheckSpecial()
@@ -59960,6 +59976,86 @@ 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.AssociationAttribute(Name="FK_Check_CheckSpecial_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -60099,6 +60195,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 +60249,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 +60708,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
 		{

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
     }
 }