模块开发1

huimv-farm/src/main/java/vip/xiaonuo/sale/service/impl/SaleProduceServiceImpl.java

@@ -69,15 +69,15 @@ public class SaleProduceServiceImpl extends ServiceImpl<SaleProduceMapper, SaleP
                 yearPrice = yearPrice + Double.valueOf(yearProduce.getPrice());
             }
         }
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("monthSaleMoney", monthSaleMoney);
-        jsonObject.put("yearSaleMoney",yearSaleMoney);
         DecimalFormat def = new DecimalFormat("0.00");
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("monthSaleMoney", def.format(monthSaleMoney));
+        jsonObject.put("yearSaleMoney",def.format(yearSaleMoney));
         if (materials.size() != 0) {
             double v = monthPrice / materials.size();
             double v1 = yearPrice / materials.size();
             jsonObject.put("monthPrice", def.format(v));
-            jsonObject.put("yearPrice", v1);
+            jsonObject.put("yearPrice", def.format(v1));
         } else {
             jsonObject.put("monthPrice", "0");
             jsonObject.put("yearPrice", "0");
@@ -90,38 +90,61 @@ public class SaleProduceServiceImpl extends ServiceImpl<SaleProduceMapper, SaleP
         Integer parentId = produceParam.getParentId();
         String time = produceParam.getDate();
         String year = time.substring(0, 4);
+        int last = Integer.parseInt(year) - 1;
         QueryWrapper<ErpBaseMaterial> materialQueryWrapper = new QueryWrapper<>();
         materialQueryWrapper.eq("parent_id", parentId);
         List<ErpBaseMaterial> materials = materialMapper.selectList(materialQueryWrapper);
-        List<SaleProduce> yearList = new ArrayList<>();
+     /*   List<SaleProduce> yearList = new ArrayList<>();
         List<SaleProduce> lastYearList = new ArrayList<>();
         if (materials.size() != 0) {
             for (ErpBaseMaterial material : materials) {
                 QueryWrapper<SaleProduce> queryWrapper = new QueryWrapper<>();
                 queryWrapper.like("produce_name", material.getMaterialName());
-                queryWrapper.between("create_time", year + "-01 00:00:00", year + "-31 23:59:59");
+                queryWrapper.between("create_time", year + "-01-01 00:00:00", year + "-12-31 23:59:59");
                 queryWrapper.select(" sum(sale_money) saleMoney,create_time createTime");
                 queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y-%m')");
-                SaleProduce lastProduce = produceMapper.selectOne(queryWrapper);
-                lastYearList.add(lastProduce);
+                List<SaleProduce> lastProduce = produceMapper.selectList(queryWrapper);
+
+
                 QueryWrapper<SaleProduce> queryWrapper1 = new QueryWrapper<>();
                 queryWrapper1.like("produce_name", material.getMaterialName());
-                queryWrapper1.between("create_time", Integer.parseInt(year)-1 + "-01-01 00:00:00", Integer.parseInt(year)-1 + "-12-31 23:59:59");
+                queryWrapper1.between("create_time", last + "-01-01 00:00:00", last + "-12-31 23:59:59");
                 queryWrapper1.select(" sum(sale_money) saleMoney,create_time createTime");
                 queryWrapper1.groupBy("DATE_FORMAT(create_time,'%Y-%m')");
-                SaleProduce yearProduce = produceMapper.selectOne(queryWrapper1);
-                yearList.add(yearProduce);
+                List<SaleProduce> yearProduce = produceMapper.selectList(queryWrapper1);
+
             }
         }
 
-        SimpleDateFormat sdf = new SimpleDateFormat("MM");
+        SimpleDateFormat sdf = new SimpleDateFormat("MM");*/
         JSONArray jsonArray = new JSONArray();
         for (int i = 1; i < 13; i++) {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("time", i + "月");
             jsonObject.put("year", "0");
             jsonObject.put("lastYear", "0");
-            if (yearList.size() != 0) {
+
+            Double yearMoney = 0.00;
+            Double lastYearMoney = 0.00;
+            for (ErpBaseMaterial material : materials) {
+                QueryWrapper<SaleProduce> queryWrapper = new QueryWrapper<>();
+                queryWrapper.like("produce_name", material.getMaterialName());
+                queryWrapper.between("create_time", year + "-"+i+"-01 00:00:00", year +"-"+i+"-31 23:59:59");
+                queryWrapper.select(" IFNULL(sum(sale_money),'0') saleMoney,create_time createTime");
+                SaleProduce saleProduce = produceMapper.selectOne(queryWrapper);
+                yearMoney = yearMoney + Double.valueOf(saleProduce.getSaleMoney());
+
+                QueryWrapper<SaleProduce> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.like("produce_name", material.getMaterialName());
+                queryWrapper1.between("create_time", last + "-"+i+"-01 00:00:00", last +"-"+i+"-31 23:59:59");
+                queryWrapper1.select(" sum(sale_money) saleMoney,create_time createTime");
+                SaleProduce yearProduce = produceMapper.selectOne(queryWrapper1);
+                lastYearMoney = lastYearMoney + Double.valueOf(yearProduce.getSaleMoney());
+            }
+            DecimalFormat def = new DecimalFormat("0.00");
+            jsonObject.put("year", def.format(yearMoney));
+            jsonObject.put("lastYear", def.format(lastYearMoney));
+            /*if (yearList.size() != 0) {
                 for (SaleProduce produce : yearList) {
                     String format = sdf.format(produce.getCreateTime());
                     if (i == Integer.parseInt(format)) {
@@ -140,7 +163,7 @@ public class SaleProduceServiceImpl extends ServiceImpl<SaleProduceMapper, SaleP
                 }
             } else {
                 jsonObject.put("lastYear", "0");
-            }
+            }*/
             jsonArray.add(jsonObject);
         }
         return jsonArray;