创建计算合计公共方法

农村集体耕地台账增加合计行

data-ui/src/views/data/digitalagriculture/collective_farmland/standingBook.vue

@@ -78,6 +78,7 @@ import {treeselect} from '@/api/system/dept'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import {format_date} from "@/views/data/common/dateExport";
+import {Message} from "element-ui";
 
 export default {
   name: "StandingBook",
@@ -177,8 +178,8 @@ export default {
     getList() {
       this.loading = true;
       countFarmland(this.queryParams).then(res=>{
-        this.collectiveFarmlandList = res.data;
-        this.loading = false;
+      this.collectiveFarmlandList = res.data;
+      this.loading = false;
       })
     },
     // 表单重置
@@ -220,7 +221,6 @@ export default {
         ...this.queryParams
       }, `农村集体耕地_${format_date(new Date())}.xlsx`)
     },
-
   }
 };
 </script>

src/main/java/com/sooka/sponest/data/digitalagriculture/controller/CenterdataTFarmCollectiveFarmlandController.java

@@ -2,6 +2,8 @@ package com.sooka.sponest.data.digitalagriculture.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.core.constant.DocumentNameConstants;
+import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
@@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 农村集体耕地Controller

src/main/java/com/sooka/sponest/data/digitalagriculture/service/impl/CenterdataTFarmCollectiveFarmlandServiceImpl.java

@@ -13,11 +13,15 @@ import com.sooka.sponest.data.digitalagriculture.mapper.CenterdataTFarmCollectiv
 import com.sooka.sponest.data.digitalagriculture.service.ICenterdataTFarmCollectiveFarmlandService;
 import com.sooka.sponest.data.system.equipment.domain.CenterdataTEquipmentCamera;
 import com.sooka.sponest.data.system.equipment.service.ICenterdataTEquipmentCameraService;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -151,23 +155,10 @@ public class CenterdataTFarmCollectiveFarmlandServiceImpl extends BaseServiceImp
         String deptId = null == vo.getDeptId() ? SecurityUtils.getLoginUser().getSysUser().getDeptId().toString() : vo.getDeptId().toString();
         vo.setDeptId(Long.valueOf(deptId));
         List<Map<String, Object>> busList = centerdataTFarmCollectiveFarmlandMapper.countFarmland(vo);
-        List<String> addKeys = Arrays.asList(
-                "collectiveFarmland",
-                "homeContracting",
-                "otherCollectiveFarmland",
-                "maneuverableLand",
-                "contractedLand",
-                "extinctionLand",
-                "onlyChildLand",
-                "returnableLand",
-                "reclaimLang",
-                "fourWastelandsLand",
-                "schoolLand",
-                "villageSchoolLand",
-                "waterArea",
-                "forestArea",
-                "dicallyLand");
-        List<Map<String, Object>> deptLevel = deptLevelUtil.getDeptLevel(deptId, busList, addKeys);
-        return deptLevel;
+        List<String> addKeys = Arrays.asList("collectiveFarmland", "homeContracting", "otherCollectiveFarmland", "maneuverableLand", "contractedLand", "extinctionLand", "onlyChildLand", "returnableLand", "reclaimLang", "fourWastelandsLand", "schoolLand", "villageSchoolLand", "waterArea", "forestArea", "dicallyLand");
+        List<Map<String, Object>> resultDataList = deptLevelUtil.getDeptLevel(deptId, busList, addKeys);
+        return deptLevelUtil.sumColumnsTotal(resultDataList, addKeys, "deptName");
     }
+
+
 }