森林管理

mybusiness/src/main/resources/mapper/grid/manager/TResForestdeviceMapper.xml

@@ -25,10 +25,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remarks"    column="remarks"    />
         <result property="deptName"    column="dept_name"    />
         <result property="createUserId"    column="create_user_id"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
     </resultMap>
 
     <sql id="selectTResForestdeviceVo">
-        select t.dept_id,
+        select t.dept_id, t.longitude, t.latitude,
         (select dept_name from sys_dept where dept_id=t.dept_id) dept_name,
         t.create_user_id, t.id, t.status, t.remark, t.del_flag, t.create_by, t.create_time, t.update_by, t.update_time, t.code, t.name,
          (select dept_name from sys_dept where sys_dept.dept_id = t.dept_id) deptIdStr,
@@ -53,6 +55,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nextMaintenance != null "> and next_maintenance = #{nextMaintenance}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="createUserId != null  and createUserId != ''"> and create_user_id = #{createUserId}</if>
+            <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
+            <if test="latitude != null  and latitude != ''"> and latitude = #{latitude}</if>
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
@@ -85,6 +89,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nextMaintenance != null">next_maintenance,</if>
             <if test="remarks != null">remarks,</if>
             <if test="createUserId != null">create_user_id,</if>
+            <if test="latitude != null">latitude,</if>
+            <if test="address != null">address,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null and id != ''">#{id},</if>
@@ -106,6 +112,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nextMaintenance != null">#{nextMaintenance},</if>
             <if test="remarks != null">#{remarks},</if>
             <if test="createUserId != null">#{createUserId},</if>
+            <if test="latitude != null">#{latitude},</if>
+            <if test="address != null">#{address},</if>
          </trim>
     </insert>
 
@@ -130,6 +138,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nextMaintenance != null">next_maintenance = #{nextMaintenance},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
             <if test="createUserId != null">create_user_id = #{createUserId},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
         </trim>
         where id = #{id}
     </update>

mybusiness/src/main/resources/templates/business/manager/forestdevicemanager/add.html

@@ -135,6 +135,8 @@
             rules:{
                 maintenance:{
                     number:true
+                },contactPhone:{
+                    isPhone:true
                 }
             }
         });

mybusiness/src/main/resources/templates/business/manager/forestdevicemanager/edit.html

@@ -124,6 +124,9 @@
             rules:{
                 maintenance:{
                     number:true
+                },
+                contactPhone:{
+                    isPhone:true
                 }
             }
         });

mybusiness/src/main/resources/templates/business/manager/forestdevicemanager/index.html

@@ -132,6 +132,14 @@
                     title: '名称'
                 },
                 {
+                    field: 'longitude',
+                    title: '经度'
+                },
+                {
+                    field: 'latitude',
+                    title: '纬度'
+                },
+                {
                     field: 'deptIdStr',
                     title: '所属部门'
                 },