修改了一些字段

username@email.com

8 天以前 1978a2687b298a69bc72d6eda0be8235bbca37d8

修改了一些字段

 Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderOutput.cs

@@ -253,18 +253,18 @@
    /// <summary>
    /// 投标报名开始时间
    /// </summary>
    public DateTime ToubiaoStartDate { get; set; }
    public DateTime? ToubiaoStartDate { get; set; }


    /// <summary>
    /// 投标报名结束时间
    /// </summary>
    public DateTime ToubiaoEndDate { get; set; }
    public DateTime? ToubiaoEndDate { get; set; }

    /// <summary>
    /// 开标时间
    /// </summary>
    public DateTime KaibiaoDate { get; set; }
    public DateTime? KaibiaoDate { get; set; }

    /// <summary>
    /// 发布时间
@@ -470,18 +470,18 @@
    /// <summary>
    /// 投标报名开始时间
    /// </summary>
    public DateTime ToubiaoStartDate { get; set; }
    public DateTime? ToubiaoStartDate { get; set; }


    /// <summary>
    /// 投标报名结束时间
    /// </summary>
    public DateTime ToubiaoEndDate { get; set; }
    public DateTime? ToubiaoEndDate { get; set; }

    /// <summary>
    /// 开标时间
    /// </summary>
    public DateTime KaibiaoDate { get; set; }
    public DateTime? KaibiaoDate { get; set; }

    ///// <summary>
    ///// 发布时间
@@ -632,6 +632,12 @@
        public bool? IsDailiTransfer { get; set; }

        /// <summary>
        /// 是否支付代理费
        /// </summary>
        public string IsDailiTransferName { get; set; }


        /// <summary>
        /// 代理费支付时间
        /// </summary>
        public DateTime? DailiTransferTime { get; set; }

 Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs

@@ -359,6 +359,16 @@
                {
                    tenderOrderBiddingOutput.IsTransferName = "否";
                }

                if (tenderOrderBiddingOutput.IsDailiTransfer.HasValue && tenderOrderBiddingOutput.IsDailiTransfer.Value)
                {
                    tenderOrderBiddingOutput.IsDailiTransferName = "是";
                }
                else
                {
                    tenderOrderBiddingOutput.IsDailiTransferName = "否";
                }

                var cusExtend = await _sqlSugarClient.Queryable<FBS_CusExtend>().Where(x => x.Id == tenderOrderBiddingOutput.CusExtendId).FirstAsync();
                if (cusExtend != null)
                {
@@ -397,7 +407,7 @@

        var RealName = App.User?.FindFirstValue(ClaimConst.RealName);

        if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
        if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
        {
            throw Oops.Oh("只有登录角色招标代理机构或者采购人才能获取联系方式！");
        }
@@ -408,7 +418,7 @@
         .Where(x => x.Id == customerExId).FirstAsync();
        if (fBS_CusExtend != null)
        {
            if (CustomerLogoinType != "DLJG" )
            if (CustomerLogoinType == "DLJG" )
            {
                tenderOrderOutput.Dailijigoumingcheng = fBS_CusExtend.EnterpriseName;
                tenderOrderOutput.DailiLianxiren = fBS_CusExtend.OperatorName;
@@ -418,7 +428,7 @@
                tenderOrderOutput.DailiXiangmujingli = "";
                tenderOrderOutput.DailijingliLianxidianhua = "";
            }
            else if (CustomerLogoinType != "CGR")
            else if (CustomerLogoinType == "CGR")
            {
                tenderOrderOutput.Caigourenmingcheng = fBS_CusExtend.EnterpriseName;
                tenderOrderOutput.Xingzhengquyu = "";
@@ -466,7 +476,7 @@

        string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;

        if(CustomerLogoinType!= "DLJG" || CustomerLogoinType != "CGR")
        if(CustomerLogoinType!= "DLJG" && CustomerLogoinType != "CGR")
        {
            throw Oops.Oh("只有登录角色招标代理机构或者采购人才能发布招标！");
        }
@@ -506,7 +516,7 @@

        string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;

        if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
        if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
        {
            throw Oops.Oh("只有登录角色招标代理机构或者采购人才能更新招标！");
        }
@@ -549,7 +559,7 @@

        string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;

        if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
        if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
        {
            throw Oops.Oh("只有登录角色招标代理机构或者采购人才能更新非政府订单质疑！");
        }
@@ -589,7 +599,7 @@

        string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;

        if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
        if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
        {
            throw Oops.Oh("只有登录角色招标代理机构或者采购人才能更新非政府订单投诉！");
        }
@@ -621,7 +631,7 @@
    {
        string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;

        if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
        if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
        {
            throw Oops.Oh("只有登录角色招标代理机构或者采购人才能删除招标！");
        }
@@ -644,7 +654,7 @@

        string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;

        if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
        if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
        {
            throw Oops.Oh("只有登录角色招标代理机构或者采购人才能批量删除招标！");
        }
@@ -750,7 +760,7 @@

        string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;

        if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
        if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
        {
            throw Oops.Oh("只有登录角色招标代理机构或者采购人才能发布招标！");
        }
@@ -796,7 +806,7 @@

        string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;

        if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
        if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
        {
            throw Oops.Oh("只有登录角色招标代理机构或者采购人才能更新非政府订单标题！");
        }
@@ -836,7 +846,7 @@

        string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;

        if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
        if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
        {
            throw Oops.Oh("只有登录角色招标代理机构或者采购人才能发布变更公告！");
        }
@@ -935,7 +945,7 @@
    {
        string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;

        if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
        if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
        {
            throw Oops.Oh("只有登录角色招标代理机构或者采购人才能删除变更公告！");
        }
@@ -970,7 +980,7 @@

        string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;

        if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
        if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
        {
            throw Oops.Oh("只有登录角色招标代理机构或者采购人才能确认供应商已支付报名费！");
        }
@@ -1028,7 +1038,7 @@

        string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;

        if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
        if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
        {
            throw Oops.Oh("只有登录角色招标代理机构或者采购人才能发布中标文件！");
        }
@@ -1150,7 +1160,7 @@

        string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;

        if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
        if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
        {
            throw Oops.Oh("只有登录角色招标代理机构或者采购人才能确认供应商已支付代理费！");
        }