添加设备相关

fill-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterDatumVo.java

@@ -27,4 +27,6 @@ public class MatterDatumVo extends BaseEntityLong {
     private String deptName;
 
     private Integer pub;
+
+    private String devicenum;
 }
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java

@@ -15,6 +15,8 @@ import com.mortals.xhx.common.utils.StringUtils;
 import com.mortals.xhx.module.baseset.model.BasesetEntity;
 import com.mortals.xhx.module.baseset.model.BasesetQuery;
 import com.mortals.xhx.module.baseset.service.BasesetService;
+import com.mortals.xhx.module.device.model.DeviceMatterDatumQuery;
+import com.mortals.xhx.module.device.service.DeviceMatterDatumService;
 import com.mortals.xhx.module.hotword.model.HotwordEntity;
 import com.mortals.xhx.module.hotword.model.HotwordQuery;
 import com.mortals.xhx.module.hotword.service.HotwordService;
@@ -59,9 +61,9 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
     @Autowired
     private ParamService paramService;
     @Autowired
-    private HotwordService hotwordService;
-    @Autowired
     private BasesetService basesetService;
+    @Autowired
+    private DeviceMatterDatumService deviceMatterDatumService;
 
     public MatterDatumController() {
         super.setModuleDesc("事项申请材料");
@@ -76,7 +78,6 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
 
     @Override
     protected void doListBefore(MatterDatumEntity query, Map<String, Object> model, Context context) throws AppException {
-
         List<OrderCol> orderColList = new ArrayList<>();
         orderColList.add(new OrderCol("isRecommend", OrderCol.DESCENDING));
         orderColList.add(new OrderCol("createTime", OrderCol.DESCENDING));
@@ -157,9 +158,18 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
                 return matterDatumInfo;
             }).collect(Collectors.toList());
 
+            if(!ObjectUtils.isEmpty(query.getDevicenum())){
+                Set<Long> matterSet = deviceMatterDatumService.find(new DeviceMatterDatumQuery().deviceCode(query.getDevicenum())).stream().map(item -> item.getMatterId()).collect(Collectors.toSet());
+                Iterator<MatterDatumInfo> iterator = collect.iterator();
+                while (iterator.hasNext()) {
+                    MatterDatumInfo next =  iterator.next();
+                    if(matterSet.contains(next.getMatterId())){
+                        iterator.remove();
+                    }
+                }
+            }
             model.put(KEY_RESULT_DATA, collect);
             model.put(PAGEINFO_KEY, result.getPageInfo());
-
             model.put(MESSAGE_INFO, busiDesc + "成功");
             recordSysLog(request, busiDesc + " 【成功】");
         } catch (Exception e) {
@@ -173,7 +183,4 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
         return ret;
     }
 
-
-
-
 }
\ No newline at end of file