一些修改

username@email.com

2025-08-13 ed76eb5fe78b4f5d7d9b9bfba47a01faa1d44a07

一些修改

 Admin.NET/FZFCGDD.ORDER.Application/Service/ShouyeGonggao/ShouyeGonggaoService.cs

@@ -30,6 +30,8 @@
using RazorEngine.Compilation.ImpromptuInterface;
using MimeKit;
using FZFCGDD.ORDER.Application.Service.Neirongfabu.Dto;
using FZCZTB.NET.MD.CutomerMd.Extend;
using static FZCZTB.TSCL.Application.ChangeTenderOrderOut;
namespace FZCZTB.TSCL.Application;

/// <summary>
@@ -487,4 +489,119 @@

        return neirongfabuOutput;
    }



    /// <summary>
    /// 获取非政府订单处理详情 ℹ️
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [DisplayName("获取非政府订单处理详情")]
    [AllowAnonymous]
    [ApiDescriptionSettings(Name = "Detail"), HttpGet]
    public async Task<TenderOrderOutput> TenderDetail([FromQuery] QueryByIdTenderOrderInput input)
    {
        var Kaibiaofangshi = await GetDataListByCode("Kaibiaofangshi");
        var Caigoufangshi = await GetDataListByCode("Caigoufangshi");
        var Hangyepinmu = await GetDataListByCode("Hangyepingmu");
        var Fuhetitoubiao = await GetDataListByCode("Fuhetitoubiao");
        var Dingbiaoguize = await GetDataListByCode("Dingbiaoguize");
        var Daimaleixing = await GetDataListByCode("Daimaleixing");

        var YesNoEnum = await GetDataListByCode("YesNoEnum");






        var OrderStatus = await GetDataListByCode("OrderStatus");
        var tenderOrderOutput = await _TenderOrderRep.AsQueryable().Where(x => x.Id == input.Id).Select<TenderOrderOutput>().FirstAsync();
        if (tenderOrderOutput != null)
        {
            if (!string.IsNullOrEmpty(tenderOrderOutput.Kaibiaofangshi))
            {
                tenderOrderOutput.KaibiaofangshiName = Kaibiaofangshi.Where(x => x.Value == tenderOrderOutput.Kaibiaofangshi).Select(x => x.Label).FirstOrDefault() ?? "";
            }
            if (!string.IsNullOrEmpty(tenderOrderOutput.Caigoufangshi))
            {
                tenderOrderOutput.CaigoufangshiName = Caigoufangshi.Where(x => x.Value == tenderOrderOutput.Caigoufangshi).Select(x => x.Label).FirstOrDefault() ?? "";
            }
            if (!string.IsNullOrEmpty(tenderOrderOutput.Hangyepinmu))
            {
                tenderOrderOutput.HangyepinmuName = Hangyepinmu.Where(x => x.Value == tenderOrderOutput.Hangyepinmu).Select(x => x.Label).FirstOrDefault() ?? "";
            }
            if (!string.IsNullOrEmpty(tenderOrderOutput.Lianhetitoubiao))
            {
                tenderOrderOutput.LianhetitoubiaoName = Fuhetitoubiao.Where(x => x.Value == tenderOrderOutput.Lianhetitoubiao).Select(x => x.Label).FirstOrDefault() ?? "";
            }
            if (!string.IsNullOrEmpty(tenderOrderOutput.Dingbiaoguize))
            {
                tenderOrderOutput.DingbiaoguizeName = Dingbiaoguize.Where(x => x.Value == tenderOrderOutput.Dingbiaoguize).Select(x => x.Label).FirstOrDefault() ?? "";
            }
            if (!string.IsNullOrEmpty(tenderOrderOutput.Daimaleixing))
            {
                tenderOrderOutput.DaimaleixingName = Daimaleixing.Where(x => x.Value == tenderOrderOutput.Daimaleixing).Select(x => x.Label).FirstOrDefault() ?? "";
            }

            if (!string.IsNullOrEmpty(tenderOrderOutput.Shifoufenbao))
            {
                tenderOrderOutput.ShifoufenbaoName = YesNoEnum.Where(x => x.Value == tenderOrderOutput.Shifoufenbao).Select(x => x.Label).FirstOrDefault() ?? "";
            }
            if (!string.IsNullOrEmpty(tenderOrderOutput.Shifoutuisongxuanchuan))
            {
                tenderOrderOutput.ShifoutuisongxuanchuanName = YesNoEnum.Where(x => x.Value == tenderOrderOutput.Shifoutuisongxuanchuan).Select(x => x.Label).FirstOrDefault() ?? "";
            }
            if (tenderOrderOutput.OrderStatus.HasValue)
            {
                tenderOrderOutput.OrderStatusName = OrderStatus.Where(x => x.Value == tenderOrderOutput.OrderStatus.Value.ToString()).Select(x => x.Label).FirstOrDefault() ?? "";
            }

        }

        var changeOrder = await _ChangeOrderRep.AsQueryable().Where(x => x.TenderId == input.Id).FirstAsync();
        tenderOrderOutput.changeOrder = changeOrder;


        var tenderOrderBiddings = await _sqlSugarClient.Queryable<TenderOrderBidding>()
            .Where(x => x.TenderId == input.Id)
            .Where(x => x.IsTransfer == true)
            .Select<TenderOrderBiddingOutput>().ToListAsync();

        if (tenderOrderBiddings != null)
        {
            foreach (var tenderOrderBiddingOutput in tenderOrderBiddings)
            {
                if (tenderOrderBiddingOutput.IsSelected.HasValue && tenderOrderBiddingOutput.IsSelected.Value)
                {
                    tenderOrderBiddingOutput.IsSelectedName = "是";
                }
                else
                {
                    tenderOrderBiddingOutput.IsSelectedName = "否";
                }

                if (tenderOrderBiddingOutput.IsTransfer.HasValue && tenderOrderBiddingOutput.IsTransfer.Value)
                {
                    tenderOrderBiddingOutput.IsTransferName = "是";
                }
                else
                {
                    tenderOrderBiddingOutput.IsTransferName = "否";
                }
                var cusExtend = await _sqlSugarClient.Queryable<FBS_CusExtend>().Where(x => x.CustomerId == tenderOrderBiddingOutput.CreateUserId && x.TransactionCode == "GYS" && x.steps == CusExtendStep.Pass).FirstAsync();
                if (cusExtend != null)
                {
                    tenderOrderBiddingOutput.ChangshangName = cusExtend.EnterpriseName;
                }

            }
        }
        tenderOrderOutput.tenderOrderBiddings = tenderOrderBiddings;



        return tenderOrderOutput;
    }
}

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

@@ -970,11 +970,6 @@
    [Required(ErrorMessage = "中标供应商id不能为空")]
    public long SupplierUserId { get; set; }

    /// <summary>
    /// 中标供应商Name
    /// </summary>
    [Required(ErrorMessage = "中标供应商Name不能为空")]
    public string SupplierUserName { get; set; }

    /// <summary>
    /// 中标tittle

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

@@ -30,6 +30,7 @@
using RazorEngine.Compilation.ImpromptuInterface;
using MimeKit;
using static FZCZTB.TSCL.Application.ChangeTenderOrderOut;
using FZCZTB.NET.MD.CutomerMd.Extend;
namespace FZCZTB.TSCL.Application;

/// <summary>
@@ -353,6 +354,12 @@
                {
                    tenderOrderBiddingOutput.IsTransferName = "否";
                }
                var cusExtend = await _sqlSugarClient.Queryable<FBS_CusExtend>().Where(x => x.CustomerId == tenderOrderBiddingOutput.CreateUserId && x.TransactionCode == "GYS" && x.steps == CusExtendStep.Pass).FirstAsync();
                if (cusExtend != null)
                {
                    tenderOrderBiddingOutput.ChangshangName = cusExtend.EnterpriseName;
                }
               
            }
        }
        tenderOrderOutput.tenderOrderBiddings = tenderOrderBiddings;
@@ -830,7 +837,13 @@
        }

        tenderOrder.ZhongbiaoId = input.SupplierUserId;
        tenderOrder.ZhongbiaoName = input.SupplierUserName;
        //tenderOrder.ZhongbiaoName = input.SupplierUserName;
        var cusExtend = await _sqlSugarClient.Queryable<FBS_CusExtend>().Where(x => x.CustomerId == input.SupplierUserId && x.TransactionCode == "GYS" && x.steps == CusExtendStep.Pass ).FirstAsync();
        if (cusExtend != null)
        {
            tenderOrder.ZhongbiaoName = cusExtend.EnterpriseName;
        }

        tenderOrder.Zhongbiaowenjian = input.Zhongbiaowenjian;
        tenderOrder.ZhongbiaoDate = DateTime.Now;
        tenderOrder.UpdateTime = DateTime.Now;