feat: 需求

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/HouseResource.java

@@ -77,4 +77,6 @@ public class HouseResource implements Serializable {
     private String lat;
 
     private String remark;
+
+    private int deleteFlag;
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/vo/HouseResourceDataCollection.java

@@ -10,4 +10,6 @@ public class HouseResourceDataCollection {
     private List<HouseResourceDataCollectionSimpleObject> newObject;
 
     private List<HouseResourceDataCollectionSimpleObject> editObject;
+
+    private List<HouseResourceDataCollectionSimpleObject> deleteObject;
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/vo/HouseResourceDataCollectionQuery.java

@@ -15,7 +15,14 @@ public class HouseResourceDataCollectionQuery {
     private String four;
 
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date startDate;
+    private Date createTimeStart;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTimeEnd;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTimeStart;
+
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date endDate;
+    private Date updateTimeEnd;
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/house/HouseResourceMapper.java

@@ -39,4 +39,6 @@ public interface HouseResourceMapper {
     List<HouseResourceDataCollectionSimpleObject> selectHouseResourceByCreateTime(@Param("query") HouseResourceDataCollectionQuery query);
 
     List<HouseResourceDataCollectionSimpleObject> selectHouseResourceByUpdateTime(@Param("query") HouseResourceDataCollectionQuery query);
+
+    List<HouseResourceDataCollectionSimpleObject> selectHouseResourceByUpdateTimeDeleteFlag(@Param("query") HouseResourceDataCollectionQuery query);
 }

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

@@ -739,6 +739,54 @@ public class HouseResourceServiceImpl implements HouseResourceService {
             }
             houseResourceDataCollection.setEditObject(editObjectList);
         }
+        List<HouseResourceDataCollectionSimpleObject> deleteObjectList = houseResourceMapper.selectHouseResourceByUpdateTimeDeleteFlag(query);
+        if (CollectionUtils.isEmpty(deleteObjectList)) {
+            List<HouseResourceDataCollectionSimpleObject> emptyDeleteObjectList = new ArrayList<>();
+            HouseResourceDataCollectionSimpleObject simpleObject1 = new HouseResourceDataCollectionSimpleObject();
+            simpleObject1.setType(1);
+            emptyDeleteObjectList.add(simpleObject1);
+            HouseResourceDataCollectionSimpleObject simpleObject4 = new HouseResourceDataCollectionSimpleObject();
+            simpleObject4.setType(4);
+            emptyDeleteObjectList.add(simpleObject4);
+            HouseResourceDataCollectionSimpleObject simpleObject5 = new HouseResourceDataCollectionSimpleObject();
+            simpleObject5.setType(5);
+            emptyDeleteObjectList.add(simpleObject5);
+            HouseResourceDataCollectionSimpleObject simpleObject6 = new HouseResourceDataCollectionSimpleObject();
+            simpleObject6.setType(6);
+            emptyDeleteObjectList.add(simpleObject6);
+            HouseResourceDataCollectionSimpleObject simpleObject7 = new HouseResourceDataCollectionSimpleObject();
+            simpleObject7.setType(7);
+            emptyDeleteObjectList.add(simpleObject7);
+            houseResourceDataCollection.setEditObject(emptyDeleteObjectList);
+        } else {
+            Map<Integer, Long> collect3 = deleteObjectList.stream().collect(Collectors.toMap(HouseResourceDataCollectionSimpleObject::getType, HouseResourceDataCollectionSimpleObject::getCount));
+            if (null == collect3.get(1)) {
+                HouseResourceDataCollectionSimpleObject simpleObject1 = new HouseResourceDataCollectionSimpleObject();
+                simpleObject1.setType(1);
+                deleteObjectList.add(simpleObject1);
+            }
+            if (null == collect3.get(4)) {
+                HouseResourceDataCollectionSimpleObject simpleObject4 = new HouseResourceDataCollectionSimpleObject();
+                simpleObject4.setType(4);
+                deleteObjectList.add(simpleObject4);
+            }
+            if (null == collect3.get(5)) {
+                HouseResourceDataCollectionSimpleObject simpleObject5 = new HouseResourceDataCollectionSimpleObject();
+                simpleObject5.setType(5);
+                deleteObjectList.add(simpleObject5);
+            }
+            if (null == collect3.get(6)) {
+                HouseResourceDataCollectionSimpleObject simpleObject6 = new HouseResourceDataCollectionSimpleObject();
+                simpleObject6.setType(6);
+                deleteObjectList.add(simpleObject6);
+            }
+            if (null == collect3.get(7)) {
+                HouseResourceDataCollectionSimpleObject simpleObject7 = new HouseResourceDataCollectionSimpleObject();
+                simpleObject7.setType(7);
+                deleteObjectList.add(simpleObject7);
+            }
+            houseResourceDataCollection.setDeleteObject(deleteObjectList);
+        }
         return houseResourceDataCollection;
     }
 

ruoyi-system/src/main/resources/mapper/house/HouseResourceMapper.xml

@@ -37,6 +37,7 @@
         <result property="lon" column="lon" jdbcType="VARCHAR"/>
         <result property="lat" column="lat" jdbcType="VARCHAR"/>
         <result property="remark" column="remark" jdbcType="VARCHAR"/>
+        <result property="deleteFlag" column="delete_flag" jdbcType="INTEGER"/>
     </resultMap>
 
     <insert id="insertHouseResource" parameterType="com.ruoyi.system.domain.house.HouseResource">
@@ -44,12 +45,12 @@
         (id, relation_id, two, three, four, type, project_id, house_resource_url, business_license_url, house_number, house_area,
          house_resource_attribute, house_resource_type, house_resource_use, house_resource_equity, business_status, house_resource_equity_tel, ownership,
          decoration_condition, orientation, landing_head_flag, common_area_number, office_number,
-         meeting_number, station_number, set_up, label_id, unit_price, rental_unit, plane_graph_url, hire_status, address, lon, lat, remark)
+         meeting_number, station_number, set_up, label_id, unit_price, rental_unit, plane_graph_url, hire_status, address, lon, lat, remark, delete_flag)
         VALUES
             (#{id}, #{relationId}, #{two}, #{three}, #{four}, #{type}, #{projectId}, #{houseResourceUrl}, #{businessLicenseUrl}, #{houseNumber}, #{houseArea},
              #{houseResourceAttribute}, #{houseResourceType}, #{houseResourceUse}, #{houseResourceEquity}, #{businessStatus}, #{houseResourceEquityTel}, #{ownership},
              #{decorationCondition}, #{orientation}, #{landingHeadFlag}, #{commonAreaNumber}, #{officeNumber},
-             #{meetingNumber}, #{stationNumber}, #{setUp}, #{labelId}, #{unitPrice}, #{rentalUnit}, #{planeGraphUrl}, #{hireStatus}, #{address}, #{lon}, #{lat}, #{remark})
+             #{meetingNumber}, #{stationNumber}, #{setUp}, #{labelId}, #{unitPrice}, #{rentalUnit}, #{planeGraphUrl}, #{hireStatus}, #{address}, #{lon}, #{lat}, #{remark}, #{deleteFlag})
     </insert>
 
     <select id="selectHouseResourceById" resultType="com.ruoyi.system.domain.house.HouseResource" parameterType="string">
@@ -91,12 +92,13 @@
             address = #{address},
             lon = #{lon},
             lat = #{lat},
-            remark = #{remark}
+            remark = #{remark},
+            delete_flag = #{deleteFlag}
         WHERE id = #{id}
     </update>
 
     <delete id="deleteHouseResourceById" parameterType="string">
-        DELETE FROM house_resource WHERE id = #{id}
+        UPDATE house_resource SET delete_flag = 1 WHERE id = #{id}
     </delete>
 
     <insert id="batchInsertHouseResources" parameterType="java.util.List">
@@ -104,7 +106,7 @@
         (id, relation_id, two, three, four, type, project_id, house_resource_url, business_license_url, house_number, house_area,
         house_resource_attribute, house_resource_type, house_resource_use, house_resource_equity, business_status, house_resource_equity_tel, ownership,
         decoration_condition, orientation, landing_head_flag, common_area_number, office_number,
-        meeting_number, station_number, set_up, label_id, unit_price, rental_unit, plane_graph_url, hire_status, address, lon, lat, remark)
+        meeting_number, station_number, set_up, label_id, unit_price, rental_unit, plane_graph_url, hire_status, address, lon, lat, remark, delete_flag)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (#{item.id}, #{item.relationId},  #{two}, #{three}, #{four}, #{item.type}, #{item.projectId}, #{item.houseResourceUrl}, #{item.businessLicenseUrl},
@@ -112,7 +114,7 @@
             #{item.houseResourceUse}, #{item.houseResourceEquity}, #{businessStatus}, #{item.houseResourceEquityTel}, #{ownership}, #{item.decorationCondition},
             #{item.orientation}, #{item.landingHeadFlag}, #{item.commonAreaNumber}, #{item.officeNumber},
             #{item.meetingNumber}, #{item.stationNumber}, #{item.setUp}, #{item.labelId}, #{item.unitPrice}, #{item.rentalUnit},
-            #{item.planeGraphUrl}, #{item.hireStatus}, #{item.address}, #{item.lon}, #{item.lat}, #{item.remark})
+            #{item.planeGraphUrl}, #{item.hireStatus}, #{item.address}, #{item.lon}, #{item.lat}, #{item.remark}, #{item.deleteFlag})
         </foreach>
     </insert>
 
@@ -133,7 +135,7 @@
         t5.year
         FROM
         house_resource t1
-        LEFT JOIN grid_region t2 ON t2.wg_code = t1.four
+        LEFT JOIN grid_region t2 ON t2.wg_code = t1.four AND t1.delete_flag = 0
         LEFT JOIN house_resource_business_entity_info_mapping t3 ON t3.house_resource_id = t1.id
         LEFT JOIN business_entity_info t4 ON t3.business_entity_info_id = t4.id
         LEFT JOIN business_entity_sell t5 ON t5.business_entity_info_id = t4.id
@@ -313,7 +315,7 @@
         t4.id AS businessEntityInfoId
         FROM
         house_resource t1
-        LEFT JOIN grid_region t2 ON t2.wg_code = t1.four
+        LEFT JOIN grid_region t2 ON t2.wg_code = t1.four AND t1.delete_flag = 0
         LEFT JOIN house_resource_business_entity_info_mapping t3 ON t3.house_resource_id = t1.id
         LEFT JOIN business_entity_info t4 ON t3.business_entity_info_id = t4.id
         LEFT JOIN business_entity_sell t5 ON t5.business_entity_info_id = t4.id
@@ -487,7 +489,7 @@
         t5.year
         FROM
         house_resource t1
-        LEFT JOIN grid_region t2 ON t2.wg_code = t1.four
+        LEFT JOIN grid_region t2 ON t2.wg_code = t1.four AND t1.delete_flag = 0
         LEFT JOIN house_resource_business_entity_info_mapping t3 ON t3.house_resource_id = t1.id
         LEFT JOIN business_entity_info t4 ON t3.business_entity_info_id = t4.id
         LEFT JOIN business_entity_sell t5 ON t5.business_entity_info_id = t4.id
@@ -690,7 +692,7 @@
         t1.business_license_url
         FROM
         house_resource t1
-        LEFT JOIN grid_region t2 ON t2.wg_code = t1.four
+        LEFT JOIN grid_region t2 ON t2.wg_code = t1.four AND t1.delete_flag = 0
         LEFT JOIN house_resource_business_entity_info_mapping t3 ON t3.house_resource_id = t1.id
         LEFT JOIN business_entity_info t4 ON t3.business_entity_info_id = t4.id
         LEFT JOIN business_entity_sell t5 ON t5.business_entity_info_id = t4.id
@@ -834,7 +836,7 @@
             SUM(t5.year_tax) AS taxCount
         FROM
             house_resource t1
-                LEFT JOIN grid_region t2 ON t2.wg_code = t1.four
+                LEFT JOIN grid_region t2 ON t2.wg_code = t1.four AND t1.delete_flag = 0
                 LEFT JOIN house_resource_business_entity_info_mapping t3 ON t3.house_resource_id = t1.id
                 LEFT JOIN business_entity_info t4 ON t3.business_entity_info_id = t4.id
                 LEFT JOIN business_entity_sell t5 ON t5.business_entity_info_id = t4.id
@@ -873,7 +875,7 @@
             t4.principal
         FROM
             house_resource t1
-                LEFT JOIN grid_region t2 ON t2.wg_code = t1.four
+                LEFT JOIN grid_region t2 ON t2.wg_code = t1.four AND t1.delete_flag = 0
                 LEFT JOIN house_resource_business_entity_info_mapping t3 ON t3.house_resource_id = t1.id
                 LEFT JOIN business_entity_info t4 ON t3.business_entity_info_id = t4.id
                 LEFT JOIN business_entity_sell t5 ON t5.business_entity_info_id = t4.id
@@ -902,11 +904,11 @@
             <if test="query.four != null and query.four != ''">
                 AND four = #{query.four}
             </if>
-            <if test="query.startDate != null">
-                AND create_time <![CDATA[ >= ]]> #{query.startDate}
+            <if test="query.createTimeStart != null">
+                AND create_time <![CDATA[ >= ]]> #{query.createTimeStart}
             </if>
-            <if test="query.endDate != null">
-                AND create_time <![CDATA[ <= ]]> #{query.endDate}
+            <if test="query.createTimeEnd != null">
+                AND create_time <![CDATA[ <= ]]> #{query.createTimeEnd}
             </if>
         </where>
         GROUP BY
@@ -929,14 +931,40 @@
             <if test="query.four != null and query.four != ''">
                 AND four = #{query.four}
             </if>
-            <if test="query.startDate != null">
-                AND update_time <![CDATA[ >= ]]> #{query.startDate}
+            <if test="query.updateTimeStart != null">
+                AND update_time <![CDATA[ >= ]]> #{query.updateTimeStart}
             </if>
-            <if test="query.endDate != null">
-                AND update_time <![CDATA[ <= ]]> #{query.endDate}
+            <if test="query.updateTimeEnd != null">
+                AND update_time <![CDATA[ <= ]]> #{query.updateTimeEnd}
             </if>
         </where>
         GROUP BY
         type
     </select>
+    <select id="selectHouseResourceByUpdateTimeDeleteFlag"
+            resultType="com.ruoyi.system.domain.house.vo.HouseResourceDataCollectionSimpleObject">
+        SELECT
+        type,
+        COUNT(*) AS count
+        FROM
+        house_resource
+        WHERE delete_flag = 1
+            <if test="query.two != null and query.two != ''">
+                AND two = #{query.two}
+            </if>
+            <if test="query.three != null and query.three != ''">
+                AND three = #{query.three}
+            </if>
+            <if test="query.four != null and query.four != ''">
+                AND four = #{query.four}
+            </if>
+            <if test="query.updateTimeStart != null">
+                AND update_time <![CDATA[ >= ]]> #{query.updateTimeStart}
+            </if>
+            <if test="query.updateTimeEnd != null">
+                AND update_time <![CDATA[ <= ]]> #{query.updateTimeEnd}
+            </if>
+        GROUP BY
+        type
+    </select>
 </mapper>