프로젝트

일반

사용자정보

개정판 faebcce2

IDfaebcce2f8d856d9f8e01a1e4d650e72d7ce4017
상위 1e9c1261
하위 15183831

김태성이(가) 4년 이상 전에 추가함

final에서 폰트 검색 수정
kcomdatamodel에서 member를 RawQuery로 가져오도록 변경

Change-Id: Ibf98408afeb03209594f445837309a4413f8bb1c

차이점 보기:

FinalService/KCOM_FinalService/MarkupToPDF/MarkupToPDF.cs
568 568
        {
569 569
            try
570 570
            {
571
                List<MEMBER> memberlist = null;
571
        
572 572
                FileInfo tempFileInfo = new FileInfo(testFile);
573 573

  
574 574
                if (!Directory.Exists(_FinalPDFStorgeLocal))
......
576 576
                    Directory.CreateDirectory(_FinalPDFStorgeLocal);
577 577
                }
578 578
                string pdfFilePath = Path.Combine(_FinalPDFStorgeLocal, tempFileInfo.Name);
579
                using (CIEntities cIEntities = new CIEntities(KCOMDataModel.Common.ConnectStringBuilder.ProjectCIConnectString(finaldata.PROJECT_NO).ToString()))
580
                {
581
                    memberlist = cIEntities.MEMBER.ToList();
582
                }
579
          
580

  
583 581
                using (KCOMEntities _entity = new KCOMEntities(ConnectStringBuilder.KCOMConnectionString().ToString()))
584 582
                {
585 583
                    FINAL_PDF pdfLink = _entity.FINAL_PDF.Where(data => data.ID == finaldata.ID).FirstOrDefault();
......
588 586
                    using (Stream pdfStream = new FileInfo(testFile).Open(FileMode.Open, FileAccess.ReadWrite)) //
589 587
                    {
590 588
                        StatusChange("comment Cover",0);
591

  
589
                        
592 590
                        PdfReader pdfReader = new PdfReader(pdfStream);
593 591
                        //List<Dictionary<string, object>> lstoutlineTop = new List<Dictionary<string, object>>();
594 592
                        Dictionary<string, object> bookmark;
595 593
                        List<Dictionary<string, object>> outlines;
594

  
596 595
                        outlines = new List<Dictionary<string, object>>();
597 596
                        List<Dictionary<string, object>> root = new List<Dictionary<string, object>>();
598 597

  
599 598
                        var dic = new Dictionary<string, object>();
599

  
600 600
                        foreach (var data in MarkupDataSet)
601 601
                        {
602 602
                            StatusChange("MarkupDataSet", 0);
603 603

  
604 604
                            string userid = data.MARKUP_INFO_VERSION.MARKUP_INFO.USER_ID;
605 605

  
606
                            var member = memberlist.Where(u => u.ID == userid).FirstOrDefault();
607
                            string username = member.NAME;
608
                            string userdept = member.DEPARTMENT;
606
                            string username = "";
607
                            string userdept = "";
608

  
609
                            using (CIEntities cIEntities = new CIEntities(KCOMDataModel.Common.ConnectStringBuilder.ProjectCIConnectString(finaldata.PROJECT_NO).ToString()))
610
                            {
611
                                var memberlist = KCOMDataModel.Common.ObjectQuery.GetMemberQuery(cIEntities, userid);
612

  
613
                                if(memberlist.Count() > 0)
614
                                {
615
                                    username = memberlist.First().NAME;
616
                                    userdept = memberlist.First().DEPARTMENT;
617
                                }
618
                            }
619

  
609 620
                            bookmark = new Dictionary<string, object>();
610 621
                            bookmark.Add("Title", string.Format("User:{0}[{1}] Commented Page : {2}", username, userdept, data.PAGENUMBER));
611 622
                            bookmark.Add("Page", data.PAGENUMBER + " Fit");

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)