修复bug

huimv-cattle/src/main/java/com/huimv/cattle/controller/SuperviseController.java

@@ -3,6 +3,7 @@ package com.huimv.cattle.controller;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.cattle.pojo.DataSource;
 import com.huimv.cattle.pojo.Supervise;
 import com.huimv.cattle.pojo.VaccineDelivery;
 import com.huimv.cattle.service.DataSourceService;
@@ -79,8 +80,13 @@ public class SuperviseController {
 
     @PostMapping("/getSuperviseScreen")
     public  Result getSuperviseScreen(@RequestBody Supervise supervise, HttpServletRequest request){
+        DataSource dataSource = dataSourceService.getDataSourceStatus();
         String farmCode = FarmCodeUtils.getFarmCode(supervise.getFarmCode(),request);
-        return superviseService.getSuperviseScreen(farmCode);
+        if (dataSource.getDsStatus() == 1 && dataSource.getViewType() == 3){
+            return superviseService.getSuperviseScreen(farmCode);
+        }else {
+            return superviseService.getSupervise(farmCode);
+        }
     }
 }
 

huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/ProductionCapacityMapper.xml

@@ -26,7 +26,6 @@
             #{cityCode}
         </foreach>
         ${ew.customSqlSegment}
-        GROUP BY YEAR
     </select>
 
 </mapper>

huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/SubsidyCountMapper.xml

@@ -26,7 +26,6 @@
             #{cityCode}
         </foreach>
         ${ew.customSqlSegment}
-        GROUP BY YEAR
     </select>
 
 </mapper>

huimv-cattle/src/main/java/com/huimv/cattle/service/impl/ProductionCapacityServiceImpl.java

@@ -107,7 +107,7 @@ public class ProductionCapacityServiceImpl extends ServiceImpl<ProductionCapacit
             queryWrapper.between("year", Integer.valueOf(dateUtil.getThisYear()) - Integer.valueOf(yearNum), Integer.valueOf(dateUtil.getThisYear()));
             //        queryWrapper.last("LIMIT "+yearNum);
         }
-        queryWrapper.orderByDesc("year");
+        queryWrapper.orderByDesc("year").groupBy("year");
         List<ProductionCapacity> productionCapacities = productionCapacityMapper.getProductionCapacityScreen(city,queryWrapper);
         if (ObjectUtil.isEmpty(productionCapacities)) {
             ProductionCapacity productionCapacity1 = new ProductionCapacity();

huimv-cattle/src/main/java/com/huimv/cattle/service/impl/SubsidyCountServiceImpl.java

@@ -110,7 +110,7 @@ public class SubsidyCountServiceImpl extends ServiceImpl<SubsidyCountMapper, Sub
             queryWrapper.between("year", Integer.valueOf(dateUtil.getThisYear()) - Integer.valueOf(yearNum), Integer.valueOf(dateUtil.getThisYear()));
             //        queryWrapper.last("LIMIT "+yearNum);
         }
-        queryWrapper.orderByDesc("year");
+        queryWrapper.orderByDesc("year").groupBy("year");
 
         List<SubsidyCount> subsidyCounts = subsidyCountMapper.getSubsidyCountScreen(city,queryWrapper);
         if (ObjectUtil.isEmpty(subsidyCounts)) {

huimv-cattle/src/main/java/com/huimv/cattle/service/impl/SuperviseServiceImpl.java

@@ -55,14 +55,7 @@ public class SuperviseServiceImpl extends ServiceImpl<SuperviseMapper, Supervise
 
     @Override
     public Result getSuperviseScreen(String farmCode) {
-        DataSource dataSource = dataSourceService.getDataSourceStatus();
-        Result supervise = null;
-        if (dataSource.getDsStatus() == 1 && dataSource.getViewType() ==2){
-            supervise = getSupervise(farmCode);
-        }else if (dataSource.getDsStatus() == 1 && dataSource.getViewType() == 3){
-            supervise = getSupervise(sysRegionCounTownVillMapper.listSub(farmCode));
-        }
-        return supervise;
+        return getSupervise(sysRegionCounTownVillMapper.listSub(farmCode));
     }
 
     private String superviseGatValue(String farmCode,String key) {