Merge branch 'master' of http://116.63.33.55/git/nazw

nngkxxdp/src/main/java/com/example/nngkxxdp/controller/MapDataController.java

@@ -125,10 +125,13 @@ public class MapDataController {
         mapErrorLog.put("originalAddress", request.getParameter("originalAddress"));
         mapErrorLog.put("originalLongitude", request.getParameter("originalLongitude"));
         mapErrorLog.put("originalLatitude", request.getParameter("originalLatitude"));
-        mapErrorLog.put("originalCoordinates", request.getParameter("originalCoordinates"));
+        mapErrorLog.put("originalPhone", request.getParameter("originalPhone"));
+        mapErrorLog.put("originalOfficeHours", request.getParameter("originalOfficeHours"));
         mapErrorLog.put("newAddress", request.getParameter("newAddress"));
         mapErrorLog.put("newLongitude", request.getParameter("newLongitude"));
         mapErrorLog.put("newLatitude", request.getParameter("newLatitude"));
+        mapErrorLog.put("newPhone", request.getParameter("newPhone"));
+        mapErrorLog.put("newOfficeHours", request.getParameter("newOfficeHours"));
         try {
             return mapDataService.saveErrorLog(mapErrorLog);
         } catch (Exception e) {

nngkxxdp/src/main/resources/mapper/MapDataDao.xml

@@ -31,7 +31,9 @@
 
     <!-- 删除对应ID的地图纠错信息-->
     <delete id="deleteErrorLog">
-        delete from s_map_errorlog where id = #{id}
+        delete
+        from s_map_errorlog
+        where id = #{id}
     </delete>
 
     <!-- 根据数据字典类型获取地图数据 -->
@@ -53,11 +55,12 @@
     <insert id="saveErrorLog" parameterType="map">
         INSERT INTO s_map_errorlog
         (s_map_id, address_name, original_address,
-         original_longitude, original_latitude, new_address,
+         original_longitude, original_latitude, original_hone, original_office_hours,
+         new_hone, new_office_hours, new_address,
          new_longitude, new_latitude, error_state, create_time)
             VALUE
             (#{sMapId},#{addressName},#{originalAddress},
-            #{originalLongitude},#{originalLatitude},
+            #{originalLongitude},#{originalLatitude},#{originalPhone},#{originalOfficeHours},#{newPhone},#{newOfficeHours},
             #{newAddress},#{newLongitude},#{newLatitude},#{errorState},#{createTime})
     </insert>
 
@@ -117,15 +120,15 @@
         FROM s_map_errorlog sme
                  left join s_map sm on sm.id = sme.s_map_id
         order by sme.create_time DESC
-        limit #{startRows},#{rows}
+            limit #{startRows}, #{rows}
     </select>
 
     <select id="queryMap" resultType="java.util.Map">
         select address,
-               ifnull(longitude, '') longitude,
-               ifnull(latitude, '') latitude,
-               dep name,
-               IF(dict_type = 'xxs', type, dict_type) dictType
+        ifnull(longitude, '') longitude,
+        ifnull(latitude, '') latitude,
+        dep name,
+        IF(dict_type = 'xxs', type, dict_type) dictType
         from s_map
         <where>
             <if test="null != name and '' != name">
@@ -150,11 +153,11 @@
 
     <update id="updateErrorLog">
         UPDATE s_map_errorlog
-        SET new_address = #{newAddress},
+        SET new_address   = #{newAddress},
             new_longitude = #{newLongitude},
-            new_latitude = #{newLatitude},
-            error_state = #{errorState},
-            update_time = #{updateTime}
+            new_latitude  = #{newLatitude},
+            error_state   = #{errorState},
+            update_time   = #{updateTime}
         WHERE id = #{id};
     </update>
 </mapper>