Преглед на файлове

农村集体耕地 增加字段:切割地dicallyLand

Memory_LG преди 11 месеца
родител
ревизия
ad56ded965

+ 12 - 0
data-ui/src/views/data/digitalagriculture/collective_farmland/index.vue

@@ -240,6 +240,13 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
+            <el-form-item label="切割地(亩)" prop="dicallyLand">
+              <el-input v-model="form.dicallyLand" placeholder="请输入切割地(亩)" maxlength="13"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
             <el-form-item label="所属部门" prop="deptId">
               <treeselect v-model="form.deptId" :options="deptOptions" multiple:false :show-count="true" :noResultsText="'空'" :noOptionsText="'空'"
                           placeholder="请选择部门" @select="hx"/>
@@ -358,6 +365,7 @@ export default {
         villageSchoolLand: null,
         waterArea: null,
         forestArea: null,
+        dicallyLand: null,
         remark: null,
       },
       // 表单参数
@@ -423,6 +431,9 @@ export default {
         forestArea: [
           {validator: checkPositiveDecimal, trigger: 'blur'}
         ],
+        dicallyLand:[
+          {validator: checkPositiveDecimal, trigger: 'blur'}
+        ]
       }
     };
   },
@@ -514,6 +525,7 @@ export default {
         villageSchoolLand: null,
         waterArea: null,
         forestArea: null,
+        dicallyLand: null,
         remark: null
       };
       this.resetForm("form");

+ 6 - 0
src/main/java/com/sooka/sponest/data/digitalagriculture/domain/CenterdataTFarmCollectiveFarmland.java

@@ -126,6 +126,12 @@ public class CenterdataTFarmCollectiveFarmland extends BaseBusinessEntity {
     private String schoolLand;
 
     /**
+     * 切割地(亩)
+     */
+    @Excel(name = "切割地(亩)")
+    private String dicallyLand;
+
+    /**
      * 其中:由村经营的校田地
      */
     @Excel(name = "其中:由村经营的校田地")

+ 5 - 1
src/main/resources/mapper/digitalagriculture/CenterdataTFarmCollectiveFarmlandMapper.xml

@@ -33,12 +33,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="waterArea"    column="water_area"    />
         <result property="forestArea"    column="forest_area"    />
         <result property="remark"    column="remark"    />
+        <result property="dicallyLand"    column="dically_land"    />
     </resultMap>
 
     <sql id="selectCenterdataTFarmCollectiveFarmlandVo">
         select a.id, a.dept_id, a.dept_name, a.create_by, a.create_name, a.create_time, a.update_by,a.update_name, a.update_time, a.longitude, a.latitude, a.name,
         a.type, a.collective_farmland, a.home_contracting, a.other_collective_farmland, a.maneuverable_land,a.contracted_land,a.extinction_land,a.only_child_land,a.returnable_land,
-        a.reclaim_lang,a.four_wastelands_land,a.school_land,a.village_school_land,a.water_area,a.forest_area,a.remark from centerdata_t_farm_collective_farmland a
+        a.reclaim_lang,a.four_wastelands_land,a.school_land,a.village_school_land,a.water_area,a.forest_area,a.remark, a.dically_land from centerdata_t_farm_collective_farmland a
     </sql>
 
     <select id="selectCenterdataTFarmCollectiveFarmlandList" parameterType="CenterdataTFarmCollectiveFarmland" resultMap="CenterdataTFarmCollectiveFarmlandResult">
@@ -95,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="waterArea != null">water_area,</if>
             <if test="forestArea != null">forest_area,</if>
             <if test="remark != null">remark,</if>
+            <if test="dicallyLand != null">dically_land,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -125,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="waterArea != null">#{waterArea},</if>
             <if test="forestArea != null">#{forestArea},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="dicallyLand != null">#{dicallyLand},</if>
          </trim>
     </insert>
 
@@ -158,6 +161,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="waterArea != null">water_area = #{waterArea},</if>
             <if test="forestArea != null">forest_area = #{forestArea},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="dicallyLand != null">dically_land = #{dicallyLand},</if>
         </trim>
         where id = #{id}
     </update>