Merge remote-tracking branch 'origin/develop' into develop

gather-app/src/main/java/com/ruoyi/database/controller/DisposalInfoController.java

@@ -62,12 +62,15 @@ public class DisposalInfoController extends BaseController {
                     transitHuntersUserModelRecord.setSignStatusCn("已签收已反馈");
                 }
                 transitHuntersUserModelRecord.setDisposalResult(one.getDisposalResult());
-                if (one.getDisposalResult() == 1){
+                if (one.getDisposalResult() == 1) {
                     transitHuntersUserModelRecord.setDisposalResultCn("无风险");
                 }
-                if (one.getDisposalResult() == 2){
+                if (one.getDisposalResult() == 2) {
                     transitHuntersUserModelRecord.setDisposalResultCn("有风险");
                 }
+                if (one.getDisposalResult() == 3) {
+                    transitHuntersUserModelRecord.setDisposalResultCn("待查");
+                }
             } else {
                 transitHuntersUserModelRecord.setSignStatusCn("未签收");
                 transitHuntersUserModelRecord.setSignStatus(1);
@@ -75,7 +78,15 @@ public class DisposalInfoController extends BaseController {
             String warningTime = transitHuntersUserModelRecord.getWarningTime();
             LocalDateTime localDateTime = LocalDateTime.parse(warningTime, inputFormatter);
             transitHuntersUserModelRecord.setWarningTime(localDateTime.format(formatter));
-            transitHuntersUserModelRecords.add(transitHuntersUserModelRecord);
+            if (modelRecord.getDisposalResultCn() != null && modelRecord.getDisposalResultCn().equals(transitHuntersUserModelRecord.getDisposalResultCn())) {
+                transitHuntersUserModelRecords.add(transitHuntersUserModelRecord);
+            }
+            if (modelRecord.getSignStatusCn() != null && modelRecord.getSignStatusCn().equals(transitHuntersUserModelRecord.getSignStatusCn())){
+                transitHuntersUserModelRecords.add(transitHuntersUserModelRecord);
+            }
+            if (modelRecord.getSignStatusCn() == null && modelRecord.getDisposalResultCn() == null){
+                transitHuntersUserModelRecords.add(transitHuntersUserModelRecord);
+            }
         }
         TableDataInfo dataTable = getDataTable(transitHuntersUserModelRecords);
         dataTable.setTotal(count);
@@ -95,6 +106,10 @@ public class DisposalInfoController extends BaseController {
                 disposalInfo.setDisposalResult(2);
             }
 
+            if ("待查".equals(disposalInfo.getDisposalResultCn())) {
+                disposalInfo.setDisposalResult(3);
+            }
+
             if (disposalInfo.getSignPoliceman() != null && disposalInfo.getSignPoliceStation() != null) {
                 disposalInfo.setSignStatus(2);
             }
@@ -122,4 +137,12 @@ public class DisposalInfoController extends BaseController {
         DisposalInfo one = disposalInfoService.getOne(queryWrapper);
         return AjaxResult.success(one);
     }
+
+    @GetMapping("/count")
+    @ApiOperation("查找未处置条数")
+    public AjaxResult disposalInfoCount() {
+        int count = disposalInfoService.count();
+        int count1 = transitHuntersUserModelRecordService.count();
+        return AjaxResult.success(count1 - count);
+    }
 }

gather-app/src/main/java/com/ruoyi/database/controller/MetaImpUserModelInfoController.java

@@ -239,6 +239,14 @@ public class MetaImpUserModelInfoController extends BaseController {
         return getDataTable(infoVOS);
     }
 
+    @GetMapping("/list")
+    @ApiOperation("查询重点人员预警信息列表")
+    public TableDataInfo<MetaImpUserModelInfo> tableDataInfoList(MetaImpUserModelInfo metaImpUserModelInfo) {
+        startPage();
+        List<MetaImpUserModelInfo> list = metaImpUserModelInfoService.list(new QueryWrapper<>(metaImpUserModelInfo));
+        return getDataTable(list);
+    }
+
 }