/ - Diff - HYTOS - 일정관리

개정판 54977253

ID	54977253274659b86b0ee1e15d758fe39a7a4f24
상위	448d805e
하위	a597e7cf

유성호이(가) 약 2년 전에 추가함

issue #0000
전체 document 조회 추가
ID2 작업 : 시작시간, 종료 시간 있을 시 일:시:분:초 포멧으로 작업시간 보여주기
ID2 종료 시간 업데이트 로직 추가(ID2 Sync)

Change-Id: I8810e653bcd7c189b8b756df9d8e471ba7cc30f5

             public DocumentController(ID2ProjectInfo id2Info) : base(id2Info) { }
             public IEnumerable<Documents> GetAllDocuments()
+            {
                 using (DocumentRepository rep = new DocumentRepository(this._MSSQLCONNSTR))
+                {
                     return rep.GetAllDocuments();
+                }
+            }
             public (IEnumerable<Documents> dwgs, int totalCnt) GetDocuments(string projectCode, string personIncharge, string jobLevel, string documentNo, string isToIsDiscussion, string isFrReviewStatus, string isID2Work, string id2Status, string avevaStatus, string prodIsResult, string clientIsResult)
+            {
                 using (DocumentRepository rep = new DocumentRepository(this._MSSQLCONNSTR))
-...
                 return (docs, 0);
+            }
             public bool SetDocumentData(List<Documents> docList, List<Documents> delDocList)
             public bool SetDocumentData(List<Documents> docList, List<Documents> delDocList, string userId)
+            {
                 using (DocumentRepository rep = new DocumentRepository(this._MSSQLCONNSTR))
+                {
                     return rep.SetDocumentData(docList, delDocList);
                     return rep.SetDocumentData(docList, delDocList, userId);
+                }
+            }
-...
                     return rep.GetID2DrawingsByProject(id2Info);
+                }
+            }
             public bool SetID2Sync(List<ID2ProjectInfo> id2Infos, string userId)
+            {
                 bool isSuccess = false;
                 try
+                {
                     IEnumerable<Documents> docs = this.GetAllDocuments();
                     List<ID2Drawings> id2docs = null;
                     if (id2Infos.Any())
+                    {
                         id2docs = new List<ID2Drawings>();
                         id2Infos.ForEach(x =>
+                        {
                             id2docs.AddRange(new DocumentController(x).GetID2DrawingsByProject(x));
                         });
+                    }
                     if (docs != null && id2docs != null && docs.Any() && id2docs.Any())
+                    {
                         var result = from doc in docs
                                      join id2 in id2docs on new { projCd = doc.RefProjectCode, DocNo = doc.DocumentNo } equals new { projCd = id2.PROJECTNAME, DocNo = id2.DOCNAME }
                                      select new Documents()
+                                     {
                                          DocID = doc.DocID,
                                          ID2EndDate = id2?.DATETIME == null ? (DateTime?)null : Convert.ToDateTime(id2?.DATETIME)
                                      };
                         if (result.Any())
+                        {
                             using (DocumentRepository rep = new DocumentRepository(this._MSSQLCONNSTR))
+                            {
                                 isSuccess = rep.SetDocumentDatasField(result.ToList(), userId);
+                            }
+                        }
+                    }
+                }
                 catch (Exception ex)
+                {
                     throw ex;
+                }
                 return isSuccess;
+            }
+        }
+    }

     using System.Text;
     using System.Threading.Tasks;
     using System.Data;
     using ID2.Manager.Data.Models;
     using Dapper;
-...
             public IEnumerable<Documents> GetAllDocuments()
+            {
                 string query = $@"
     select   doc.*,
+      (
         select markus.*
     	from [markus_SEC].[dbo].[ViewMarkupData] markus where doc.DocumentNo = markus.DOCUMENT_ID
     	FOR JSON PATH
       ) as MarkupText
     select   doc.*
     from     dbo.Documents doc
     where    doc.IsDeleted=0
     order by doc.Seq;";
                 return Query<Documents>(query);
+            }
             public (IEnumerable<Documents> dwgs, int totalCnt) GetDocuments(string projectCode, string personIncharge, string jobLevel, string documentNo, string isToIsDiscussion, string isFrReviewStatus, string isID2Work, string id2Status, string avevaStatus, string prodIsResult, string clientIsResult)
+            {
                 var dynamicParameters = new DynamicParameters();
                 dynamicParameters.Add("Total", dbType: System.Data.DbType.Int32, direction: System.Data.ParameterDirection.Output);
                 dynamicParameters.Add("Total", dbType: DbType.Int32, direction: ParameterDirection.Output);
                 StringBuilder sbWhere = new StringBuilder();
                 var parameters = new Dictionary<string, object>();
-...
+                }
                 string query = $@"
     select   doc.*,
     select   doc.*, datediff(SECOND, doc.ID2StartDate, doc.ID2EndDate) as ID2JobTime,
+      (
         select markus.*
-...
                 return (ret, totalCount);
+            }
             public bool SetDocumentData(List<Documents> docList, List<Documents> delDocList)
             public bool SetDocumentData(List<Documents> docList, List<Documents> delDocList, string userId)
+            {
                 bool isSuccess = false;
-...
                                 query = $@"
     update dbo.Documents
     set    IsDeleted=1
           ,DeletedDate=getdate()
     where  [DocID] in ('{docIDList}');";
                                 base.Execute(query, transaction);
           ,DeletedDate=getdate(),
           ,DeletedUser=@DeletedUser
     where  DocID in ('{docIDList}');";
                                 base.Execute(query, new { DeletedUser = userId }, transaction);
+                            }
+                        }
-...
+                        {
                             if (string.IsNullOrEmpty(doc.DocID))
+                            {
                                 doc.RegisteredUser = userId;
                                 query = $@"
     insert into dbo.Documents
+    (
          [DocID]
         ,[DocumentNo]
         ,[RevisonNo]
         ,[RefProjectCode]
         ,[DocFilePath]
         ,[DocFileName]
         ,[JobLevel]
         ,[IsTypical]
         ,[PersonInCharge]
         ,[ToIsDiscussion]
         ,[ToRemarks]
         ,[ToCreator]
         ,[ToCapture]
         ,[ToIsMarkup]
         ,[FrReviewStatus]
         ,[FrRemarks]
         ,[FrCreator]
         ,[FrCapture]
         ,[FrIsMarkup]
         ,[IsID2Work]
         ,[ID2Connection]
         ,[ID2StartDate]
         ,[ID2EndDate]
         ,[ID2JobTime]
         ,[ID2Status]
         ,[ID2Issues]
         ,[AVEVAConnection]
         ,[AVEVAConvertDate]
         ,[AVEVAReviewDate]
         ,[AVEVAStatus]
         ,[AVEVAIssues]
         ,[ReviewFilePath]
         ,[ReviewFileName]
         ,[ProdReviewer]
         ,[ProdIsResult]
         ,[ProdRemarks]
         ,[ClientReviewer]
         ,[ClientIsResult]
         ,[ClientRemarks]
         ,[DTIsGateWay]
         ,[DTIsImport]
         ,[DTIsRegSystem]
         ,[DTRemarks]
          DocID
         ,DocumentNo
         ,RevisonNo
         ,RefProjectCode
         ,DocFilePath
         ,DocFileName
         ,JobLevel
         ,IsTypical
         ,PersonInCharge
         ,RegisteredDate
         ,RegisteredUser
         ,ToIsDiscussion
         ,ToRemarks
         ,ToCreator
         ,ToCapture
         ,ToIsMarkup
         ,FrReviewStatus
         ,FrRemarks
         ,FrCreator
         ,FrCapture
         ,FrIsMarkup
         ,IsID2Work
         ,ID2Connection
         ,ID2StartDate
         ,ID2EndDate
         ,ID2JobTime
         ,ID2Status
         ,ID2Issues
         ,AVEVAConnection
         ,AVEVAConvertDate
         ,AVEVAReviewDate
         ,AVEVAStatus
         ,AVEVAIssues
         ,ReviewFilePath
         ,ReviewFileName
         ,ProdReviewer
         ,ProdIsResult
         ,ProdRemarks
         ,ClientReviewer
         ,ClientIsResult
         ,ClientRemarks
         ,DTIsGateWay
         ,DTIsImport
         ,DTIsRegSystem
         ,DTRemarks
+    )
     values
+    (
-...
         ,@JobLevel
         ,@IsTypical
         ,@PersonInCharge
         ,getdate()
         ,@RegisteredUser
         ,@ToIsDiscussion
         ,@ToRemarks
         ,@ToCreator
-...
+                            }
                             else
+                            {
                                 doc.ModifiedUser = userId;
                                 query = $@"
     update dbo.Documents
     set    [DocumentNo]=@DocumentNo
           ,[RevisonNo]=@RevisonNo
           ,[RefProjectCode]=@RefProjectCode
           ,[DocFilePath]=@DocFilePath
           ,[DocFileName]=@DocFileName
           ,[JobLevel]=@JobLevel
           ,[IsTypical]=@IsTypical
           ,[PersonInCharge]=@PersonInCharge
           ,[ModifiedDate]=getdate()
           ,[ToIsDiscussion]=@ToIsDiscussion
           ,[ToRemarks]=@ToRemarks
           ,[ToCreator]=@ToCreator
           ,[ToCapture]=@ToCapture
           ,[ToIsMarkup]=@ToIsMarkup
           ,[FrReviewStatus]=@FrReviewStatus
           ,[FrRemarks]=@FrRemarks
           ,[FrCreator]=@FrCreator
           ,[FrCapture]=@FrCapture
           ,[FrIsMarkup]=@FrIsMarkup
           ,[IsID2Work]=@IsID2Work
           ,[ID2Connection]=@ID2Connection
           ,[ID2StartDate]=@ID2StartDate
           ,[ID2EndDate]=@ID2EndDate
           ,[ID2JobTime]=@ID2JobTime
           ,[ID2Status]=@ID2Status
           ,[ID2Issues]=@ID2Issues
           ,[AVEVAConnection]=@AVEVAConnection
           ,[AVEVAConvertDate]=@AVEVAConvertDate
           ,[AVEVAReviewDate]=@AVEVAReviewDate
           ,[AVEVAStatus]=@AVEVAStatus
           ,[AVEVAIssues]=@AVEVAIssues
           ,[ReviewFilePath]=@ReviewFilePath
           ,[ReviewFileName]=@ReviewFileName
           ,[ProdReviewer]=@ProdReviewer
           ,[ProdIsResult]=@ProdIsResult
           ,[ProdRemarks]=@ProdRemarks
           ,[ClientReviewer]=@ClientReviewer
           ,[ClientIsResult]=@ClientIsResult
           ,[ClientRemarks]=@ClientRemarks
           ,[DTIsGateWay]=@DTIsGateWay
           ,[DTIsImport]=@DTIsImport
           ,[DTIsRegSystem]=@DTIsRegSystem
           ,[DTRemarks]=@DTRemarks
     where  [DocID]=@DocID;";
     set    DocumentNo=@DocumentNo
           ,RevisonNo=@RevisonNo
           ,RefProjectCode=@RefProjectCode
           ,DocFilePath=@DocFilePath
           ,DocFileName=@DocFileName
           ,JobLevel=@JobLevel
           ,IsTypical=@IsTypical
           ,PersonInCharge=@PersonInCharge
           ,ModifiedDate=getdate()
           ,ModifiedUser=@ModifiedUser
           ,ToIsDiscussion=@ToIsDiscussion
           ,ToRemarks=@ToRemarks
           ,ToCreator=@ToCreator
           ,ToCapture=@ToCapture
           ,ToIsMarkup=@ToIsMarkup
           ,FrReviewStatus=@FrReviewStatus
           ,FrRemarks=@FrRemarks
           ,FrCreator=@FrCreator
           ,FrCapture=@FrCapture
           ,FrIsMarkup=@FrIsMarkup
           ,IsID2Work=@IsID2Work
           ,ID2Connection=@ID2Connection
           ,ID2StartDate=@ID2StartDate
           ,ID2EndDate=@ID2EndDate
           ,ID2JobTime=@ID2JobTime
           ,ID2Status=@ID2Status
           ,ID2Issues=@ID2Issues
           ,AVEVAConnection=@AVEVAConnection
           ,AVEVAConvertDate=@AVEVAConvertDate
           ,AVEVAReviewDate=@AVEVAReviewDate
           ,AVEVAStatus=@AVEVAStatus
           ,AVEVAIssues=@AVEVAIssues
           ,ReviewFilePath=@ReviewFilePath
           ,ReviewFileName=@ReviewFileName
           ,ProdReviewer=@ProdReviewer
           ,ProdIsResult=@ProdIsResult
           ,ProdRemarks=@ProdRemarks
           ,ClientReviewer=@ClientReviewer
           ,ClientIsResult=@ClientIsResult
           ,ClientRemarks=@ClientRemarks
           ,DTIsGateWay=@DTIsGateWay
           ,DTIsImport=@DTIsImport
           ,DTIsRegSystem=@DTIsRegSystem
           ,DTRemarks=@DTRemarks
     where  DocID=@DocID;";
+                            }
                             base.Execute(query, doc, transaction);
+                        }
-...
                             if (parameters.Count > 0)
+                            {
                                 sbSet.Append(" ,DocID=@DocID ");
                                 parameters.Add("DocID", doc.DocID);
                                 sbSet.Append(" ,ModifiedUser=@ModifiedUser ");
                                 parameters.Add("ModifiedUser", userId);
                                 parameters.Add("DocID", doc.DocID);
                                 query = $@"
     declare @DateTimeNow datetime
     set @DateTimeNow = getdate()
-...
                 return resultData;
+            }
             public bool SetDocumentDatasField(List<Documents> docs, string userId)
+            {
                 bool isSuccess = false;
                 try
+                {
                     using (var transaction = base.BeginTransaction())
+                    {
                         foreach (Documents doc in docs)
+                        {
                             string query = string.Empty;
                             if (!string.IsNullOrEmpty(doc.DocID))
+                            {
                                 StringBuilder sbSet = new StringBuilder();
                                 var parameters = new Dictionary<string, object>();
                                 #region Update 할 목록
                                 if (doc.ID2EndDate != null)
+                                {
                                     sbSet.Append(" ,ID2EndDate=@ID2EndDate ");
                                     parameters.Add("ID2EndDate", doc.ID2EndDate);
+                                }
                                 #endregion
                                 if (parameters.Count > 0)
+                                {
                                     sbSet.Append(" ,ModifiedUser=@ModifiedUser ");
                                     parameters.Add("ModifiedUser", userId);
                                     parameters.Add("DocID", doc.DocID);
                                     query = $@"
     update dbo.Documents
     set    ModifiedDate=getdate() {sbSet}
     where  [DocID]=@DocID;";
                                      base.Execute(query, parameters, transaction);
+                                }
+                            }
+                        }
                         transaction.Commit();
                         isSuccess = true;
+                    }
+                }
                 catch (Exception ex)
+                {
                     throw ex;
+                }
                 return isSuccess;
+            }
             //ID2
             public IEnumerable<ID2Drawings> GetID2DrawingsByProject(ID2ProjectInfo id2Info)

             [DataMember]
             public DateTime? DeletedDate { get; set; }
             [DataMember]
             public string RegisteredUser { get; set; }
             [DataMember]
             public string ModifiedUser { get; set; }
             [DataMember]
             public string DeletedUser { get; set; }
             [DataMember]
             public string ToIsDiscussion { get; set; }
             [DataMember]
             public string ToRemarks { get; set; }
-...
             public DateTime? ID2EndDate { get; set; }
             [DataMember]
             public int ID2JobTime { get; set; }
             public string ID2JobTimetoString
+            {
                 get
+                {
                     StringBuilder sbTemp;
                     if (ID2JobTime > 0)
+                    {
                         sbTemp = new StringBuilder(TimeSpan.FromSeconds(Convert.ToInt32(ID2JobTime)).ToString(@"dd\:hh\:mm\:ss"));
+                    }
                     else if (ID2JobTime < 0)
+                    {
                         sbTemp = new StringBuilder(TimeSpan.FromSeconds(Convert.ToInt32(ID2JobTime)).ToString(@"dd\:hh\:mm\:ss"));
                         sbTemp.Insert(0, "-");
+                    }
                     else
+                    {
                         sbTemp = new StringBuilder();
+                    }
                     return sbTemp.ToString();
+                }
+            }
             [DataMember]
             public string ID2Status { get; set; }
             [DataMember]

                 gridViewDateTimeColumn2.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
                 gridViewDateTimeColumn2.Width = 120;
                 gridViewTextBoxColumn5.EnableExpressionEditor = false;
                 gridViewTextBoxColumn5.FieldName = "ID2JobTime";
                 gridViewTextBoxColumn5.FieldName = "ID2JobTimetoString";
                 gridViewTextBoxColumn5.HeaderText = "작업시간";
                 gridViewTextBoxColumn5.Name = "ID2JobTime";
                 gridViewTextBoxColumn5.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;

                     var worker = new DocumentsWorker(this.documents, this.orgDocuments, setDocuments, delDocuments, this.radGridViewDocuments);
                     worker.OnWorkCompletedHandler += () =>
+                    {
                         bool result = new DocumentController().SetDocumentData(setDocuments, delDocuments);
                         bool result = new DocumentController().SetDocumentData(setDocuments, delDocuments, informations.ActiveUser.ID);
                         bool markusResult = new MarkusInfoController().SetMarkusInfo(this.documents);
-...
             private void RadButtonElementSync_Click(object sender, EventArgs e)
+            {
                 this.GetDocListbyID2();
                 this.DocumentListBinding();
                 if (RadMessageBox.Show("Do you want to ID2 Sync?", Globals.Name, MessageBoxButtons.YesNo, RadMessageIcon.Question) == DialogResult.Yes)
+                {
                     var id2Prjs = informations.ProjectList.Where(x => x.GroupID.Equals(informations.ActiveProject.ProjectID)).Select(x => x.ID2Info).ToList();
                     bool result = new DocumentController().SetID2Sync(id2Prjs, informations.ActiveUser.ID);
                     if (result)
+                    {
                         this.GetDocListbyID2();
                         this.DocumentListBinding();
+                    }
+                }
+            }
             private void RadButtonElementRefreshCommand_Click(object sender, EventArgs e)

내보내기 Unified diff

프로젝트

일반

사용자정보

HYTOS

개정판 54977253