From ee23b55345b4ecab8b80583aaa7cb916e7640fbf Mon Sep 17 00:00:00 2001
From: hanrenchun <hanrenchun>
Date: Sun, 28 Jan 2024 21:35:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MetaImpUserModelInfoController.java    | 11 ++++++++++-
 .../database/domain/vo/MetaImpUserModelInfoVO.java    |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/gather-app/src/main/java/com/ruoyi/database/controller/MetaImpUserModelInfoController.java b/gather-app/src/main/java/com/ruoyi/database/controller/MetaImpUserModelInfoController.java
index 7cf6e5c..24df594 100644
--- a/gather-app/src/main/java/com/ruoyi/database/controller/MetaImpUserModelInfoController.java
+++ b/gather-app/src/main/java/com/ruoyi/database/controller/MetaImpUserModelInfoController.java
@@ -37,7 +37,6 @@ public class MetaImpUserModelInfoController  extends BaseController {
 //    @GetMapping
 //    @ApiOperation("查询重点人员预警信息详情")
 //    public TableDataInfo<MetaImpUserModelInfoVO> list(MetaImpUserModelInfoVO metaImpUserModelInfoVO) {
-//
 //        return getDataTable(list);
 //    }
 
@@ -70,7 +69,15 @@ public class MetaImpUserModelInfoController  extends BaseController {
             metaImpUserModelInfoVO.setImpUserName(metaImpUserModelInfo.getImpUserName());
             metaImpUserModelInfoVO.setImpUserIdCard(metaImpUserModelInfo.getImpUserIdCard());
             metaImpUserModelInfoVO.setWarningTime(metaImpUserModelInfo.getWarningTime());
+            metaImpUserModelInfoVO.setType("重点人员");
+            if (metaImpUserModelInfo.getDataType() == 101003){
+                metaImpUserModelInfoVO.setValue(metaImpUserModelInfo.getValue3());
+            }
+            if (metaImpUserModelInfo.getDataType() == 060001){
+                metaImpUserModelInfoVO.setValue(metaImpUserModelInfo.getValue4());
+            }
             metaImpUserModelInfoVOS.add(metaImpUserModelInfoVO);
+
         }
 
         for (TransitHuntersUserModelRecord transitHuntersUserModelRecord : list1){
@@ -78,9 +85,11 @@ public class MetaImpUserModelInfoController  extends BaseController {
             metaImpUserModelInfoVO.setImpUserSubTypeCn(transitHuntersUserModelRecord.getHuntersUserTypeCn());
             metaImpUserModelInfoVO.setImpUserName(transitHuntersUserModelRecord.getHuntersUserName());
             metaImpUserModelInfoVO.setImpUserIdCard(transitHuntersUserModelRecord.getHuntersUserIdCard());
+            metaImpUserModelInfoVO.setValue(transitHuntersUserModelRecord.getFirstUserPic());
             String warningTime = transitHuntersUserModelRecord.getWarningTime();
             LocalDateTime localDateTime = LocalDateTime.parse(warningTime, inputFormatter);
             metaImpUserModelInfoVO.setWarningTime(localDateTime.format(formatter));
+            metaImpUserModelInfoVO.setType("狩猎人员");
             metaImpUserModelInfoVOS.add(metaImpUserModelInfoVO);
         }
         List<MetaImpUserModelInfoVO> infoVOS = metaImpUserModelInfoVOS.stream()
diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/vo/MetaImpUserModelInfoVO.java b/gather-app/src/main/java/com/ruoyi/database/domain/vo/MetaImpUserModelInfoVO.java
index b13daf1..d8c0ac2 100644
--- a/gather-app/src/main/java/com/ruoyi/database/domain/vo/MetaImpUserModelInfoVO.java
+++ b/gather-app/src/main/java/com/ruoyi/database/domain/vo/MetaImpUserModelInfoVO.java
@@ -29,4 +29,6 @@ public class MetaImpUserModelInfoVO extends BaseEntity {
 
     private String value;
 
+    private String type;
+
 }
\ No newline at end of file