修改巡查打卡详情

OpenAuth.App/ServiceApp/MiManager/MiPunchRecordApp.cs

@@ -69,7 +69,8 @@ namespace OpenAuth.App
         {
             var data= await Repository.AsQueryable()
                 .LeftJoin<SysUser>((r,u)=>r.UserId==u.Id)
-                .Select((r,u)=>new MiPuchRecordRes
+                .LeftJoin<MiMinePoint>((r, u, p) => r.MinePointId == p.Id)
+                .Select((r, u, p) => new MiPuchRecordRes
                 {
                     Id = r.Id,
                     UserId = r.UserId,
@@ -80,7 +81,9 @@ namespace OpenAuth.App
                     PunchStatus=r.PunchStatus,
                     PunchTime=r.PunchTime,
                     Remark=r.Remark,
-                    Image=SqlFunc.Subqueryable<MiPunchImage>().Where(a=>a.PunchId==r.Id).ToList()
+                    Image=SqlFunc.Subqueryable<MiPunchImage>().Where(a=>a.PunchId==r.Id).ToList(),
+                    PointName=p.Name,
+                    StatusName = SqlFunc.Subqueryable<SysDataItemDetail>().Where(a => a.ItemCode == "JGMinePointStatus" && a.ItemValue == r.PunchStatus.ToString()).Select(a => a.ItemName)
                 }).FirstAsync();
             return new Response<MiPuchRecordRes>()
             { 

OpenAuth.App/ServiceApp/MiManager/Response/MiPuchRecordRes.cs

@@ -60,6 +60,8 @@ namespace OpenAuth.App.ServiceApp.MiManager.Response
         /// Nullable:True
         /// </summary>           
         public decimal? Lat { get; set; }
+        public string StatusName { get; set; }
+        public string PointName { get; set; }
 
         public List<MiPunchImage> Image { get; set; }