feat: 新需求

ruoyi-system/src/main/java/com/ruoyi/system/service/house/impl/HouseResourceServiceImpl.java

@@ -663,6 +663,32 @@ public class HouseResourceServiceImpl implements HouseResourceService {
             emptyNewObjectList.add(simpleObject7);
             houseResourceDataCollection.setNewObject(emptyNewObjectList);
         } else {
+            Map<Integer, Long> collect1 = newObjectList.stream().collect(Collectors.toMap(HouseResourceDataCollectionSimpleObject::getType, HouseResourceDataCollectionSimpleObject::getCount));
+            if (null == collect1.get(1)) {
+                HouseResourceDataCollectionSimpleObject simpleObject1 = new HouseResourceDataCollectionSimpleObject();
+                simpleObject1.setType(1);
+                newObjectList.add(simpleObject1);
+            }
+            if (null == collect1.get(4)) {
+                HouseResourceDataCollectionSimpleObject simpleObject4 = new HouseResourceDataCollectionSimpleObject();
+                simpleObject4.setType(4);
+                newObjectList.add(simpleObject4);
+            }
+            if (null == collect1.get(5)) {
+                HouseResourceDataCollectionSimpleObject simpleObject5 = new HouseResourceDataCollectionSimpleObject();
+                simpleObject5.setType(5);
+                newObjectList.add(simpleObject5);
+            }
+            if (null == collect1.get(6)) {
+                HouseResourceDataCollectionSimpleObject simpleObject6 = new HouseResourceDataCollectionSimpleObject();
+                simpleObject6.setType(6);
+                newObjectList.add(simpleObject6);
+            }
+            if (null == collect1.get(7)) {
+                HouseResourceDataCollectionSimpleObject simpleObject7 = new HouseResourceDataCollectionSimpleObject();
+                simpleObject7.setType(7);
+                newObjectList.add(simpleObject7);
+            }
             houseResourceDataCollection.setNewObject(newObjectList);
         }
         List<HouseResourceDataCollectionSimpleObject> editObjectList = houseResourceMapper.selectHouseResourceByUpdateTime(query);
@@ -685,6 +711,32 @@ public class HouseResourceServiceImpl implements HouseResourceService {
             emptyEditObjectList.add(simpleObject7);
             houseResourceDataCollection.setEditObject(emptyEditObjectList);
         } else {
+            Map<Integer, Long> collect2 = editObjectList.stream().collect(Collectors.toMap(HouseResourceDataCollectionSimpleObject::getType, HouseResourceDataCollectionSimpleObject::getCount));
+            if (null == collect2.get(1)) {
+                HouseResourceDataCollectionSimpleObject simpleObject1 = new HouseResourceDataCollectionSimpleObject();
+                simpleObject1.setType(1);
+                editObjectList.add(simpleObject1);
+            }
+            if (null == collect2.get(4)) {
+                HouseResourceDataCollectionSimpleObject simpleObject4 = new HouseResourceDataCollectionSimpleObject();
+                simpleObject4.setType(4);
+                editObjectList.add(simpleObject4);
+            }
+            if (null == collect2.get(5)) {
+                HouseResourceDataCollectionSimpleObject simpleObject5 = new HouseResourceDataCollectionSimpleObject();
+                simpleObject5.setType(5);
+                editObjectList.add(simpleObject5);
+            }
+            if (null == collect2.get(6)) {
+                HouseResourceDataCollectionSimpleObject simpleObject6 = new HouseResourceDataCollectionSimpleObject();
+                simpleObject6.setType(6);
+                editObjectList.add(simpleObject6);
+            }
+            if (null == collect2.get(7)) {
+                HouseResourceDataCollectionSimpleObject simpleObject7 = new HouseResourceDataCollectionSimpleObject();
+                simpleObject7.setType(7);
+                editObjectList.add(simpleObject7);
+            }
             houseResourceDataCollection.setEditObject(editObjectList);
         }
         return houseResourceDataCollection;