xiugai

OpenAuth.App/ServiceApp/MiManager/MiVehiclePickupApp.cs

@@ -265,6 +265,7 @@ namespace OpenAuth.App
                           p.Lat,
                           p.StatusName,
                           p.ViolationTypeName,
+                          p.MineralTypes,
                           // 盗采点信息
                           MinePointId = m.Id,
                           MinePointName = m.Name,
@@ -308,6 +309,21 @@ namespace OpenAuth.App
                     .Where(sp => sp.ViolationReportId == result.ViolationReportId)
                     .ToListAsync();
 
+                // 查询其他人员
+                var otherPersons = await uow.MiViolationUsers.AsQueryable()
+                    .Where(r => r.ViolationReportId == result.Id)
+                    .ToListAsync();
+
+                // 查询其他人员图片
+                List<MiOtherpersonImage> personImages = new List<MiOtherpersonImage>();
+                if (otherPersons.Any())
+                {
+                    var personIds = otherPersons.Select(v => v.Id).ToList();
+                    personImages = await uow.MiOtherpersonImage.AsQueryable()
+                        .Where(vi => personIds.Contains(vi.PersonId))
+                        .ToListAsync();
+                }
+
                 return new
                 {
                     PickupInfo = new
@@ -346,7 +362,8 @@ namespace OpenAuth.App
                         result1.Lat,
                         result1.StatusName,
                         result1.ViolationTypeName,
-                        result1.HandUnitName
+                        result1.HandUnitName,
+                        result1.MineralTypes
                     },
 
                     MinePoint = string.IsNullOrEmpty(result1.MinePointId) ? null : new
@@ -396,6 +413,25 @@ namespace OpenAuth.App
                         sp.Lat,
                         sp.Angle,
                         sp.CreateTime
+                    }).ToList(),
+                    OtherPersons = otherPersons.Select(v => new
+                    {
+                        v.Id,
+                        v.Name,
+                        v.Phone,
+                        v.RelationShip,
+                        Images = personImages
+                        .Where(img => img.PersonId == v.Id)
+                        .Select(img => new
+                        {
+                            img.Id,
+                            img.Image,
+                            img.Lng,
+                            img.Lat,
+                            img.Angle,
+                            img.CreateTime
+                        })
+                        .ToList()
                     }).ToList()
                 };
             }

OpenAuth.WebApi/Templates/解除扣押决定书.docx

@@ -2,7 +2,7 @@
                              解除扣押决定书
                         费综执解扣字 [ {{Year}} ] 第{{SerialNumber}} 号
   {{Paty}}        ：
-因你（单位）  于{{ClueLocation}}的[{{ViolationType}}]                                                            
+因你（单位）  于{{ClueLocation}}的{{ViolationType}}                                                            
 一案，本机关于  {{FYear}}  年 {{FMonth}} 月 {{FDay}} 日下达的   扣押财物决定书                                                         
      ，对下列物品进行了扣押，经研究，决定解除扣押措施。
 1、   {{Items}}