数字林业

data-ui/src/views/data/dict/dictFour.vue

@@ -164,7 +164,7 @@ export default {
     getList() {
       this.loading = true;
       // this.queryParams.type = this.type;
-      this.queryParams.level = 3;
+      this.queryParams.level = 4;
       listDataDict(this.queryParams).then(response => {
         this.dataDictList = response.rows;
         this.total = response.total;
@@ -219,7 +219,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          this.form.level = 3;
+          this.form.level = 4;
           this.form.parentId = this.parentId;
           if (this.form.id != null) {
             updateDataDict(this.form).then(response => {

data-ui/src/views/data/dict/dictThree.vue

@@ -160,7 +160,7 @@ export default {
     getList() {
       this.loading = true;
       // this.queryParams.type = this.type;
-      this.queryParams.level = 2;
+      this.queryParams.level = 3;
       listDataDict(this.queryParams).then(response => {
         this.dataDictList = response.rows;
         this.total = response.total;
@@ -214,7 +214,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          this.form.level = 2;
+          this.form.level = 3;
           this.form.parentId = this.parentId;
           if (this.form.id != null) {
             updateDataDict(this.form).then(response => {

data-ui/src/views/data/digitalforest/cyry/index.vue

@@ -104,7 +104,7 @@
       <el-table-column label="保留劳动关系人员" align="center" prop="blldgxNum"/>
       <el-table-column label="离退休人员" align="center" prop="ltxryNum"/>
       <el-table-column label="在岗平均人数" align="center" prop="zgpjrs"/>
-      <el-table-column label="在岗劳动报酬" align="center" prop="zgldbc"/>
+      <el-table-column label="在岗平均劳动报酬" align="center" prop="zgldbc"/>
       <el-table-column label="所属部门" align="center" prop="deptName"/>
       <el-table-column label="创建人" align="center" prop="createName"/>
       <el-table-column label="创建时间" align="center" prop="createTime"/>
@@ -183,7 +183,7 @@
             <el-form-item label="在岗平均人数" prop="zgpjrs">
               <el-input v-model="form.zgpjrs" placeholder="请输入在岗平均人数" maxlength="13"/>
             </el-form-item>
-            <el-form-item label="在岗劳动报酬" prop="zgldbc">
+            <el-form-item label="在岗平均劳动报酬" prop="zgldbc">
               <el-input v-model="form.zgldbc" placeholder="请输入在岗劳动报酬" maxlength="13"/>
             </el-form-item>
           </el-col>

data-ui/src/views/data/digitalforest/lycyzcz/index.vue

@@ -120,7 +120,7 @@
         <el-form-item label="产业类型" prop="industryType">
           <treeselect v-model="form.industryType" :noOptionsText="'空'"
                       :noResultsText="'空'" :options="cityOptions" placeholder="请选择发生地" @select="hc"
-                      :disable-branch-nodes="false"/>
+                      :disable-branch-nodes="true"/>
         </el-form-item>
         <el-form-item label="产业金额" prop="industrySum">
           <el-input v-model="form.industrySum" placeholder="请输入产业金额" maxlength="13"/>

src/main/java/com/sooka/sponest/data/digitalforest/controller/ForestBigDataController.java

@@ -233,4 +233,13 @@ public class ForestBigDataController extends BaseController {
         }
         return R.ok(deptLevelUtil.getDeptLevel(String.valueOf(centerdataTForestTrees.getDeptId()),forestBigDataService.selectTreeCount(centerdataTForestTrees),"treeTotal"));
     }
+
+    /*
+    * 林业统计
+    */
+    @ApiOperation(value = "林业统计", notes = "林业统计")
+    @GetMapping("/selectForestCount")
+    public R selectForestCount(@RequestBody CenterdataTForestTrees centerdataTForestTrees) {
+        return R.ok(forestBigDataService.selectForestCount(centerdataTForestTrees));
+    }
 }

src/main/java/com/sooka/sponest/data/digitalforest/mapper/ForestBigDataMapper.java

@@ -63,4 +63,6 @@ public interface ForestBigDataMapper {
     List<Map<String,Object>> selectForestGridCount(CenterdataTForestGridLevelVo centerdataTForestGridLevel);
 
     List<Map<String,Object>> selectTreeCount(CenterdataTForestTrees centerdataTForestTrees);
+
+    List<Map<String,Object>> selectForestCount(CenterdataTForestTrees centerdataTForestTrees);
 }

src/main/java/com/sooka/sponest/data/digitalforest/service/IForestBigDataService.java

@@ -64,4 +64,6 @@ public interface IForestBigDataService {
 
     List<Map<String,Object>> selectTreeCount(CenterdataTForestTrees centerdataTForestTrees);
 
+    List<Map<String,Object>> selectForestCount(CenterdataTForestTrees centerdataTForestTrees);
+
 }

src/main/java/com/sooka/sponest/data/digitalforest/service/impl/ForestBigDataServiceImpl.java

@@ -181,4 +181,11 @@ public class ForestBigDataServiceImpl extends BaseServiceImpl implements IForest
         return list;
     }
 
+    @DataScopeMutiDept(deptAlias = "d")
+    @Override
+    public List<Map<String,Object>> selectForestCount(CenterdataTForestTrees centerdataTForestTrees) {
+        setSookaDataBase(centerdataTForestTrees);
+        return forestBigDataMapper.selectForestCount(centerdataTForestTrees);
+    }
+
 }

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

@@ -324,4 +324,30 @@
         where 1=1 ${params.dataScope}
     </select>
 
+    <select id="selectForestCount" resultType="java.util.Map">
+        SELECT
+            '珍惜古树' name,
+            count( a.id ) num
+        FROM
+            centerdata_t_forest_trees a
+            LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
+        where 1=1 ${params.dataScope}
+        UNION ALL
+        SELECT
+            '野生植物' name,
+            count( DISTINCT a.trees_species ) num
+        FROM
+            centerdata_t_forest_trees a
+            LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
+        where 1=1 ${params.dataScope}
+        UNION ALL
+        SELECT
+            '野生动物' name,
+            count( a.id ) num
+        FROM
+            centerdata_t_forest_animal a
+            LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
+        where 1=1 ${params.dataScope}
+    </select>
+
 </mapper>