销售统计修改

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

@@ -42,31 +42,36 @@ public class OutStockServiceImpl extends ServiceImpl<OutStockMapper, OutStock> i
             farmCode = TokenSign.getFarmCode(httpServletRequest);
         }
         String month = paramsMap.get("months");
-        if (month==null || month=="") {
-            month = "1";
-        }
-        Integer months = Integer.parseInt(month);
-        ZonedDateTime zonedDateTime = ZonedDateTime.now();
-        List<OutStock> list = new ArrayList<>();
-        for (int i = 0; i < months; i++) {
-            if ((zonedDateTime.getMonth().getValue() - i) > 0) {
-                QueryWrapper<OutStock> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("farm_code", farmCode);
-                queryWrapper.eq("month", zonedDateTime.getMonth().getValue() - i)
-                        .and(Wrapper -> Wrapper.eq("year", zonedDateTime.getYear()));
-                OutStock outStock = outStockMapper.selectOne(queryWrapper);
-                list.add(outStock);
-            } else {
-                QueryWrapper<OutStock> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("farm_code", farmCode);
-                queryWrapper.eq("month", 12 + zonedDateTime.getMonth().getValue() - i)
-                        .and(Wrapper -> Wrapper.eq("year", zonedDateTime.getYear() - 1));
-                OutStock outStock = outStockMapper.selectOne(queryWrapper);
-                list.add(outStock);
-            }
+        if (month == null || month == "") {
+            QueryWrapper<OutStock> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_code", farmCode);
+            List<OutStock> list = outStockMapper.selectList(queryWrapper.orderByDesc("month"));
+            return new Result(ResultCode.SUCCESS, list);
+        } else {
+            Integer months = Integer.parseInt(month);
+            ZonedDateTime zonedDateTime = ZonedDateTime.now();
+            List<OutStock> list = new ArrayList<>();
+            for (int i = 0; i < months; i++) {
+                if ((zonedDateTime.getMonth().getValue() - i) > 0) {
+                    QueryWrapper<OutStock> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("farm_code", farmCode);
+                    queryWrapper.eq("month", zonedDateTime.getMonth().getValue() - i)
+                            .and(Wrapper -> Wrapper.eq("year", zonedDateTime.getYear()));
+                    OutStock outStock = outStockMapper.selectOne(queryWrapper);
+                    list.add(outStock);
+                } else {
+                    QueryWrapper<OutStock> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("farm_code", farmCode);
+                    queryWrapper.eq("month", 12 + zonedDateTime.getMonth().getValue() - i)
+                            .and(Wrapper -> Wrapper.eq("year", zonedDateTime.getYear() - 1));
+                    OutStock outStock = outStockMapper.selectOne(queryWrapper);
+                    list.add(outStock);
+                }
 
+            }
+            return new Result(ResultCode.SUCCESS, list);
         }
-        return new Result(ResultCode.SUCCESS, list);
+
     }
 
     @Override
@@ -78,6 +83,9 @@ public class OutStockServiceImpl extends ServiceImpl<OutStockMapper, OutStock> i
         String list = paramsMap.get("list");
         JSONArray jsonArray = JSONArray.parseArray(list);
         List<OutStock> outStocks = jsonArray.toJavaList(OutStock.class);
+        QueryWrapper<OutStock> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("farm_code", farmCode);
+        outStockMapper.delete(queryWrapper1);
         for (int i = 0; i < outStocks.size(); i++) {
             Integer month =  outStocks.get(i).getMonth();
             Integer year = outStocks.get(i).getYear();

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

@@ -1,6 +1,7 @@
 package com.huimv.cattle.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -39,15 +40,10 @@ public class SalesCountServiceImpl extends ServiceImpl<SalesCountMapper, SalesCo
         }
         //List<SalesCount> salesCount = salesCountMapper.getCount();
         QueryWrapper<SalesCount> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.eq("farm_code", farmCode).orderByDesc("year").orderByDesc("quarter");
         List<SalesCount> salesCounts = salesCountMapper.selectList(queryWrapper);
         if (salesCounts.size() == 0) {
-            JSONObject jsonObject = new JSONObject();
-            jsonObject.put("year", 0);
-            jsonObject.put("quarter", 0);
-            jsonObject.put("quarterName", 0);
-            jsonObject.put("salesMoney", 0);
-            return new Result(ResultCode.SUCCESS, jsonObject);
+            return new Result(ResultCode.SUCCESS,salesCounts);
         } else {
             return new Result(ResultCode.SUCCESS, salesCounts);
         }
@@ -59,31 +55,37 @@ public class SalesCountServiceImpl extends ServiceImpl<SalesCountMapper, SalesCo
         if (farmCode==null) {
             farmCode = TokenSign.getFarmCode(httpServletRequest);
         }
-        String year = paramsMap.get("year");
-        String quarter = paramsMap.get("quarter");
-        String quarterName = paramsMap.get("quarterName");
-        String salesMoney = paramsMap.get("salesMoney");
-        BigDecimal bg = new BigDecimal(salesMoney);
-        QueryWrapper<SalesCount> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_code", farmCode);
-        queryWrapper.eq("year", year).and(Wrapper -> Wrapper.eq("quarter", quarter));
-        SalesCount salesCount = salesCountMapper.selectOne(queryWrapper);
-        if (ObjectUtil.isEmpty(salesCount)) {
-            SalesCount salesCount1 = new SalesCount();
-            salesCount1.setQuarterName(quarterName);
-            salesCount1.setYear(Integer.parseInt(year));
-            salesCount1.setQuarter(Integer.parseInt(quarter));
-            salesCount1.setSalesMoney(bg);
-            salesCount1.setFarmCode(farmCode);
-            salesCountMapper.insert(salesCount1);
-            return new Result(ResultCode.SUCCESS, "添加成功");
-        } else {
-            salesCount.setSalesMoney(bg);
-            salesCount.setQuarter(Integer.parseInt(quarter));
-            salesCount.setYear(Integer.parseInt(year));
-            salesCount.setQuarterName(quarterName);
-            salesCountMapper.updateById(salesCount);
-            return new Result(ResultCode.SUCCESS, "编辑成功");
+        String list = paramsMap.get("list");
+        JSONArray jsonArray = JSONArray.parseArray(list);
+        List<SalesCount> lists = jsonArray.toJavaList(SalesCount.class);
+        QueryWrapper<SalesCount> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("farm_code", farmCode);
+        salesCountMapper.delete(queryWrapper1);
+        for (int i = 0; i < lists.size(); i++) {
+            Integer year = lists.get(i).getYear();
+            Integer quarter = lists.get(i).getQuarter();
+
+            QueryWrapper<SalesCount> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_code", farmCode);
+            queryWrapper.eq("year", year).and(Wrapper -> Wrapper.eq("quarter", quarter));
+            SalesCount salesCount = salesCountMapper.selectOne(queryWrapper);
+            if (ObjectUtil.isEmpty(salesCount)) {
+                SalesCount salesCount1 = new SalesCount();
+                salesCount1.setQuarterName(lists.get(i).getQuarterName());
+                salesCount1.setYear(year);
+                salesCount1.setQuarter(quarter);
+                salesCount1.setSalesMoney(lists.get(i).getSalesMoney());
+                salesCount1.setFarmCode(farmCode);
+                salesCountMapper.insert(salesCount1);
+            } else {
+                salesCount.setFarmCode(farmCode);
+                salesCount.setSalesMoney(lists.get(i).getSalesMoney());
+                salesCount.setQuarter(quarter);
+                salesCount.setYear(year);
+                salesCount.setQuarterName(lists.get(i).getQuarterName());
+                salesCountMapper.updateById(salesCount);
+            }
         }
+        return new Result(ResultCode.SUCCESS, "保存成功");
     }
 }