Browse Source

添加公务需求, 修改百度OCR

yuanrf 1 year ago
parent
commit
b9fb3303a7

+ 5 - 1
OASystem/OASystem.Api/Controllers/BaiduOCRController.cs

@@ -10,6 +10,10 @@ using OASystem.Domain.ViewModels.OCR;
 
 namespace OASystem.API.Controllers
 {
+
+    /// <summary>
+    /// 百度OCR识别
+    /// </summary>
     [Route("api/[controller]/[action]")]
     [ApiController]
     public class BaiduOCRController : ControllerBase
@@ -97,7 +101,7 @@ namespace OASystem.API.Controllers
                 }
 
                 List<BaiduClientOCRView> ClientArr = new List<BaiduClientOCRView>();
-                for (int i = 1; i < maxRowIndex; i++)
+                for (int i = 1; i <= maxRowIndex; i++)
                 {
                     BaiduClientOCRView client = new BaiduClientOCRView();
                     for (int j = 0; j < maxColIndex; j++)

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

@@ -213,6 +213,11 @@ namespace OASystem.Domain.Dtos.Groups
         /// 等级说明
         /// </summary>
         public string opRoyaltyRemark { get; set; }
+
+        /// <summary>
+        ///  公务需求
+        /// </summary>
+        public string Officialneeds { get; set; }
     }
 
     /// <summary>

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

@@ -225,6 +225,12 @@ namespace OASystem.Domain.Entities.Groups
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
         public string OpRoyaltyRemark { get; set; }
+
+        /// <summary>
+        /// 公务需求
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(300)")]
+        public string Officialneeds { get; set; }
         #endregion
     }
 }

+ 4 - 1
OASystem/OASystem.Domain/ViewModels/Groups/DelegationInfoView.cs

@@ -355,7 +355,10 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public string?  OpRoyaltyRemark { get; set; }
 
-
+        /// <summary>
+        ///  公务需求
+        /// </summary>
+        public string Officialneeds { get; set; }
     }
 
     /// <summary>

+ 6 - 4
OASystem/OASystem.Infrastructure/Repositories/Groups/DelegationInfoRepository.cs

@@ -117,7 +117,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 string sql = string.Format(@"Select Id,SalesQuoteNo,TourCode,JietuanOperator,TeamLevSId,TeamDid,TeamName,ClientName,
 	                                                ClientUnit,VisitCountry,VisitDate,VisitDays,VisitPNumber,TontractTime,
 	                                                PayDay,PaymentMoney,VisitPurpose,SpecialNeeds,OtherNeeds,CGRWSPBMMC,CGRWSPWH,
-	                                                ZZSCBMMC,ZZSCSPWH,Remark,TellPhone
+	                                                ZZSCBMMC,ZZSCSPWH,Remark,TellPhone,Officialneeds
                                              From Grp_DelegationInfo Where Id = {0} And IsDel = 0", dto.Id);
 
                 var _DelegationInfo = await _sqlSugar.SqlQueryable<DelegationInfoWebView>(sql).FirstAsync();
@@ -258,7 +258,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 string sql = string.Format(@"Select Id,SalesQuoteNo,TourCode,JietuanOperator,TeamLevSId,TeamDid,TeamName,ClientName,
 	                                                ClientUnit,VisitCountry,VisitDate,VisitDays,VisitPNumber,TontractTime,
 	                                                PayDay,PaymentMoney,VisitPurpose,SpecialNeeds,OtherNeeds,CGRWSPBMMC,CGRWSPWH,
-	                                                ZZSCBMMC,ZZSCSPWH,Remark,TellPhone,OpRoyaltyLv,OpRoyaltyRemark
+	                                                ZZSCBMMC,ZZSCSPWH,Remark,TellPhone,OpRoyaltyLv,OpRoyaltyRemark,Officialneeds
                                              From Grp_DelegationInfo Where Id = {0} And IsDel = 0", dto.Id);
 
                 var _DelegationInfo = await _sqlSugar.SqlQueryable<DelegationInfoWebView>(sql).FirstAsync();
@@ -424,7 +424,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         DeleteUserId = null,
                         DeleteTime = new DateTime(1990, 1, 1).ToString("yyyy-MM-dd HH:mm:ss"),
                         OpRoyaltyLv = dto.OpRoyaltyLv,
-                        OpRoyaltyRemark=dto.opRoyaltyRemark
+                        OpRoyaltyRemark=dto.opRoyaltyRemark,
+                        Officialneeds = dto.Officialneeds
                     };
 
                     var addId = await _sqlSugar.Insertable(delegationInfo).ExecuteReturnIdentityAsync();
@@ -469,7 +470,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         PaymentMoney = dto.PaymentMoney,
                         PayDay = dto.PayDay,
                         OpRoyaltyLv = dto.OpRoyaltyLv,
-                        OpRoyaltyRemark = dto.opRoyaltyRemark
+                        OpRoyaltyRemark = dto.opRoyaltyRemark,
+                        Officialneeds = dto.Officialneeds
                     });
 
                     if (updateStatus)