Browse Source

Grp_DelegationInfo 新增字段 IsBid 操作(CUR)

amigotrip 7 months ago
parent
commit
77122e075c

+ 2 - 2
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -350,13 +350,13 @@ namespace OASystem.API.Controllers
                 string sql = string.Format(@"Select Row_Number,Id,SalesQuoteNo,TourCode,TeamTypeId, TeamType,
                                              	TeamLevId,TeamLev,TeamName,ClientName,ClientUnit,
                                              	VisitDate,VisitDays,VisitPNumber,JietuanOperatorId,
-                                             	JietuanOperator,IsSure,CreateTime
+                                             	JietuanOperator,IsSure,CreateTime,IsBid
                                              	From (
                                              	Select row_number() over(order by gdi.CreateTime Desc) as Row_Number,
                                              	gdi.Id,SalesQuoteNo,TourCode,ssd.Id TeamTypeId, ssd.Name TeamType,
                                              	ssd1.Id TeamLevId,ssd1.Name TeamLev,TeamName,ClientName,ClientUnit,
                                              	VisitDate,VisitDays,VisitPNumber,JietuanOperator JietuanOperatorId,
-                                             	su.CnName JietuanOperator,IsSure,gdi.CreateTime
+                                             	su.CnName JietuanOperator,IsSure,gdi.CreateTime,gdi.IsBid
                                              	From  Grp_DelegationInfo gdi
                                              	Left Join Sys_SetData ssd On gdi.TeamDid = ssd.Id 
                                              	Left Join Sys_SetData ssd1 On gdi.TeamLevSId = ssd1.Id

+ 0 - 1
OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -3846,7 +3846,6 @@ WHERE
             return Ok(JsonView(true, "操作成功!", groupByData));
         }
 
-
         #endregion
     }
 }

+ 6 - 0
OASystem/OASystem.Domain/Dtos/Groups/GroupListDto.cs

@@ -151,6 +151,12 @@ namespace OASystem.Domain.Dtos.Groups
         /// </summary>
         public string TontractTime { get; set; }
 
+        /// <summary>
+        /// 是否用于投标
+        /// 0 是 1 否
+        /// </summary>
+        public int IsBid { get; set; }
+
         /// <summary>
         /// 预付期限
         /// </summary>

+ 6 - 0
OASystem/OASystem.Domain/Entities/Groups/Grp_DelegationInfo.cs

@@ -192,6 +192,12 @@ namespace OASystem.Domain.Entities.Groups
         [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
         public DateTime TontractTime { get; set; }
         /// <summary>
+        /// 是否用于投标
+        /// 0 否 1 是
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsBid { get; set; }
+        /// <summary>
         /// 支付款项(预付)
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]

+ 12 - 0
OASystem/OASystem.Domain/ViewModels/Groups/DelegationInfoView.cs

@@ -300,6 +300,13 @@ namespace OASystem.Domain.ViewModels.Groups
         /// 合同时间
         /// </summary>
         public DateTime TontractTime { get; set; }
+
+        /// <summary>
+        /// 是否用于投标
+        /// 0 是 1 否
+        /// </summary>
+        public int IsBid { get; set; }
+
         /// <summary>
         /// 预付期限
         /// </summary>
@@ -459,6 +466,11 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public int VisitPNumber { get; set; }
 
+        /// <summary>
+        /// 是否用于投标
+        /// 0 否 1 是
+        /// </summary>
+        public int IsBid { get; set; }
 
         /// <summary>
         /// 是否操作完成 

+ 3 - 1
OASystem/OASystem.Infrastructure/Repositories/Groups/DelegationInfoRepository.cs

@@ -361,7 +361,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
             if (dto.PortType == 1 || dto.PortType == 2 || dto.PortType == 3) //Web Or Android
             {
                 string sql = string.Format(@"Select Id,SalesQuoteNo,TourCode,JietuanOperator,TeamLevSId,TeamDid,TeamName,ClientName,
-	                                                ClientUnit,VisitCountry,VisitDate,VisitDays,VisitPNumber,TontractTime,
+	                                                ClientUnit,VisitCountry,VisitDate,VisitDays,VisitPNumber,TontractTime,IsBid,
 	                                                PayDay,PaymentMoney,VisitPurpose,SpecialNeeds,OtherNeeds,CGRWSPBMMC,CGRWSPWH,
 	                                                ZZSCBMMC,ZZSCSPWH,Remark,TellPhone,WeChatNo,OpRoyaltyLv,OpRoyaltyRemark,Officialneeds
                                              From Grp_DelegationInfo Where Id = {0} And IsDel = 0", dto.Id);
@@ -642,6 +642,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         ZZSCBMMC = dto.ZZSCBMMC,
                         ZZSCSPWH = dto.ZZSCSPWH,
                         TontractTime = Convert.ToDateTime(dto.TontractTime),
+                        IsBid = dto.IsBid,
                         PaymentMoney = dto.PaymentMoney,
                         PayDay = dto.PayDay,
                         TourCode = teamCode,
@@ -708,6 +709,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         ZZSCBMMC = dto.ZZSCBMMC,
                         ZZSCSPWH = dto.ZZSCSPWH,
                         TontractTime = Convert.ToDateTime(dto.TontractTime),
+                        IsBid = dto.IsBid,
                         PaymentMoney = dto.PaymentMoney,
                         PayDay = dto.PayDay,
                         OpRoyaltyLv = dto.OpRoyaltyLv,