Newspaper 2 роки тому
батько
коміт
a829bcfa15

+ 28 - 0
huimv-cattle/src/main/java/com/huimv/cattle/controller/FarmStockRankController.java

@@ -107,6 +107,34 @@ public class FarmStockRankController {
         }
     }
 
+    @PostMapping("/getFarmStockRankScreen")
+    public  Result getFarmStockRankScreen(@RequestBody FarmStockRank farmStockRank,HttpServletRequest request){
+        String farmCode = FarmCodeUtils.getFarmCode(farmStockRank.getFarmCode(), request);
+        //        //读取模式切换
+        DataSource dataSource = dataSourceService.getDataSourceStatus();
+        if (dataSource.getViewType() == 1) {
+            //view=1,显示县填写数据
+            return  farmStockRankService.getFarmStockRank(farmCode);
+        } else if (dataSource.getViewType() == 2){
+            //view=2,显示镇汇总数据
+            return  farmStockRankService.getFarmStockRank(farmCode);
+        }else {
+            //view=3,显示村汇总数据
+            if (dataSource.getDsStatus() == 1) {
+                //status=1,显示村汇总(手填)数据
+                return  farmStockRankService.getVillageFarmStockRank(farmCode);
+            } else {
+                //status=2,显示村汇总(养殖云)数据
+                System.out.println("status=2,显示村汇总(养殖云)数据");
+                String farmCodes =  getFarmCodeByAdcode(farmCode);
+                if (StringUtils.isBlank(farmCodes) ){
+                    return new Result(ResultCode.SUCCESS,new ArrayList<>());
+                }
+                return getStockRankByDivision(farmCodes);
+            }
+        }
+    }
+
     private Result getStockRankByDivision(String farmCodes) {
         System.out.println("1");
         HttpHeaders httpHeaders = new HttpHeaders();

+ 2 - 0
huimv-cattle/src/main/java/com/huimv/cattle/mapper/FarmStockRankMapper.java

@@ -2,6 +2,7 @@ package com.huimv.cattle.mapper;
 
 import com.huimv.cattle.pojo.FarmStockRank;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author zn
  * @since 2022-12-15
  */
+@Repository
 public interface FarmStockRankMapper extends BaseMapper<FarmStockRank> {
 
 }

+ 2 - 0
huimv-cattle/src/main/java/com/huimv/cattle/service/FarmStockRankService.java

@@ -15,4 +15,6 @@ import com.huimv.common.utils.Result;
 public interface FarmStockRankService extends IService<FarmStockRank> {
 
     Result getFarmStockRank(String farmCode);
+
+    Result getVillageFarmStockRank(String farmCode);
 }

+ 13 - 1
huimv-cattle/src/main/java/com/huimv/cattle/service/impl/FarmStockRankServiceImpl.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.FarmStockRank;
 import com.huimv.cattle.mapper.FarmStockRankMapper;
 import com.huimv.cattle.service.FarmStockRankService;
@@ -25,9 +26,10 @@ import java.util.List;
  */
 @Service
 public class FarmStockRankServiceImpl extends ServiceImpl<FarmStockRankMapper, FarmStockRank> implements FarmStockRankService {
-
     @Autowired
     private FarmStockRankMapper farmStockRankMapper;
+    @Autowired
+    private SysRegionCounTownVillMapper sysRegionCounTownVillMapper;
     @Override
     public Result getFarmStockRank(String farmCode) {
         List<FarmStockRank> list = farmStockRankMapper.selectList(new QueryWrapper<FarmStockRank>().eq("farm_code",farmCode).orderByDesc("stock"));
@@ -36,4 +38,14 @@ public class FarmStockRankServiceImpl extends ServiceImpl<FarmStockRankMapper, F
         }
         return new Result(ResultCode.SUCCESS,list);
     }
+
+    @Override
+    public Result getVillageFarmStockRank(String farmCode) {
+        String[] city = sysRegionCounTownVillMapper.listSub(farmCode).split(",");
+        List<FarmStockRank> list = farmStockRankMapper.selectList(new QueryWrapper<FarmStockRank>().in("farm_code",city).orderByDesc("stock"));
+        if (ObjectUtil.isEmpty(list)){
+            return new Result(ResultCode.SUCCESS,new ArrayList<>());
+        }
+        return new Result(ResultCode.SUCCESS,list);
+    }
 }