生物防控人员2

huimv-admin/src/main/java/com/huimv/admin/service/impl/ProdStockServiceImpl.java

@@ -217,10 +217,6 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
         DateTime dateTime = DateUtil.offsetDay(new Date(), -8);
 
         List<ProdStock> prodStocks = prodStockMapper.selectList(new QueryWrapper<ProdStock>().eq("farm_id", farmId).eq("display_type", displayType).ge("creat_time", dateTime));
-        ProdStock prodStock = prodStocks.get(prodStocks.size()-1);
-        Map endMap = new HashMap();
-        endMap.put("CLBD",prodStocks);
-        endMap.put("MCCL",prodStock);
         ProdCount farm_id = prodCountMapper.selectOne(new QueryWrapper<ProdCount>().eq("farm_id", farmId));
         Map sjtjMap = new HashMap();
         sjtjMap.put("CLCH",100);
@@ -228,27 +224,34 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
         sjtjMap.put("MRWLL",1.50);
         sjtjMap.put("RZZ",731);
         sjtjMap.put("SWPIG",0);
-        if (ObjectUtil.isNotEmpty(farm_id)){
-            sjtjMap.put("CLCH",prodStock.getCheng());
-            sjtjMap.put("SWPIG",prodStock.getSiPig());
-            sjtjMap.put("YFCH",farm_id.getYfchl());
-            sjtjMap.put("MRWLL",farm_id.getMrwll());
-            sjtjMap.put("RZZ",farm_id.getRzz());
-        }
-        endMap.put("SJTJ",sjtjMap);
 
         Map zjjMap = new HashMap();
         zjjMap.put("BNLJ",0);
         zjjMap.put("YFCL",0);
         zjjMap.put("JRCL",0);
         zjjMap.put("JRJZ",0);
-        if (ObjectUtil.isNotEmpty(prodStock)){
-            zjjMap.put("BNLJ",prodStock.getYearOutPig());
-            zjjMap.put("YFCL",prodStock.getYfzcl());
-            zjjMap.put("JRCL",prodStock.getOutPig());
-            zjjMap.put("JRJZ",prodStock.getInPig());
-        }
+        Map endMap = new HashMap();
+        if (ObjectUtil.isNotEmpty(prodStocks)){
+            ProdStock prodStock = prodStocks.get(prodStocks.size()-1);
+            endMap.put("CLBD",prodStocks);
+            endMap.put("MCCL",prodStock);
+            if (ObjectUtil.isNotEmpty(farm_id)){
+                sjtjMap.put("CLCH",prodStock.getCheng());
+                sjtjMap.put("SWPIG",prodStock.getSiPig());
+                sjtjMap.put("YFCH",farm_id.getYfchl());
+                sjtjMap.put("MRWLL",farm_id.getMrwll());
+                sjtjMap.put("RZZ",farm_id.getRzz());
+            }
+            endMap.put("SJTJ",sjtjMap);
+
+            if (ObjectUtil.isNotEmpty(prodStock)){
+                zjjMap.put("BNLJ",prodStock.getYearOutPig());
+                zjjMap.put("YFCL",prodStock.getYfzcl());
+                zjjMap.put("JRCL",prodStock.getOutPig());
+                zjjMap.put("JRJZ",prodStock.getInPig());
+            }
 
+        }
         return new Result(ResultCode.SUCCESS,endMap);
     }
 

huimv-admin/src/main/java/com/huimv/admin/timer/ShenChanTimer.java

@@ -72,10 +72,10 @@ public class ShenChanTimer {
 //        for (int i = 0; i < 390; i++) {
 //            DateTime dateTime = DateUtil.offsetDay(beginOfYear, i);
 //            System.out.println("dateTime--"+dateTime);
-        System.out.println(prodStockDto);
+        System.out.println("--》"+prodStockDto);
 
         for (List stock : stockData) {
-            System.out.println("stock -->"+stock);
+//            System.out.println("stock -->"+stock);
             switch (stock.get(0).toString()) {
                 case "正康":
                     saveProdStrok(stockLoginDto,21,stock,dateTime);