提交

username@email.com

2023-08-31 633193b38b094ee2e0651cf64b95fb5b559c8714

提交

 DocumentServiceAPI.Application/ProjectInfo/ProjectInfoController.cs

@@ -471,7 +471,7 @@
        /// </summary>
        /// <param name="page"></param>
        /// <returns></returns>
        public PageResult<Document_TBXYFile> postDocumentTBXYFileList(DocumentProjectInfoPageSearch page)
        public PageResult<DocumentTBXYFileDTO> postDocumentTBXYFileList(DocumentProjectInfoPageSearch page)
        {
            return _projectInfoService.postDocumentTBXYFileList(page);
        }
@@ -550,5 +550,14 @@
        {
            return _projectInfoService.SaveFileInfo(dp);
        }


        /// <summary>
        /// 获取方案类别GetOtherCompanyTenderInfoList
        /// </summary>
        public List<Doc_Classification> GetDocClassificationList()
        {
            return _projectInfoService.GetDocClassificationList();
        }
    }
}

 DocumentServiceAPI.Application/ProjectInfo/Services/Interfaces/IProjectInfoService.cs

@@ -100,7 +100,7 @@
        public bool SaveDocumentZhaobiaoFileInfo(Document_ZhaobiaoFile dp);


        public PageResult<Document_TBXYFile> postDocumentTBXYFileList(DocumentProjectInfoPageSearch page);
        public PageResult<DocumentTBXYFileDTO> postDocumentTBXYFileList(DocumentProjectInfoPageSearch page);

        public Document_TBXYFile GetDocumentTBXYFileInfo(int ID);

@@ -116,5 +116,8 @@
        public int SaveDocInfo(Doc_Info dp);

        public bool SaveFileInfo(File_Info dp);


        public List<Doc_Classification> GetDocClassificationList(); 
    }
}

 DocumentServiceAPI.Application/ProjectInfo/Services/ProjectInfoService.cs

@@ -1642,7 +1642,7 @@



        public PageResult<Document_TBXYFile> postDocumentTBXYFileList(DocumentProjectInfoPageSearch page)
        public PageResult<DocumentTBXYFileDTO> postDocumentTBXYFileList(DocumentProjectInfoPageSearch page)
        {
            var aaa = GetJwtInfo();

@@ -1651,7 +1651,7 @@
            pg.PageIndex = page.PageIndex;
            //page.ToEmployeeId = a.EID;
            int total = 0;
            PageResult<Document_TBXYFile> result = new PageResult<Document_TBXYFile>();
            PageResult<DocumentTBXYFileDTO> result = new PageResult<DocumentTBXYFileDTO>();



@@ -1659,8 +1659,10 @@
                .Where(a => a.UnitId == page.UnitId && a.ProjectId == page.ProjectId)
             //文件名称
             .WhereIF(!string.IsNullOrEmpty(page.FileName), a => a.FileName.Contains(page.FileName))
                .WhereIF(page.Classification>0, a => a.Classification == page.Classification)
                   .WhereIF(!string.IsNullOrEmpty(page.FilePath), a => ( a.FilePath !=null && a.FilePath != ""))

             .Select(a => new Document_TBXYFile
             .Select(a => new DocumentTBXYFileDTO
             {
                 Id = a.Id,
                 FileName = a.FileName,
@@ -1673,11 +1675,24 @@
                 AdviseFlag = a.AdviseFlag,
                 UserId = a.UserId,
                 Sort = a.Sort,

                 Classification = a.Classification,
             }
              )
             .OrderBy(a => a.Sort).ToPageList(page.PageIndex, page.PageSize, ref total);


            if(result.Items !=null&& result.Items.Count > 0)
            {
                var doc_Classifications = _db.Queryable<Doc_Classification>().Where(x => x.parent_code == "003").ToList();//执行查询
                foreach (var item in result.Items)
                {
                    var doc_Classification = doc_Classifications.Where(x => x.id == item.Classification).FirstOrDefault();
                    if (doc_Classification != null)
                    {
                        item.ClassificationName = doc_Classification.doc_classification;
                    }
                }
            }

            result.TotalCount = total;
            result.TotalPage = total % page.PageSize == 0 ? total / page.PageSize : total / page.PageSize + 1;
@@ -1745,7 +1760,7 @@
                UserId = a.UserId,
                Sort = a.Sort,
                    SaveFlag = a.SaveFlag,

                    Classification  = a.Classification,
                }).OrderBy(a => a.Sort).ToList();
            return ret;
        }
@@ -1785,5 +1800,12 @@
            return true;
        }


        public List<Doc_Classification> GetDocClassificationList()
        {
            var ret = _db.Queryable<Doc_Classification>().Where(x => x.parent_code =="003" && x.status == 1).ToList();
            return ret;
        }

    }
}

 DocumentServiceAPI.Application/ProjectInfo/ViewMode/DocumentProjectInfoDTO.cs

@@ -57,6 +57,9 @@
        public string txtEmployeeId { get; set; }
        public string projectName { get; set; }
        public string txtWorkItem { get; set; }
        public int Classification { get; set; }

        public string FilePath { get; set; }

    }
    public class DocumentProjectInfoDTO
@@ -449,5 +452,7 @@
        /// </summary>           
        public int CountyId { get; set; }

     

    }
}

 DocumentServiceAPI.Application/ProjectInfo/ViewMode/DocumentTBXYFileDTO.cs

New file
@@ -0,0 +1,130 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace DocumentServiceAPI.Application.ProjectInfo.ViewMode
{
    public class DocumentTBXYFileDTO
    {
        public DocumentTBXYFileDTO()
        {


        }
        /// <summary>
        /// Desc:
        /// Default:
        /// Nullable:False
        /// </summary>           
        public int Id { get; set; }

        /// <summary>
        /// Desc:
        /// Default:
        /// Nullable:False
        /// </summary>           
        public string FileName { get; set; }

        /// <summary>
        /// Desc:
        /// Default:
        /// Nullable:False
        /// </summary>           
        public string FilePath { get; set; }

        /// <summary>
        /// Desc:
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string FileVersionNo { get; set; }

        /// <summary>
        /// Desc:
        /// Default:
        /// Nullable:True
        /// </summary>           
        public int? FileSize { get; set; }

        /// <summary>
        /// Desc:
        /// Default:
        /// Nullable:False
        /// </summary>           
        public int UnitId { get; set; }

        /// <summary>
        /// Desc:
        /// Default:
        /// Nullable:True
        /// </summary>           
        public DateTime? LastUpdateTime { get; set; }

        /// <summary>
        /// Desc:
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string LastUpdateName { get; set; }

        /// <summary>
        /// Desc:
        /// Default:
        /// Nullable:True
        /// </summary>           
        public int? AdviseFlag { get; set; }

        /// <summary>
        /// Desc:
        /// Default:
        /// Nullable:True
        /// </summary>           
        public int? UserId { get; set; }

        /// <summary>
        /// Desc:
        /// Default:
        /// Nullable:True
        /// </summary>           
        public int? ProjectId { get; set; }

        /// <summary>
        /// Desc:
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string FileContent { get; set; }

        /// <summary>
        /// Desc:
        /// Default:
        /// Nullable:True
        /// </summary>           
        public int? Sort { get; set; }

        /// <summary>
        /// Desc:
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string FileContentRTF { get; set; }

        /// <summary>
        /// Desc:
        /// Default:
        /// Nullable:True
        /// </summary>           
        public int? SaveFlag { get; set; }

        /// <summary>
        /// Desc:
        /// Default:
        /// Nullable:True
        /// </summary>           
        public int? Classification { get; set; }

        public string ClassificationName { get; set; }
    }
}

 DocumentServiceAPI.Model/cyDocumentModel/Document_TBXYFile.cs

@@ -126,7 +126,11 @@
        /// </summary>           
        public int? SaveFlag { get; set; }

        

        /// <summary>
        /// Desc:
        /// Default:
        /// Nullable:True
        /// </summary>           
        public int? Classification { get; set; }
    }
}