Merge branch 'dev_pingyin_7_22' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridInfoPingyinDao.xml

@@ -3,32 +3,13 @@
 
 <mapper namespace="com.epmet.opendata.dao.GridInfoPingyinDao">
 
-    <resultMap type="com.epmet.opendata.entity.GridInfoPingyinEntity" id="gridInfoPingyinMap">
-        <result property="id" column="id"/>
-        <result property="qxBm" column="qx_bm"/>
-        <result property="qxMc" column="qx_mc"/>
-        <result property="gridCode" column="grid_code"/>
-        <result property="gridName" column="grid_name"/>
-        <result property="gridLevel" column="grid_level"/>
-        <result property="gridType" column="GRID_TYPE"/>
-        <result property="populationSize" column="POPULATION_SIZE"/>
-        <result property="isPartyBranch" column="IS_PARTY_BRANCH"/>
-        <result property="partyBranchType" column="PARTY_BRANCH_TYPE"/>
-        <result property="lng" column="lng"/>
-        <result property="lat" column="lat"/>
-        <result property="gridColor" column="grid_color"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="isDel" column="is_del"/>
-        <result property="recoredInsertTime" column="recored_insert_time"/>
-    </resultMap>
-
     <delete id="deleteAllAgencyData">
-        delete from grid_info_pingyin where grid_level !='7'
+        delete from grid_info_pingyin where grid_level !='07'
     </delete>
 
 
     <delete id="deleteAllGridData">
-        delete from grid_info_pingyin where grid_level ='7'
+        delete from grid_info_pingyin where grid_level ='07'
     </delete>
 
     <select id="selectByGridCode" parameterType="java.lang.String" resultType="com.epmet.opendata.entity.GridInfoPingyinEntity">
@@ -41,12 +22,13 @@
        set grid_name = #{gridName},
            grid_level = #{gridLevel},
            lng = #{lng},
-           lat = #{lat}
+           lat = #{lat},
+           update_time = now()
         where grid_code = #{gridCode} and is_del = 'N'
     </update>
 
     <update id="deleteByCode">
-        update grid_info_pingyin set is_del = 'Y'
+        update grid_info_pingyin set is_del = 'Y',update_time = now()
         where grid_code = #{gridCode}
     </update>
 </mapper>