浏览代码

数据中心

韩福成 1 年之前
父节点
当前提交
5e11dd8e18

+ 5 - 2
src/main/java/com/sooka/sponest/data/digitaldevelopment/domain/DevelopmentView.java

@@ -10,7 +10,10 @@ import lombok.Data;
 @Data
 public class DevelopmentView extends BaseBusinessEntity {
 
-    //所属辖区
-    private String territoriality;
+    //所属开发区
+    private String park;
+
+    //工程类型
+    private String projectType;
 
 }

+ 4 - 2
src/main/resources/mapper/digitaldevelopment/DevelopmentViewMapper.xml

@@ -9,7 +9,7 @@
         FROM centerdata_t_key_projects a
         LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
         WHERE 1=1 ${params.dataScope}
-        <if test="park != null  and park != ''">and park = #{park}</if>
+        <if test="park != null  and park != ''">and a.park = #{park}</if>
         GROUP BY a.territoriality
     </select>
 
@@ -19,7 +19,9 @@
         LEFT JOIN (
         SELECT a.id,a.project_level FROM centerdata_t_forest_importarea a
         LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
-        where 1=1 ${params.dataScope}
+        where 1=1
+        <if test="projectType != null  and projectType != ''">and a.project_type = #{projectType}</if>
+         ${params.dataScope}
         ) a ON b.dict_value = a.project_level
         WHERE b.dict_type = 'centerdata_project_level'
         GROUP BY b.dict_value