肉牛销售村汇总

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

@@ -115,14 +115,17 @@ public class SalesCattleController {
         if (dataSource.getViewType() == 1) {
             //view=1,显示县填写数据
             return   salesCattleService.getAllSaleCattle(farmCode);
-        } else {
+        } else if (dataSource.getViewType() == 2){
             //view=2,显示镇汇总数据
+            return   salesCattleService.getSalesCattleScreen(farmCode);
+        }else {
+            //view=3,显示村汇总数据
             if (dataSource.getDsStatus() == 1) {
-                //status=1,显示镇汇总（手填）数据
-                return   salesCattleService.getSalesCattleScreen();
+                //status=1,显示村汇总（手填）数据
+                return   salesCattleService.getSalesCattleVillageScreen(farmCode);
             } else {
-                //status=2,显示镇汇总（养殖云）数据
-                System.out.println("status=2,显示镇汇总（养殖云）数据");
+                //status=2,显示村汇总（养殖云）数据
+                System.out.println("status=2,显示村汇总（养殖云）数据");
                 String farmCodes =   getFarmCodeByAdcode(farmCode);
                 if (StringUtils.isBlank(farmCodes)){
                     return new Result(ResultCode.SUCCESS,new ArrayList<>());

huimv-cattle/src/main/java/com/huimv/cattle/mapper/SalesCattleMapper.java

@@ -6,6 +6,7 @@ import com.huimv.cattle.pojo.OutStock;
 import com.huimv.cattle.pojo.SalesCattle;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -17,8 +18,9 @@ import java.util.List;
  * @author zn
  * @since 2022-12-15
  */
+@Repository
 public interface SalesCattleMapper extends BaseMapper<SalesCattle> {
 
-    List<SalesCattle> geaAllSaleCattle(@Param(Constants.WRAPPER) QueryWrapper<SalesCattle> wrapper);
+    List<SalesCattle> geaAllSaleCattle(@Param(Constants.WRAPPER) QueryWrapper<SalesCattle> wrapper,String[] farmCode);
 
 }

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

@@ -19,6 +19,10 @@
     </sql>
     <select id="geaAllSaleCattle" resultType="com.huimv.cattle.pojo.SalesCattle">
         SELECT id, `year`,quarter_name ,`quarter` ,SUM(sales_count)  salesCount,SUM(sales_money) salesMoney, farm_code FROM `sales_cattle`
+        WHERE farm_code IN
+        <foreach collection="farmCode"   item="cityCode" open="(" separator="," close=")">
+            #{cityCode}
+        </foreach>
     ${ew.customSqlSegment}
     </select>
 

huimv-cattle/src/main/java/com/huimv/cattle/service/SalesCattleService.java

@@ -18,5 +18,7 @@ public interface SalesCattleService extends IService<SalesCattle> {
 
     Result getAllSaleCattle(String farmCode);
 
-    Result getSalesCattleScreen();
+    Result getSalesCattleScreen(String farmCode);
+
+    Result getSalesCattleVillageScreen(String farmCode);
 }

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

@@ -2,6 +2,7 @@ package com.huimv.cattle.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.cattle.mapper.SysRegionCounTownVillMapper;
 import com.huimv.cattle.pojo.SalesCattle;
 import com.huimv.cattle.mapper.SalesCattleMapper;
 import com.huimv.cattle.service.SalesCattleService;
@@ -26,6 +27,8 @@ import java.util.List;
 public class SalesCattleServiceImpl extends ServiceImpl<SalesCattleMapper, SalesCattle> implements SalesCattleService {
     @Autowired
     private SalesCattleMapper salesCattleMapper;
+    @Autowired
+    private SysRegionCounTownVillMapper sysRegionCounTownVillMapper;
 
     @Override
     public Result getSalesCattle(String farmCode) {
@@ -49,9 +52,36 @@ public class SalesCattleServiceImpl extends ServiceImpl<SalesCattleMapper, Sales
         return new Result(ResultCode.SUCCESS,list);
     }
     @Override
-    public Result getSalesCattleScreen() {
-        QueryWrapper<SalesCattle> wrapper = new QueryWrapper<SalesCattle>().ne("farm_code",0).orderByDesc("year").orderByDesc("quarter").groupBy("year ").groupBy("quarter");
-        List<SalesCattle> list = salesCattleMapper.geaAllSaleCattle(wrapper);
+    public Result getSalesCattleScreen(String farmCode) {
+        String cityCode = sysRegionCounTownVillMapper.listSub(farmCode);
+        String[] city = cityCode.split(",");
+        QueryWrapper<SalesCattle> wrapper = new QueryWrapper<SalesCattle>().orderByDesc("year").orderByDesc("quarter").groupBy("year ").groupBy("quarter");
+        List<SalesCattle> list = salesCattleMapper.geaAllSaleCattle(wrapper,city);
+        if (ObjectUtil.isEmpty(list)){
+            return new Result(ResultCode.SUCCESS,new ArrayList<>());
+        }
+        return new Result(ResultCode.SUCCESS,list);
+    }
+
+    @Override
+    public Result getSalesCattleVillageScreen(String farmCode) {
+        String cityCode = sysRegionCounTownVillMapper.listSub(farmCode);
+        String[] city = cityCode.split(",");
+        List<String> subCityList = new ArrayList<>();
+        for (String s : city) {
+            String subCityCode = sysRegionCounTownVillMapper.listSub(s);
+            String[] strings = subCityCode.split(",");
+            for (String string : strings) {
+                subCityList.add(string);
+            }
+        }
+        String[] subCity = subCityList.toArray(new String[subCityList.size()]);
+        QueryWrapper<SalesCattle> wrapper = new QueryWrapper<SalesCattle>()
+                .orderByDesc("year")
+                .orderByDesc("quarter")
+                .groupBy("year ")
+                .groupBy("quarter");
+        List<SalesCattle> list = salesCattleMapper.geaAllSaleCattle(wrapper,subCity);
         if (ObjectUtil.isEmpty(list)){
             return new Result(ResultCode.SUCCESS,new ArrayList<>());
         }