数字林业

src/main/java/com/sooka/sponest/data/digitalforest/domain/bo/AfforestationBO.java

@@ -16,5 +16,10 @@ public class AfforestationBO {
 
     String points;
 
+    //面积
+    String area;
+
+    //计划属性
+    String scheduleTypeLabel;
 
 }

src/main/resources/mapper/digitalforest/CenterdataTAfforestationTaskMapper.xml

@@ -198,12 +198,17 @@
         a.plan_start_time planStartTime,
         a.plan_end_time planEndTime,
         a.planting_quantity plantingQuantity,
-        a.executive
+        a.executive,
+        ifnull(a.afforestation_area,0) area,
+        b.dict_label scheduleTypeLabel
         from
         centerdata_t_forest_afforestation a
         left join ${database_system}.sys_dept d on a.dept_id=d.dept_id
         left join ${database_system}.sys_user u on a.create_by=u.user_id
-        where  DATE_FORMAT(plan_start_time,'%Y')=#{year} ${params.dataScope}
+        left join onest_system.sys_dict_data b on a.schedule_type = b.dict_value
+        where  DATE_FORMAT(plan_start_time,'%Y')=#{year}
+          and b.dict_type = 'centerdata_schedule_type'
+            ${params.dataScope}
     </select>
 
     <select id="getAfforestationArea" parameterType="AfforestationVO" resultType="com.sooka.sponest.data.system.areamarking.domain.RegionalFlag">