最新代码

username@email.com

2023-09-06 f7ff76aeadd7d92da92ee65ed658b636fa4e8036

最新代码

 DocumentFile.Service/Program.cs

@@ -46,7 +46,7 @@
    c.DefaultModelsExpandDepth(-1);
});

app.UseHttpsRedirection();
//app.UseHttpsRedirection();

app.UseAuthorization();


 DocumentServiceAPI.Application/DocManage/DocClassificationManageAppService.cs

@@ -42,11 +42,11 @@
            PageResult<Doc_Classification> result = new PageResult<Doc_Classification>();
            if (page.Status.HasValue)
            {
                result.Items = await _classificationService.GetPageListAsync(c => c.status ==page.Status && c.parent_code == page.Code,pg,c=>c.sort_id,OrderByType.Asc);
                result.Items = await _classificationService.GetPageListAsync(c => c.status ==page.Status  && c.parent_code == page.Code && c.is_system == false , pg,c=>c.sort_id,OrderByType.Asc);
            }
            else
            {
                result.Items = await _classificationService.GetPageListAsync(c => c.parent_code == page.Code, pg, c => c.sort_id, OrderByType.Asc);
                result.Items = await _classificationService.GetPageListAsync(c => c.parent_code == page.Code && c.is_system == false , pg, c => c.sort_id, OrderByType.Asc);
            }
            result.TotalCount = pg.TotalCount;
            result.PageIndex = pg.PageIndex;

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

@@ -119,5 +119,7 @@


        public List<Doc_Classification> GetDocClassificationList(); 

        public bool SaveDocumentTBXYFileInfoNotRep(Document_TBXYFile dp);
    }
}

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

@@ -44,5 +44,20 @@


        public PageResult<Document_PerformanceInfo> GetDocumentPerformanceInfoListByPaper(DocumentProjectInfoPageSearch page);

        public PageResult<DocumentProjectInfoDTO> postGetFinancialList(DocumentProjectInfoPageSearch page);



        public PageResult<Document_LayInfo> postDocumentLayInfoList(DocumentProjectInfoPageSearch page);

        public bool GetDelDocumentLayInfo(int ID);

        public bool SaveDocumentLayInfo(Document_LayInfo dp);

        public Document_LayInfo GetDocumentLayInfo(int ID);

        public Document_LayInfo GetDocumentLayInfoByName(string LayName);

    }
}

 DocumentServiceAPI.Application/ProjectInfo/Services/ProjectInfoService.cs

@@ -1803,9 +1803,24 @@

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

        public bool SaveDocumentTBXYFileInfoNotRep(Document_TBXYFile dp)
        {

            if (dp.Id > 0)
            {
                _db.Updateable<Document_TBXYFile>(dp).ExecuteCommand();
            }
            else
            {
                _db.Insertable<Document_TBXYFile>(dp).ExecuteCommand();
            }

            return true;
        }

    }
}

 DocumentServiceAPI.Application/ProjectInfo/Services/SheZhiService.cs

@@ -609,5 +609,338 @@
            return jwtInfo;
        }


        public PageResult<DocumentProjectInfoDTO> postGetFinancialList(DocumentProjectInfoPageSearch page)
        {
            var aaa = GetJwtInfo();

            SqlSugar.PageModel pg = new SqlSugar.PageModel();
            pg.PageSize = page.PageSize;
            pg.PageIndex = page.PageIndex;
            //page.ToEmployeeId = a.EID;
            int total = 0;
            PageResult<DocumentProjectInfoDTO> result = new PageResult<DocumentProjectInfoDTO>();



            result.Items = _db.Queryable<Document_ProjectInfo, Document_ProjectExpand>((a, d) =>
              new JoinQueryInfos
              (
             JoinType.Left, a.ProjectId == d.ProjectId && d.UnitId == page.UnitId
                
                  ))
                .Where((a, d) => a.TenantID == aaa.TEID)
                //省
                .WhereIF(!string.IsNullOrEmpty(page.Province) && page.Province != "请选择", (a, d) => (a.Province == page.Province))
                //市
                .WhereIF(!string.IsNullOrEmpty(page.City) && page.City != "请选择", (a, d) => (a.City == page.City))
                //区县
                .WhereIF(!string.IsNullOrEmpty(page.County) && page.County != "请选择", (a, d) => (a.County == page.County))
            //报名时间
                .WhereIF(!string.IsNullOrEmpty(page.ddlSignupStartTime), (a, d) => a.SignupStartTime >= DateTime.Parse(page.ddlSignupStartTime))
                //报名时间
                .WhereIF(!string.IsNullOrEmpty(page.ddlSignupEndTime), (a, d) => a.SignupEndTime <= DateTime.Parse(page.ddlSignupEndTime))
            //开标时间
            .WhereIF(!string.IsNullOrEmpty(page.ddlTenderStartTime), (a, d) => a.TenderTime >= DateTime.Parse(page.ddlTenderStartTime))
            //开标时间
            .WhereIF(!string.IsNullOrEmpty(page.ddlTenderEndTime), (a, d) => a.TenderTime <= DateTime.Parse(page.ddlTenderEndTime))
             //采购方式
             .WhereIF(page.ddlPurchaseMethod > 0, (a, d) => a.PurchaseMethod == page.ddlPurchaseMethod)
             //项目名称
             .WhereIF(!string.IsNullOrEmpty(page.txtProjectName), (a, d) => a.ProjectName.Contains(page.txtProjectName))
              //项目编号
              .WhereIF(!string.IsNullOrEmpty(page.txtProjectCode), (a, d) => a.ProjectCode.Contains(page.txtProjectCode))
                //采购单位
                .WhereIF(!string.IsNullOrEmpty(page.txtPurchaseUnit), (a, d) => a.PurchaseUnit.Contains(page.txtPurchaseUnit))
                 //代理机构
                 .WhereIF(!string.IsNullOrEmpty(page.txtAgencyUnit), (a, d) => a.AgencyUnit.Contains(page.txtAgencyUnit))
                   ////投标人
                   //.WhereIF(!string.IsNullOrEmpty(page.txtTenderPerson), (a, d) => d.TenderPerson.Contains(page.txtTenderPerson))
                   // //专家
                   // .WhereIF(!string.IsNullOrEmpty(page.Experts), (a, d) => d.Experts.Contains(page.Experts))
                   //  //报名状态
                   //  .WhereIF(page.ddlSignUp > 0 && page.ddlSignUp == 1, (a, d) => (d.IsSignup == 0 || d.IsSignup == null))
                   //   .WhereIF(page.ddlSignUp > 0 && page.ddlSignUp != 1, (a, d) => d.IsSignup == 1)
                       //保证金状态
                       .WhereIF(page.ddlTenderDeposit > 0 && page.ddlTenderDeposit == 12, (a, d) => d.TenderDepositStatus == null)
                        .WhereIF(page.ddlTenderDeposit > 0 && page.ddlTenderDeposit == 36, (a, d) => a.TenderTime < DateTime.Now.AddDays(15) && d.TenderDepositStatus == 13)
                      .WhereIF(page.ddlTenderDeposit > 0 && page.ddlTenderDeposit != 12 && page.ddlTenderDeposit != 36, (a, d) => d.TenderDepositStatus == page.ddlTenderDeposit)
              //履约金状态
              .WhereIF(page.ddlBidbond > 0 && page.ddlBidbond == 32, (a, d) => (d.BidbondStatus == null))
                      .WhereIF(page.ddlBidbond > 0 && page.ddlBidbond != 32, (a, d) => d.BidbondStatus == page.ddlBidbond)
              // //标书状态
              // .WhereIF(page.ddlDocumentStatus > 0 && page.ddlDocumentStatus == 15, (a, d) => (d.DocumentStatus == null || d.DocumentStatus == 0 || d.DocumentStatus == 15))
              //        .WhereIF(page.ddlDocumentStatus > 0 && page.ddlDocumentStatus != 15, (a, d) => d.DocumentStatus == page.ddlDocumentStatus)
              //       //投标状态
              //       .WhereIF(page.ddlTenderStatus > 0 && page.ddlTenderStatus == 1, (a, d) => (d.TenderStatus == null || d.TenderStatus == 0))
              //        .WhereIF(page.ddlTenderStatus > 0 && page.ddlTenderStatus != 1, (a, d) => d.TenderStatus == 1)
              ////中标情况
              //.WhereIF(page.ddlWinStatus > 0 && page.ddlWinStatus == 1, (a, d) => n.IsWin == null)
              //        .WhereIF(page.ddlWinStatus > 0 && page.ddlWinStatus != 1, (a, d) => n.IsWin == (page.ddlWinStatus - 1))
              ////质疑情况
              //.WhereIF(page.ddlOppugnStatus > 0 && page.ddlOppugnStatus == 1, (a, d) => (e.FilePath == null || e.FilePath == ""))
              //        .WhereIF(page.ddlOppugnStatus > 0 && page.ddlOppugnStatus != 1, (a, d) => (e.FilePath != null && e.FilePath != ""))
              ////投诉情况
              //.WhereIF(page.ddlComplainStatus > 0 && page.ddlComplainStatus == 1, (a, d) => (f.FilePath == null || f.FilePath == ""))
              //        .WhereIF(page.ddlComplainStatus > 0 && page.ddlComplainStatus != 1, (a, d) => (f.FilePath != null && f.FilePath != ""))
              //             //复议情况
              //             .WhereIF(page.ddlReviewStatus > 0 && page.ddlReviewStatus == 1, (a, d) => (g.FilePath == null || g.FilePath == ""))
              //        .WhereIF(page.ddlReviewStatus > 0 && page.ddlReviewStatus != 1, (a, d) => (g.FilePath != null && g.FilePath != ""))
              // //诉讼情况
              // .WhereIF(page.ddlLitigationStatus > 0 && page.ddlLitigationStatus == 1, (a, d) => (h.FilePath == null || h.FilePath == ""))
              //        .WhereIF(page.ddlLitigationStatus > 0 && page.ddlLitigationStatus != 1, (a, d) => (h.FilePath != null && h.FilePath != ""))
             .Select((a, d) => new DocumentProjectInfoDTO
             {
                 ProjectId = a.ProjectId,
                 SignupStartTime = a.SignupStartTime,
                 Province = a.Province,
                 City = a.City,
                 County = a.County,
                 ProjectName = a.ProjectName,
                 PurchaseUnit = a.PurchaseUnit,
                 AgencyUnit = a.AgencyUnit,
                 TenderTime = a.TenderTime,
                 TenderPerson = d.TenderPerson,
                 IsSignup = d.IsSignup,
                 TenderDepositStatus = d.TenderDepositStatus,
                 BidbondStatus = d.BidbondStatus,
                 TenderStatus = d.TenderStatus,
                 tbqk = "投标情况",
                 wj = "",
                 NoticeTypeName = "招标公告",
                 NoticeType = a.NoticeType,
                 PurchaseMethod = a.PurchaseMethod,
                 DocumentStatus = d.DocumentStatus,
                 TenderDepositStartTime = d.TenderDepositStartTime,
                 TenderDeposit = a.TenderDeposit,
                 TenderDepositEndTime = d.TenderDepositEndTime,
                 BidbondStartTime = d.BidbondStartTime,
                 BidbondEndTime = d.BidbondEndTime,
                 Bidbond = a.Bidbond,
             }
              )
             .OrderByDescending(a => a.ProjectId).ToPageList(page.PageIndex, page.PageSize, ref total);


            result.TotalCount = total;
            result.TotalPage = total % page.PageSize == 0 ? total / page.PageSize : total / page.PageSize + 1;

            if (result.Items != null && result.Items.Count > 0)
            {
                var ret = _db.Queryable<Document_Dictionary>().ToList();
                foreach (var documentProjectInfoDTO in result.Items)
                {
                    if (documentProjectInfoDTO.City == "请选择" && documentProjectInfoDTO.County == "请选择")
                    {
                        documentProjectInfoDTO.xmqy = documentProjectInfoDTO.Province;
                    }
                    else if (documentProjectInfoDTO.City == "请选择" && documentProjectInfoDTO.County == "其他")
                    {
                        documentProjectInfoDTO.xmqy = documentProjectInfoDTO.City;
                    }
                    else
                    {
                        documentProjectInfoDTO.xmqy = documentProjectInfoDTO.City + documentProjectInfoDTO.County;
                    }

                    //if (documentProjectInfoDTO.IsSignup == 1)
                    //{
                    //    documentProjectInfoDTO.bm = "√";
                    //}
                    //else
                    //{
                    //    documentProjectInfoDTO.bm = "报名";
                    //}

                    if (!documentProjectInfoDTO.TenderDepositStatus.HasValue || documentProjectInfoDTO.TenderDepositStatus == 0)
                    {
                        documentProjectInfoDTO.bzj = "缴费";
                    }
                    else if (documentProjectInfoDTO.TenderDepositStatus == 13)
                    {
                        documentProjectInfoDTO.bzj = "退款";
                    }
                    else
                    {
                        documentProjectInfoDTO.bzj = "√";
                    }

                    if (!documentProjectInfoDTO.BidbondStatus.HasValue || documentProjectInfoDTO.BidbondStatus == 0)
                    {
                        documentProjectInfoDTO.lybzj = "缴费";
                    }
                    else if (documentProjectInfoDTO.BidbondStatus == 33)
                    {
                        documentProjectInfoDTO.lybzj = "退款";
                    }
                    else
                    {
                        documentProjectInfoDTO.lybzj = "√";
                    }

                    //if (documentProjectInfoDTO.TenderStatus == 1)
                    //{
                    //    documentProjectInfoDTO.tb = "√";
                    //}
                    //else
                    //{
                    //    documentProjectInfoDTO.tb = "投标";
                    //}

                    //if (documentProjectInfoDTO.DocumentStatus == 17)
                    //{
                    //    documentProjectInfoDTO.bs = "√";
                    //}
                    //else if (documentProjectInfoDTO.DocumentStatus == 16)
                    //{
                    //    documentProjectInfoDTO.bs = "制作中";
                    //}
                    //else
                    //{
                    //    documentProjectInfoDTO.bs = "未制作";
                    //}


                    //if (!documentProjectInfoDTO.IsWin.HasValue || documentProjectInfoDTO.IsWin <= 0)
                    //{
                    //    documentProjectInfoDTO.zb = "中标";
                    //}
                    //else if (documentProjectInfoDTO.IsWin == 2)
                    //{
                    //    documentProjectInfoDTO.zb = "√";
                    //}
                    //else
                    //{
                    //    documentProjectInfoDTO.zb = "×";
                    //}

                    //if (documentProjectInfoDTO.IsAdvise == 1)
                    //{
                    //    documentProjectInfoDTO.Advise = "方案保存";// "√";
                    //}
                    //else
                    //{
                    //    documentProjectInfoDTO.Advise = "方案保存";
                    //}

                    //if (!string.IsNullOrEmpty(documentProjectInfoDTO.FilePathzy))
                    //{
                    //    documentProjectInfoDTO.zy = "√";
                    //}
                    //else
                    //{
                    //    documentProjectInfoDTO.zy = "";
                    //}

                    //if (!string.IsNullOrEmpty(documentProjectInfoDTO.FilePathts))
                    //{
                    //    documentProjectInfoDTO.ts = "√";
                    //}
                    //else
                    //{
                    //    documentProjectInfoDTO.ts = "";
                    //}


                    //if (!string.IsNullOrEmpty(documentProjectInfoDTO.FilePathfy))
                    //{
                    //    documentProjectInfoDTO.fy = "√";
                    //}
                    //else
                    //{
                    //    documentProjectInfoDTO.fy = "";
                    //}


                    //if (!string.IsNullOrEmpty(documentProjectInfoDTO.FilePathss))
                    //{
                    //    documentProjectInfoDTO.ss = "√";
                    //}
                    //else
                    //{
                    //    documentProjectInfoDTO.ss = "";
                    //}
                    //if (documentProjectInfoDTO.PurchaseMethod.HasValue && documentProjectInfoDTO.PurchaseMethod.Value > 0)
                    //{
                    //    var document_Dictionary = ret.Where(x => x.Id == documentProjectInfoDTO.PurchaseMethod).FirstOrDefault();
                    //    if (document_Dictionary != null)
                    //    {
                    //        documentProjectInfoDTO.PurchaseMethodName = document_Dictionary.Name;
                    //    }
                    //}

                }
            }

            return result;
        }



        public PageResult<Document_LayInfo> postDocumentLayInfoList(DocumentProjectInfoPageSearch page)
        {
            var aaa = GetJwtInfo();

            SqlSugar.PageModel pg = new SqlSugar.PageModel();
            pg.PageSize = page.PageSize;
            pg.PageIndex = page.PageIndex;
            //page.ToEmployeeId = a.EID;
            int total = 0;
            PageResult<Document_LayInfo> result = new PageResult<Document_LayInfo>();



            result.Items = _db.Queryable<Document_LayInfo>()
                .Where(a => a.TenantID == aaa.TEID)
             //文件名称
             .WhereIF(!string.IsNullOrEmpty(page.LayName), a => a.LayName == page.LayName)
              .WhereIF(!string.IsNullOrEmpty(page.LayType) && page.LayType != "请选择", a => a.LayType == page.LayType)
                .WhereIF(!string.IsNullOrEmpty(page.LayProvince), a => a.LayProvince == page.LayProvince)

             .OrderByDescending(a => a.LayId).ToPageList(page.PageIndex, page.PageSize, ref total);


            result.TotalCount = total;
            result.TotalPage = total % page.PageSize == 0 ? total / page.PageSize : total / page.PageSize + 1;



            return result;
        }

        public bool GetDelDocumentLayInfo(int ID)
        {
            _db.Deleteable<Document_LayInfo>().Where(x => x.LayId == ID).ExecuteCommand();



            return true;
        }

        public bool SaveDocumentLayInfo(Document_LayInfo dp)
        {
            if (dp.LayId > 0)
            {
                _db.Updateable<Document_LayInfo>(dp).ExecuteCommand();
            }
            else
            {
                _db.Insertable<Document_LayInfo>(dp).ExecuteCommand();
            }
            return true;
        }

        public Document_LayInfo GetDocumentLayInfo(int ID)
        {
            var result = _db.Queryable<Document_LayInfo>().Where(x => x.LayId == ID).First();//执行查询
            return result;
        }

        public Document_LayInfo GetDocumentLayInfoByName(string LayName)
        {
            var aaa = GetJwtInfo();
            var result = _db.Queryable<Document_LayInfo>().Where(x => x.LayName == LayName && x.TenantID == aaa.EID).First();//执行查询
            return result;
        }
    }
}

 DocumentServiceAPI.Application/ProjectInfo/SheZhiController.cs

@@ -171,6 +171,69 @@
        {
            return _sheZhiService.GetDocumentPerformanceInfoListByPaper(page);
        }


        /// <summary>
        /// 获取财务信息postGetFinancialList
        /// </summary>
        /// <param name="page"></param>
        /// <returns></returns>
        public PageResult<DocumentProjectInfoDTO> postGetFinancialList(DocumentProjectInfoPageSearch page)
        {
            return _sheZhiService.postGetFinancialList(page);
        }





        // <summary>
        /// 获取法律列表postDocumentLayInfoList
        /// </summary>
        /// <param name="page"></param>
        /// <returns></returns>
        public PageResult<Document_LayInfo> postDocumentLayInfoList(DocumentProjectInfoPageSearch page)
        {
            return _sheZhiService.postDocumentLayInfoList(page);
        }


        /// <summary>
        /// 删除法律GetDelDocumentLayInfo
        /// </summary>
        /// <param name="ID"></param>
        /// <returns></returns>
        public bool GetDelDocumentLayInfo(int ID)
        {
            return _sheZhiService.GetDelDocumentLayInfo(ID);
        }

        /// <summary>
        /// 修改法律SaveDocumentLayInfo
        /// </summary>
        /// <param name="dp"></param>
        /// <returns></returns>
        public bool SaveDocumentLayInfo(Document_LayInfo dp)
        {
            return _sheZhiService.SaveDocumentLayInfo(dp);
        }

        /// <summary>
        /// 获取法律GetDocumentLayInfo
        /// <param name="ID"></param>
        /// </summary>
        public Document_LayInfo GetDocumentLayInfo(int ID)
        {
            return _sheZhiService.GetDocumentLayInfo(ID);
        }
        /// <summary>
        /// 获取法律GetDocumentLayInfoByName
        /// <param name="LayName"></param>
        /// </summary>
        public Document_LayInfo GetDocumentLayInfoByName(string LayName)
        {
            return _sheZhiService.GetDocumentLayInfoByName(LayName);
        }
    }

}

 DocumentServiceAPI.Application/ProjectInfo/ViewMode/DocumentProjectInfoDTO.cs

@@ -61,6 +61,13 @@

        public string FilePath { get; set; }

        public string LayType { get; set; }

        public string LayName { get; set; }

        public string LayProvince { get; set; }


    }
    public class DocumentProjectInfoDTO
    {
@@ -430,6 +437,32 @@
        public string tbqk { get; set; }
        public int? DocumentStatus { get; set; }

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

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


        /// <summary>
        /// Desc:

 DocumentServiceAPI.Application/UserAndLogin/Services/UserService.cs

@@ -400,7 +400,7 @@
            if(tp == null )
            {
               tp= await  _db.Queryable<TenantPermissions>().Where(x=>x.TenantId == TenderID).FirstAsync();
                if (tp == null)
                if (tp != null)
                    _cacheService.Add<TenantPermissions>(Key, tp, 300);
                else
                    return false;

 DocumentServiceAPI.Model/cyDocumentModel/Document_LayInfo.cs

@@ -114,5 +114,13 @@
           /// </summary>           
           public int? UserId {get;set;}


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

    }
}

 DocumentServiceAPI.Web.Core/Startup.cs

@@ -36,7 +36,7 @@
            app.UseDeveloperExceptionPage();
        }

        app.UseHttpsRedirection();
       // app.UseHttpsRedirection();

        app.UseRouting();