修改

OpenAuth.App/ServiceApp/MiManager/MiViolationReportApp.cs

@@ -57,9 +57,7 @@ namespace OpenAuth.App
                         Id = p.Id.SelectAll(),
                         ReportUserName = u.Name,
                         PointName = m.Name,
-                        OrgName = o.Name,
-                        StatusName = SqlFunc.Subqueryable<SysDataItemDetail>().Where(a => a.ItemCode == "FMViolationStatus" && a.ItemValue == p.Status.ToString()).Select(a => a.ItemName),
-                        TypeName = SqlFunc.Subqueryable<SysDataItemDetail>().Where(a => a.ItemCode == "JGViolationType" && a.ItemValue == p.ViolationType.ToString()).Select(a => a.ItemName)
+                        OrgName = o.Name
                     })
                     .ToPageListAsync(req.page, req.limit, totalCount);
                 return new Response<PageInfo<List<dynamic>>>
@@ -112,9 +110,7 @@ namespace OpenAuth.App
                                 Id = p.Id.SelectAll(),
                                 ReportUserName = u.Name,
                                 PointName = m.Name,
-                                OrgName = o.Name,
-                                StatusName = SqlFunc.Subqueryable<SysDataItemDetail>().Where(a => a.ItemCode == "FMViolationStatus" && a.ItemValue == p.Status.ToString()).Select(a => a.ItemName),
-                                TypeName = SqlFunc.Subqueryable<SysDataItemDetail>().Where(a => a.ItemCode == "JGViolationType" && a.ItemValue == p.ViolationType.ToString()).Select(a => a.ItemName)
+                                OrgName = o.Name
                             })
                             .ToPageListAsync(req.page, req.limit, totalCount);
 
@@ -167,7 +163,8 @@ namespace OpenAuth.App
                       p.ReportUnit,
                       p.Lng,
                       p.Lat,
-                      ReportStatusName= SqlFunc.Subqueryable<SysDataItemDetail>().Where(a => a.ItemCode == "FMViolationStatus" && a.ItemValue == p.Status.ToString()).Select(a => a.ItemName),
+                        p.StatusName,
+                        p.ViolationTypeName,
                       // 盗采点信息
                       MinePointId = m.Id,
                       MinePointName = m.Name,
@@ -212,7 +209,7 @@ namespace OpenAuth.App
                     {
                         result.Id,
                         result.Title,
-                        result.ReportStatus,
+                        Status=result.ReportStatus,
                         result.PartyName,
                         result.PartyPhone,
                         result.ViolationType,
@@ -227,7 +224,8 @@ namespace OpenAuth.App
                         result.ReportUnitName,
                         result.Lng,
                         result.Lat,
-                        result.ReportStatusName
+                        result.StatusName,
+                        result.ViolationTypeName
                     },
 
                     MinePoint = string.IsNullOrEmpty(result.MinePointId) ? null : new
@@ -254,6 +252,7 @@ namespace OpenAuth.App
                         v.Name,
                         v.IdCard,
                         v.Phone,
+                        v.TypeName,
                         VehicleImages = vehicleImages
                             .Where(img => img.VehicleId == v.Id)
                             .Select(img => new

OpenAuth.App/ServiceApp/MiManager/Request/Vehicle.cs

@@ -20,7 +20,7 @@ namespace OpenAuth.App.ServiceApp.Request
         /// <summary>
         /// 类型
         /// </summary>
-        public string Type { get; set; }
+        public short? Type { get; set; }
         /// <summary>
         /// 姓名
         /// </summary>
@@ -37,6 +37,10 @@ namespace OpenAuth.App.ServiceApp.Request
         /// 创建时间
         /// </summary>
         public string CreateTime { get; set; }
+        /// <summary>
+        /// 类型名称
+        /// </summary>
+        public string TypeName { get; set; }
 
         /// <summary>
         /// 图片

OpenAuth.Repository/Domain/MiVehicle.cs

@@ -36,7 +36,7 @@ namespace OpenAuth.Repository.Domain
         /// Default:
         /// Nullable:True
         /// </summary>           
-        public string Type { get; set; }
+        public short? Type { get; set; }
 
         /// <summary>
         /// Desc:姓名
@@ -72,6 +72,13 @@ namespace OpenAuth.Repository.Domain
         /// Nullable:True
         /// </summary>           
         public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 类型名称
+        /// </summary>
+        public string TypeName { get; set; }
+
+        public string ViolationTypeName { get; set; }
+        public string StatusName { get; set; }
 
         /// <summary>
         /// 导航属性

OpenAuth.Repository/Domain/MiViolationReport.cs

@@ -141,6 +141,9 @@ namespace OpenAuth.Repository.Domain
         public string ReportUnit { get; set; }
 
         public bool? IsDelete { get; set; }
+        public string ViolationTypeName {  get; set; }
+        public string StatusName {  get; set; }
+
 
     }
 }