/ - Diff - HYTOS - 일정관리

ID2.Manager/ID2.Manager.Controller/Controllers/DocumentController.cs
16	16
17	17	public DocumentController(ID2ProjectInfo id2Info) : base(id2Info) { }
18	18
19		public IEnumerable<Documents> GetAllDocuments(string projectCode, string personIncharge, string jobLevel, string documentNo, string isToIsDiscussion, string isFrReviewStatus, string isID2Work, string id2Status, string avevaStatus, string prodIsResult, string clientIsResult)
	19	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)
20	20	{
21	21	using (DocumentRepository rep = new DocumentRepository(this._MSSQLCONNSTR))
22	22	{
23		return rep.GetAllDocuments(projectCode, personIncharge, jobLevel, documentNo, isToIsDiscussion, isFrReviewStatus, isID2Work, id2Status, avevaStatus, prodIsResult, clientIsResult);
	23	return rep.GetDocuments(projectCode, personIncharge, jobLevel, documentNo, isToIsDiscussion, isFrReviewStatus, isID2Work, id2Status, avevaStatus, prodIsResult, clientIsResult);
24	24	}
25	25	}
26	26
27		public IEnumerable<Documents> GetAllDocuments(List<ID2ProjectInfo> id2Infos, string projectCode, string personIncharge, string jobLevel, string documentNo, string isToIsDiscussion, string isFrReviewStatus, string isID2Work, string id2Status, string avevaStatus, string prodIsResult, string clientIsResult)
	27	public (IEnumerable<Documents> dwgs, int totalCnt) GetDocuments(List<ID2ProjectInfo> id2Infos, string projectCode, string personIncharge, string jobLevel, string documentNo, string isToIsDiscussion, string isFrReviewStatus, string isID2Work, string id2Status, string avevaStatus, string prodIsResult, string clientIsResult)
28	28	{
29		IEnumerable<Documents> docs = this.GetAllDocuments(projectCode, personIncharge, jobLevel, documentNo, isToIsDiscussion, isFrReviewStatus, isID2Work, id2Status, avevaStatus, prodIsResult, clientIsResult);
	29	IEnumerable<Documents> docs = this.GetDocuments(projectCode, personIncharge, jobLevel, documentNo, isToIsDiscussion, isFrReviewStatus, isID2Work, id2Status, avevaStatus, prodIsResult, clientIsResult).dwgs;
30	30	List<ID2Drawings> id2docs = null;
31	31
32	32	if (id2Infos.Any())
...	...
101	101	MarkupText = doc.MarkupText
102	102	};
103	103
104		return result;
	104	return (result, 0);
105	105
106	106	}
107		return docs;
	107	return (docs, 0);
108	108	}
109	109
110	110	public bool SetDocumentData(List<Documents> docList, List<Documents> delDocList)

+        {
             public DocumentRepository(string connectionStr) : base(connectionStr) { }
             public IEnumerable<Documents> GetAllDocuments(string projectCode, string personIncharge, string jobLevel, string documentNo, string isToIsDiscussion, string isFrReviewStatus, string isID2Work, string id2Status, string avevaStatus, string prodIsResult, string clientIsResult)
             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
     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);
                 StringBuilder sbWhere = new StringBuilder();
                 var parameters = new Dictionary<string, object>();
                 if (!string.IsNullOrEmpty(projectCode))
-...
       ) as MarkupText
     from     dbo.Documents doc
     where    doc.IsDeleted=0 {sbWhere}
     order by doc.Seq;";
     order by doc.Seq
     select @Total=count(*) from dbo.Documents
     select @Total;";
                 if (parameters.Count > 0)
+                {
                     var dynamicParameters = new DynamicParameters(parameters);
                     return Query<Documents>(query, dynamicParameters);
                     dynamicParameters.AddDynamicParams(parameters);
+                }
                 return Query<Documents>(query);
                 var ret = Query<Documents>(query, dynamicParameters);
                 int totalCount = dynamicParameters.Get<int>("Total");
                 return (ret, totalCount);
+            }
             public bool SetDocumentData(List<Documents> docList, List<Documents> delDocList)

                     string prodIsResult = this.radDropDownListProdIsResult.SelectedValue.ToString();//
                     string clientIsResult = this.radDropDownListClientIsResult.SelectedValue.ToString();//
                     this.documents = new DocumentController().GetAllDocuments(projectCode, personIncharge, jobLevel, documentNo, isToIsDiscussion, isFrReviewStatus, isID2Work, id2Status, avevaStatus, prodIsResult, clientIsResult).ToList();
                     var (dwgs, totalCnt) = new DocumentController().GetDocuments(projectCode, personIncharge, jobLevel, documentNo, isToIsDiscussion, isFrReviewStatus, isID2Work, id2Status, avevaStatus, prodIsResult, clientIsResult);
                     this.documents = dwgs.ToList();
                     this.orgDocuments = JsonConvert.DeserializeObject<List<Documents>>(JsonConvert.SerializeObject(this.documents));
                     this.lbSelectAndTotal.Text = totalCnt.ToString();
                     List<string> projectCodes = new List<string>();
-...
                     string clientIsResult = this.radDropDownListClientIsResult.SelectedValue.ToString();
                     var id2Prjs = informations.ProjectList.Where(x => x.GroupID.Equals(informations.ActiveProject.ProjectID)).Select(x => x.ID2Info).ToList();
                     this.documents = new DocumentController().GetAllDocuments(id2Prjs, projectCode, personIncharge, jobLevel, documentNo, isToIsDiscussion, isFrReviewStatus, isID2Work, id2Status, avevaStatus, prodIsResult, clientIsResult).ToList();
                     var(dwgs, totalCnt) = new DocumentController().GetDocuments(id2Prjs, projectCode, personIncharge, jobLevel, documentNo, isToIsDiscussion, isFrReviewStatus, isID2Work, id2Status, avevaStatus, prodIsResult, clientIsResult);
                     this.documents = dwgs.ToList();
                     this.orgDocuments = JsonConvert.DeserializeObject<List<Documents>>(JsonConvert.SerializeObject(this.documents));
                     this.lbSelectAndTotal.Text = totalCnt.ToString();
+                }
+            }

ID	7066b8a9848b962cf44d50c0c3eafadbe94c09f0
상위	d30305e5
하위	7db33dd9

프로젝트

일반

사용자정보

HYTOS

개정판 7066b8a9