Merge branch 'dev/feat/partner1.1_20230727' into hxd/feat/interviewSelect

# Conflicts: # coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInterviewInspectionLogMapper.java # coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewInspectionServiceImpl.java
2023-07-21 17:12:35 +08:00
parent dc8f27a365 cd607517da
commit 6e7eef3457
28 changed files with 467 additions and 459 deletions
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java
@@ -116,4 +116,17 @@ public class HyOpenAreaInfoDAO {
    public List<HyOpenAreaInfoDO> getAllOpenArea(){
        return hyOpenAreaInfoMapper.getAllOpenArea();
    }
+
+    /**
+     * 过滤叶子节点
+     * @param openAreaIds
+     * @return 叶子节点id
+     */
+    public List<Long> filterLeafNode(List<Long> openAreaIds){
+        if(CollectionUtils.isEmpty(openAreaIds)){
+            return Lists.newArrayList();
+        }
+        return hyOpenAreaInfoMapper.filterLeafNode(openAreaIds);
+    }
+
 }
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInspectionMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInspectionMapper.java
@@ -1,6 +1,6 @@
 package com.cool.store.mapper;

-import com.cool.store.entity.HyInspection;
+import com.cool.store.entity.HyInspectionDO;
 import com.cool.store.request.GetInterviewInspectionListReq;
 import com.cool.store.request.GetInterviewInspectionResultListReq;
 import com.cool.store.vo.interview.InterviewInspectionHistoryInfo;
@@ -16,15 +16,15 @@ import java.util.List;
 public interface HyInspectionMapper {
    int deleteByPrimaryKey(Long id);

-    int insert(HyInspection record);
+    int insert(HyInspectionDO record);

-    int insertSelective(HyInspection record);
+    int insertSelective(HyInspectionDO record);

-    HyInspection selectByPrimaryKey(Long id);
+    HyInspectionDO selectByPrimaryKey(Long id);

-    int updateByPrimaryKeySelective(HyInspection record);
+    int updateByPrimaryKeySelective(HyInspectionDO record);

-    int updateByPrimaryKey(HyInspection record);
+    int updateByPrimaryKey(HyInspectionDO record);

    List<InterviewInspectionVO> interviewInspectionGetList(GetInterviewInspectionListReq request);

--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInspectionSettingMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInspectionSettingMapper.java
@@ -57,5 +57,5 @@ public interface HyInspectionSettingMapper {
     * @param inspectionUserId
     * @return
     */
-    List<HyInspectionSettingDO> getHyInspectionSettingByUserId(String inspectionUserId, Long excludeInspectionSettingId);
+    List<HyInspectionSettingDO> getHyInspectionSettingByUserId(@Param("inspectionUserId") String inspectionUserId, @Param("excludeInspectionSettingId") Long excludeInspectionSettingId);
 }
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInterviewInspectionLogMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInterviewInspectionLogMapper.java
@@ -2,6 +2,7 @@ package com.cool.store.mapper;

 import com.cool.store.entity.HyInterviewInspectionLog;
 import com.cool.store.vo.interview.InterviewInspectionHistoryInfo;
+import com.cool.store.entity.HyInterviewInspectionLogDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

@@ -11,15 +12,16 @@ import java.util.List;
 public interface HyInterviewInspectionLogMapper {
    int deleteByPrimaryKey(Long id);

-    int insert(HyInterviewInspectionLog record);
+    int insert(HyInterviewInspectionLogDO record);

-    int insertSelective(HyInterviewInspectionLog record);
+    int insertSelective(HyInterviewInspectionLogDO record);

-    HyInterviewInspectionLog selectByPrimaryKey(Long id);
+    HyInterviewInspectionLogDO selectByPrimaryKey(Long id);

-    int updateByPrimaryKeySelective(HyInterviewInspectionLog record);
+    int updateByPrimaryKeySelective(HyInterviewInspectionLogDO record);

    int updateByPrimaryKey(HyInterviewInspectionLog record);

    List<InterviewInspectionHistoryInfo> interviewInspectionGetHistoryDetail(@Param("inspectionId") Long id);
+    int updateByPrimaryKey(HyInterviewInspectionLogDO record);
 }
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java
@@ -111,5 +111,11 @@ public interface HyOpenAreaInfoMapper {
     */
    List<HyOpenAreaInfoDO> getAllOpenArea();

+    /**
+     * 过滤叶子节点
+     * @param openAreaIds
+     * @return
+     */
+    List<Long> filterLeafNode(@Param("openAreaIds") List<Long> openAreaIds);

 }
--- a/coolstore-partner-dao/src/main/resources/mapper/HyInspectionMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyInspectionMapper.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cool.store.mapper.HyInspectionMapper">
-  <resultMap id="BaseResultMap" type="com.cool.store.entity.HyInspection">
+  <resultMap id="BaseResultMap" type="com.cool.store.entity.HyInspectionDO">
    <constructor>
-      <idArg column="id" javaType="java.lang.Long" jdbcType="BIGINT" />
-      <arg column="interview_plan_id" javaType="java.lang.Long" jdbcType="BIGINT" />
-      <arg column="operator_user_id" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="type" javaType="java.lang.Integer" jdbcType="TINYINT" />
-      <arg column="status" javaType="java.lang.Integer" jdbcType="TINYINT" />
-      <arg column="files" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="description" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="inspection_time" javaType="java.lang.String" jdbcType="TIMESTAMP" />
-      <arg column="creator" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="updator" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="remark" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="deleted" javaType="java.lang.Boolean" jdbcType="BIT" />
-      <arg column="create_time" javaType="java.lang.String" jdbcType="TIMESTAMP" />
-      <arg column="update_time" javaType="java.lang.String" jdbcType="TIMESTAMP" />
+      <idArg column="id" javaType="java.lang.Long" />
+      <arg column="interview_plan_id" javaType="java.lang.Long" />
+      <arg column="operator_user_id" javaType="java.lang.String" />
+      <arg column="type" javaType="java.lang.Integer" />
+      <arg column="status" javaType="java.lang.Integer" />
+      <arg column="files" javaType="java.lang.String" />
+      <arg column="description" javaType="java.lang.String" />
+      <arg column="inspection_time" javaType="java.lang.String" />
+      <arg column="creator" javaType="java.lang.String" />
+      <arg column="updator" javaType="java.lang.String" />
+      <arg column="remark" javaType="java.lang.String" />
+      <arg column="deleted" javaType="java.lang.Boolean" />
+      <arg column="create_time" javaType="java.lang.String" />
+      <arg column="update_time" javaType="java.lang.String" />
    </constructor>
  </resultMap>
  <sql id="Base_Column_List">
@@ -148,19 +148,19 @@
    delete from hy_inspection
    where id = #{id}
  </delete>
-  <insert id="insert" parameterType="com.cool.store.entity.HyInspection">
+  <insert id="insert" parameterType="com.cool.store.entity.HyInspectionDO">
    insert into hy_inspection (id, interview_plan_id, operator_user_id, 
      type, status, files, 
      description, inspection_time, creator, 
      updator, remark, deleted, 
      create_time, update_time)
-    values (#{id}, #{interviewPlanId}, #{operatorUserId,jdbcType=VARCHAR}, 
-      #{type,jdbcType=TINYINT}, #{status,jdbcType=TINYINT}, #{files,jdbcType=VARCHAR}, 
-      #{description,jdbcType=VARCHAR}, #{inspectionTime,jdbcType=TIMESTAMP}, #{creator,jdbcType=VARCHAR}, 
-      #{updator,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{deleted,jdbcType=BIT}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
+    values (#{id}, #{interviewPlanId}, #{operatorUserId}, 
+      #{type}, #{status}, #{files}, 
+      #{description}, #{inspectionTime}, #{creator}, 
+      #{updator}, #{remark}, #{deleted}, 
+      #{createTime}, #{updateTime})
  </insert>
-  <insert id="insertSelective" parameterType="com.cool.store.entity.HyInspection">
+  <insert id="insertSelective" parameterType="com.cool.store.entity.HyInspectionDO">
    insert into hy_inspection
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null">
@@ -214,103 +214,103 @@
        #{interviewPlanId},
      </if>
      <if test="operatorUserId != null">
-        #{operatorUserId,jdbcType=VARCHAR},
+        #{operatorUserId},
      </if>
      <if test="type != null">
-        #{type,jdbcType=TINYINT},
+        #{type},
      </if>
      <if test="status != null">
-        #{status,jdbcType=TINYINT},
+        #{status},
      </if>
      <if test="files != null">
-        #{files,jdbcType=VARCHAR},
+        #{files},
      </if>
      <if test="description != null">
-        #{description,jdbcType=VARCHAR},
+        #{description},
      </if>
      <if test="inspectionTime != null">
-        #{inspectionTime,jdbcType=TIMESTAMP},
+        #{inspectionTime},
      </if>
      <if test="creator != null">
-        #{creator,jdbcType=VARCHAR},
+        #{creator},
      </if>
      <if test="updator != null">
-        #{updator,jdbcType=VARCHAR},
+        #{updator},
      </if>
      <if test="remark != null">
-        #{remark,jdbcType=VARCHAR},
+        #{remark},
      </if>
      <if test="deleted != null">
-        #{deleted,jdbcType=BIT},
+        #{deleted},
      </if>
      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
+        #{createTime},
      </if>
      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
+        #{updateTime},
      </if>
    </trim>
  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.cool.store.entity.HyInspection">
+  <update id="updateByPrimaryKeySelective" parameterType="com.cool.store.entity.HyInspectionDO">
    update hy_inspection
    <set>
      <if test="interviewPlanId != null">
        interview_plan_id = #{interviewPlanId},
      </if>
      <if test="operatorUserId != null">
-        operator_user_id = #{operatorUserId,jdbcType=VARCHAR},
+        operator_user_id = #{operatorUserId},
      </if>
      <if test="type != null">
-        type = #{type,jdbcType=TINYINT},
+        type = #{type},
      </if>
      <if test="status != null">
-        status = #{status,jdbcType=TINYINT},
+        status = #{status},
      </if>
      <if test="files != null">
-        files = #{files,jdbcType=VARCHAR},
+        files = #{files},
      </if>
      <if test="description != null">
-        description = #{description,jdbcType=VARCHAR},
+        description = #{description},
      </if>
      <if test="inspectionTime != null">
-        inspection_time = #{inspectionTime,jdbcType=TIMESTAMP},
+        inspection_time = #{inspectionTime},
      </if>
      <if test="creator != null">
-        creator = #{creator,jdbcType=VARCHAR},
+        creator = #{creator},
      </if>
      <if test="updator != null">
-        updator = #{updator,jdbcType=VARCHAR},
+        updator = #{updator},
      </if>
      <if test="remark != null">
-        remark = #{remark,jdbcType=VARCHAR},
+        remark = #{remark},
      </if>
      <if test="deleted != null">
-        deleted = #{deleted,jdbcType=BIT},
+        deleted = #{deleted},
      </if>
      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
+        create_time = #{createTime},
      </if>
      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
+        update_time = #{updateTime},
      </if>
    </set>
    where id = #{id}
  </update>
-  <update id="updateByPrimaryKey" parameterType="com.cool.store.entity.HyInspection">
+  <update id="updateByPrimaryKey" parameterType="com.cool.store.entity.HyInspectionDO">
    update hy_inspection
    set interview_plan_id = #{interviewPlanId},
-      operator_user_id = #{operatorUserId,jdbcType=VARCHAR},
-      type = #{type,jdbcType=TINYINT},
-      status = #{status,jdbcType=TINYINT},
-      files = #{files,jdbcType=VARCHAR},
-      description = #{description,jdbcType=VARCHAR},
-      inspection_time = #{inspectionTime,jdbcType=TIMESTAMP},
-      creator = #{creator,jdbcType=VARCHAR},
-      updator = #{updator,jdbcType=VARCHAR},
-      remark = #{remark,jdbcType=VARCHAR},
-      deleted = #{deleted,jdbcType=BIT},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
+      operator_user_id = #{operatorUserId},
+      type = #{type},
+      status = #{status},
+      files = #{files},
+      description = #{description},
+      inspection_time = #{inspectionTime},
+      creator = #{creator},
+      updator = #{updator},
+      remark = #{remark},
+      deleted = #{deleted},
+      create_time = #{createTime},
+      update_time = #{updateTime}
    where id = #{id}
  </update>
 </mapper>
--- a/coolstore-partner-dao/src/main/resources/mapper/HyInspectionSettingMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyInspectionSettingMapper.xml
@@ -130,7 +130,7 @@
        from
            hy_inspection_setting
        where
-            deleted = '0' and inspection_user_id = #{excludeInspectionSettingId}
+            deleted = '0' and inspection_user_id = #{inspectionUserId}
            <if test="excludeInspectionSettingId != null">
                and id != #{excludeInspectionSettingId}
            </if>
--- a/coolstore-partner-dao/src/main/resources/mapper/HyInspectionSettingMappingMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyInspectionSettingMappingMapper.xml
@@ -115,7 +115,7 @@
        where
            open_area_mapping_id in <foreach collection="openAreaMappingIds" separator="," open="(" close=")" item="openAreaMappingId" >#{openAreaMappingId}</foreach>
            <if test="excludeInspectionSettingId != null">
-                and inspection_setting_id != #{inspectionSettingId}
+                and inspection_setting_id != #{excludeInspectionSettingId}
            </if>
    </update>
 </mapper>
--- a/coolstore-partner-dao/src/main/resources/mapper/HyInterviewInspectionLogMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyInterviewInspectionLogMapper.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cool.store.mapper.HyInterviewInspectionLogMapper">
-  <resultMap id="BaseResultMap" type="com.cool.store.entity.HyInterviewInspectionLog">
+  <resultMap id="BaseResultMap" type="com.cool.store.entity.HyInterviewInspectionLogDO">
    <constructor>
-      <idArg column="id" javaType="java.lang.Long" jdbcType="BIGINT" />
-      <arg column="operator_user_id" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="inspection_id" javaType="java.lang.Long" jdbcType="BIGINT" />
-      <arg column="operation_type" javaType="java.lang.Byte" jdbcType="TINYINT" />
-      <arg column="description" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="files" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="operation_time" javaType="java.lang.String" jdbcType="TIMESTAMP" />
-      <arg column="remark" javaType="java.lang.String" jdbcType="VARCHAR" />
-      <arg column="create_time" javaType="java.lang.String" jdbcType="TIMESTAMP" />
-      <arg column="update_time" javaType="java.lang.String" jdbcType="TIMESTAMP" />
+      <idArg column="id" javaType="java.lang.Long" />
+      <arg column="operator_user_id" javaType="java.lang.String" />
+      <arg column="inspection_id" javaType="java.lang.Long" />
+      <arg column="operation_type" javaType="java.lang.Byte" />
+      <arg column="description" javaType="java.lang.String" />
+      <arg column="files" javaType="java.lang.String" />
+      <arg column="operation_time" javaType="java.lang.String" />
+      <arg column="remark" javaType="java.lang.String" />
+      <arg column="create_time" javaType="java.lang.String" />
+      <arg column="update_time" javaType="java.lang.String" />
    </constructor>
  </resultMap>
  <sql id="Base_Column_List">
@@ -23,7 +23,7 @@
    select 
    <include refid="Base_Column_List" />
    from hy_interview_inspection_log
-    where id = #{id,jdbcType=BIGINT}
+    where id = #{id}
  </select>
    <select id="interviewInspectionGetHistoryDetail"  resultType="com.cool.store.vo.interview.InterviewInspectionHistoryInfo">
      SELECT a.id,  b.`name` as  auditorName, b.mobile  as  auditorMobile,operation_time as  inspectionTime, operation_type as operationType ,description,files as filesStr
@@ -31,19 +31,19 @@
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
    delete from hy_interview_inspection_log
-    where id = #{id,jdbcType=BIGINT}
+    where id = #{id}
  </delete>
-  <insert id="insert" parameterType="com.cool.store.entity.HyInterviewInspectionLog">
+  <insert id="insert" parameterType="com.cool.store.entity.HyInterviewInspectionLogDO">
    insert into hy_interview_inspection_log (id, operator_user_id, inspection_id, 
      operation_type, description, files, 
      operation_time, remark, create_time, 
      update_time)
-    values (#{id,jdbcType=BIGINT}, #{operatorUserId,jdbcType=VARCHAR}, #{inspectionId,jdbcType=BIGINT}, 
-      #{operationType,jdbcType=TINYINT}, #{description,jdbcType=VARCHAR}, #{files,jdbcType=VARCHAR}, 
-      #{operationTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP})
+    values (#{id}, #{operatorUserId}, #{inspectionId}, 
+      #{operationType}, #{description}, #{files}, 
+      #{operationTime}, #{remark}, #{createTime}, 
+      #{updateTime})
  </insert>
-  <insert id="insertSelective" parameterType="com.cool.store.entity.HyInterviewInspectionLog">
+  <insert id="insertSelective" parameterType="com.cool.store.entity.HyInterviewInspectionLogDO">
    insert into hy_interview_inspection_log
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null">
@@ -79,81 +79,81 @@
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null">
-        #{id,jdbcType=BIGINT},
+        #{id},
      </if>
      <if test="operatorUserId != null">
-        #{operatorUserId,jdbcType=VARCHAR},
+        #{operatorUserId},
      </if>
      <if test="inspectionId != null">
-        #{inspectionId,jdbcType=BIGINT},
+        #{inspectionId},
      </if>
      <if test="operationType != null">
-        #{operationType,jdbcType=TINYINT},
+        #{operationType},
      </if>
      <if test="description != null">
-        #{description,jdbcType=VARCHAR},
+        #{description},
      </if>
      <if test="files != null">
-        #{files,jdbcType=VARCHAR},
+        #{files},
      </if>
      <if test="operationTime != null">
-        #{operationTime,jdbcType=TIMESTAMP},
+        #{operationTime},
      </if>
      <if test="remark != null">
-        #{remark,jdbcType=VARCHAR},
+        #{remark},
      </if>
      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
+        #{createTime},
      </if>
      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
+        #{updateTime},
      </if>
    </trim>
  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.cool.store.entity.HyInterviewInspectionLog">
+  <update id="updateByPrimaryKeySelective" parameterType="com.cool.store.entity.HyInterviewInspectionLogDO">
    update hy_interview_inspection_log
    <set>
      <if test="operatorUserId != null">
-        operator_user_id = #{operatorUserId,jdbcType=VARCHAR},
+        operator_user_id = #{operatorUserId},
      </if>
      <if test="inspectionId != null">
-        inspection_id = #{inspectionId,jdbcType=BIGINT},
+        inspection_id = #{inspectionId},
      </if>
      <if test="operationType != null">
-        operation_type = #{operationType,jdbcType=TINYINT},
+        operation_type = #{operationType},
      </if>
      <if test="description != null">
-        description = #{description,jdbcType=VARCHAR},
+        description = #{description},
      </if>
      <if test="files != null">
-        files = #{files,jdbcType=VARCHAR},
+        files = #{files},
      </if>
      <if test="operationTime != null">
-        operation_time = #{operationTime,jdbcType=TIMESTAMP},
+        operation_time = #{operationTime},
      </if>
      <if test="remark != null">
-        remark = #{remark,jdbcType=VARCHAR},
+        remark = #{remark},
      </if>
      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
+        create_time = #{createTime},
      </if>
      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
+        update_time = #{updateTime},
      </if>
    </set>
-    where id = #{id,jdbcType=BIGINT}
+    where id = #{id}
  </update>
-  <update id="updateByPrimaryKey" parameterType="com.cool.store.entity.HyInterviewInspectionLog">
+  <update id="updateByPrimaryKey" parameterType="com.cool.store.entity.HyInterviewInspectionLogDO">
    update hy_interview_inspection_log
-    set operator_user_id = #{operatorUserId,jdbcType=VARCHAR},
-      inspection_id = #{inspectionId,jdbcType=BIGINT},
-      operation_type = #{operationType,jdbcType=TINYINT},
-      description = #{description,jdbcType=VARCHAR},
-      files = #{files,jdbcType=VARCHAR},
-      operation_time = #{operationTime,jdbcType=TIMESTAMP},
-      remark = #{remark,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=BIGINT}
+    set operator_user_id = #{operatorUserId},
+      inspection_id = #{inspectionId},
+      operation_type = #{operationType},
+      description = #{description},
+      files = #{files},
+      operation_time = #{operationTime},
+      remark = #{remark},
+      create_time = #{createTime},
+      update_time = #{updateTime}
+    where id = #{id}
  </update>
 </mapper>
--- a/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml
@@ -285,4 +285,13 @@
    select <include refid="Base_Column_List"/> from hy_open_area_info
  </select>

+  <select id="filterLeafNode" resultType="long">
+    select
+      id
+    from
+      hy_open_area_info
+    where
+      deleted = '0' and province_city_flag = '0' and id in <foreach collection="openAreaIds" item="openAreaId" separator="," open="(" close=")">#{openAreaId}</foreach>
+  </select>
+
 </mapper>