模块开发12

huimv-farm/src/main/java/vip/xiaonuo/money/param/MoneyProduceIncomeParam.java

@@ -39,4 +39,7 @@ public class MoneyProduceIncomeParam {
     @NotNull
     private Integer timeType;
 
+    @ApiModelProperty(value = "月份数或年数", required = true)
+    private Integer number;
+
 }

huimv-farm/src/main/java/vip/xiaonuo/money/param/MoneyProduceParam.java

@@ -42,4 +42,7 @@ public class MoneyProduceParam {
     @ApiModelProperty(value = "是否包含关联交易0包含 1不包含", required = true)
     @NotNull
     private Integer type;
+
+    @ApiModelProperty(value = "月份数或年数", required = true)
+    private Integer number;
 }

huimv-farm/src/main/java/vip/xiaonuo/money/service/impl/MoneyProduceServiceImpl.java

@@ -25,10 +25,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -99,6 +96,7 @@ public class MoneyProduceServiceImpl extends ServiceImpl<MoneyProduceMapper, Mon
         String orgId = moneyProduceParam.getOrgId();
         Integer type = moneyProduceParam.getType();//是否包含关联交易
         Integer timeType = moneyProduceParam.getTimeType();
+        Integer number = moneyProduceParam.getNumber();
         QueryWrapper<MoneyProduce> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId)
                 .eq("transaction_type", type);
@@ -108,8 +106,22 @@ public class MoneyProduceServiceImpl extends ServiceImpl<MoneyProduceMapper, Mon
                 "IFNULL(sum(sheep_sour_bing),0) sheepSourBing,IFNULL(sum(other),0) other," +
                 "DATE_FORMAT(create_time,'%Y-%m-%d') createTime");
         if (0 == timeType) {
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.YEAR, -3);
+            } else {
+                calendar.add(Calendar.YEAR, -number);
+            }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
             queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y')").orderByAsc("create_time");
         } else {
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.MONTH, -13);
+            } else {
+                calendar.add(Calendar.MONTH, -number);
+            }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
             queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y-%m')").orderByAsc("create_time");
         }
         List<MoneyProduce> list = produceMapper.selectList(queryWrapper);
@@ -183,6 +195,7 @@ public class MoneyProduceServiceImpl extends ServiceImpl<MoneyProduceMapper, Mon
     public JSONArray produceIncomeAnalysis(MoneyProduceIncomeParam moneyProduceParam) {
         String orgId = moneyProduceParam.getOrgId();
         Integer timeType = moneyProduceParam.getTimeType();
+        Integer number = moneyProduceParam.getNumber();
         QueryWrapper<MoneyProduceIncome> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId);
 
@@ -191,8 +204,22 @@ public class MoneyProduceServiceImpl extends ServiceImpl<MoneyProduceMapper, Mon
                 "IFNULL(sum(sheep_sour_bing),0) sheepSourBing,IFNULL(sum(other),0) other," +
                 "DATE_FORMAT(create_time,'%Y-%m-%d') createTime");
         if (0 == timeType) {
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.YEAR, -3);
+            } else {
+                calendar.add(Calendar.YEAR, -number);
+            }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
             queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y')").orderByAsc("create_time");
         } else {
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.MONTH, -13);
+            } else {
+                calendar.add(Calendar.MONTH, -number);
+            }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
             queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y-%m')").orderByAsc("create_time");
         }
         List<MoneyProduceIncome> list = incomeMapper.selectList(queryWrapper);

huimv-farm/src/main/java/vip/xiaonuo/production/param/ProductionEnergyParam.java

@@ -36,4 +36,6 @@ public class ProductionEnergyParam {
     @ApiModelProperty(value = "车间可先传A车间", required = true)
     private String locationName;
 
+    @ApiModelProperty(value = "月份数或年数", required = true)
+    private Integer number;
 }

huimv-farm/src/main/java/vip/xiaonuo/production/param/ProductionReceiveParam.java

@@ -39,4 +39,7 @@ public class ProductionReceiveParam {
     @ApiModelProperty(value = "车间，可传A车间", required = true)
     private String locationName;
 
+    @ApiModelProperty(value = "月份数或年数", required = true)
+    private Integer number;
+
 }

huimv-farm/src/main/java/vip/xiaonuo/production/param/ProductionYieldParam.java

@@ -39,4 +39,6 @@ public class ProductionYieldParam {
     @ApiModelProperty(value = "车间，可传A车间", required = true)
     private String locationName;
 
+    @ApiModelProperty(value = "月份数或年数", required = true)
+    private Integer number;
 }

huimv-farm/src/main/java/vip/xiaonuo/production/service/impl/ProductionEnergyServiceImpl.java

@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -64,7 +65,7 @@ public class ProductionEnergyServiceImpl extends ServiceImpl<ProductionEnergyMap
         if (ObjectUtil.isEmpty(timeType) ){
             timeType = 0;
         }
-
+        Integer number = energyParam.getNumber();
         QueryWrapper<ProductionEnergyPrice> priceQueryWrapper = new QueryWrapper<>();
         priceQueryWrapper.eq(StringUtils.isNotBlank(orgId),"org_id",orgId);
         List<ProductionEnergyPrice> energyPrice = priceMapper.selectList(priceQueryWrapper);
@@ -151,6 +152,13 @@ public class ProductionEnergyServiceImpl extends ServiceImpl<ProductionEnergyMap
         wrapper.groupBy("ymonth");
         List<ProductionWriteEnergyVo> list ;
         if (timeType == 0){
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.YEAR, -3);
+            } else {
+                calendar.add(Calendar.YEAR, -number);
+            }
+            wrapper.between("create_time", calendar.getTime(), new Date());
           list =  writeEnergyMapper.selectYear(wrapper,
                     productionEnergyPrice.getElectricity() ,
                     productionEnergyPrice.getZhengQi(),
@@ -167,6 +175,13 @@ public class ProductionEnergyServiceImpl extends ServiceImpl<ProductionEnergyMap
                     productionEnergyPrice.getFuSwdYierchun(),
                     productionEnergyPrice.getFuEswdYierchun());
         }else {
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.MONTH, -13);
+            } else {
+                calendar.add(Calendar.MONTH, -number);
+            }
+            wrapper.between("create_time", calendar.getTime(), new Date());
             list =  writeEnergyMapper.selectMonth(wrapper,
                     productionEnergyPrice.getElectricity() ,
                     productionEnergyPrice.getZhengQi(),

huimv-farm/src/main/java/vip/xiaonuo/production/service/impl/ProductionReceiveServiceImpl.java

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -39,7 +40,7 @@ public class ProductionReceiveServiceImpl extends ServiceImpl<ProductionReceiveM
         String produceName = receiveParam.getProduceName();//可多选
         String orgId = receiveParam.getOrgId();
         Integer timeType = receiveParam.getTimeType();
-
+        Integer number = receiveParam.getNumber();
         QueryWrapper<ProductionWriteRate> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq(StringUtils.isNotBlank(orgId), "org_id", orgId)
                 .eq(StringUtils.isNotBlank(locationName), "location_name", locationName);
@@ -48,8 +49,22 @@ public class ProductionReceiveServiceImpl extends ServiceImpl<ProductionReceiveM
         }
         queryWrapper1.select(" convert(IFNULL(avg(production_rate),'0'),decimal(10,2)) productionRate, create_time createTime");
         if (0 == timeType) {
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.YEAR, -3);
+            } else {
+                calendar.add(Calendar.YEAR, -number);
+            }
+            queryWrapper1.between("create_time", calendar.getTime(), new Date());
             queryWrapper1.groupBy("DATE_FORMAT(create_time,'%Y')");
         } else {
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.MONTH, -13);
+            } else {
+                calendar.add(Calendar.MONTH, -number);
+            }
+            queryWrapper1.between("create_time", calendar.getTime(), new Date());
             queryWrapper1.groupBy("DATE_FORMAT(create_time,'%Y-%m')");
         }
         queryWrapper1.orderByAsc("create_time");

huimv-farm/src/main/java/vip/xiaonuo/production/service/impl/ProductionYieldServiceImpl.java

@@ -21,6 +21,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -49,6 +50,7 @@ public class ProductionYieldServiceImpl extends ServiceImpl<ProductionYieldMappe
         Integer timeType = yieldParam.getTimeType();
         String locationName = yieldParam.getLocationName();
         String produceName = yieldParam.getProduceName();
+        Integer number = yieldParam.getNumber();
         QueryWrapper<ProductionYield> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId)
                 .eq(StringUtils.isNotBlank(locationName),"location_name",locationName);
@@ -58,8 +60,22 @@ public class ProductionYieldServiceImpl extends ServiceImpl<ProductionYieldMappe
         DecimalFormat df = new DecimalFormat("#.00");
         queryWrapper.select(" convert(IFNULL(sum(actual_production),'0'),decimal(10,2)) actualProduction,create_time createTime");
         if (0 == timeType) {
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.YEAR, -3);
+            } else {
+                calendar.add(Calendar.YEAR, -number);
+            }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
             queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y')");
         } else {
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.MONTH, -13);
+            } else {
+                calendar.add(Calendar.MONTH, -number);
+            }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
             queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y-%m')");
         }
         queryWrapper.orderByAsc("create_time");
@@ -78,13 +94,27 @@ public class ProductionYieldServiceImpl extends ServiceImpl<ProductionYieldMappe
 
             QueryWrapper<ProductionWritePlan> queryWrapper1 = new QueryWrapper<>();
             if (0 == timeType) {
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
-                String format = sdf.format(productionYield.getCreateTime());
-                queryWrapper1.between("create_time", format + "-01-01 00:00:00", format + "-12-31 23:59:59");
+                Calendar calendar = Calendar.getInstance();
+                if (null == number) {
+                    calendar.add(Calendar.MONTH, -13);
+                } else {
+                    calendar.add(Calendar.MONTH, -number);
+                }
+                queryWrapper1.between("create_time", calendar.getTime(), new Date());
+//                SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
+//                String format = sdf.format(productionYield.getCreateTime());
+//                queryWrapper1.between("create_time", format + "-01-01 00:00:00", format + "-12-31 23:59:59");
             } else {
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
-                String format = sdf.format(productionYield.getCreateTime());
-                queryWrapper1.between("create_time", format + "-01 00:00:00", format + "-31 23:59:59");
+                Calendar calendar = Calendar.getInstance();
+                if (null == number) {
+                    calendar.add(Calendar.MONTH, -13);
+                } else {
+                    calendar.add(Calendar.MONTH, -number);
+                }
+                queryWrapper1.between("create_time", calendar.getTime(), new Date());
+//                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+//                String format = sdf.format(productionYield.getCreateTime());
+//                queryWrapper1.between("create_time", format + "-01 00:00:00", format + "-31 23:59:59");
             }
             queryWrapper1.select("convert(IFNULL(sum(production_plan),'0'),decimal(10,2)) productionPlan");
             ProductionWritePlan writePlan = writePlanMapper.selectOne(queryWrapper1);

huimv-farm/src/main/java/vip/xiaonuo/purchase/param/PurchaseOrderParam.java

@@ -40,5 +40,7 @@ public class PurchaseOrderParam {
     @ApiModelProperty(value = "时间'2024-10'", required = true)
     private String time;
 
+    @ApiModelProperty(value = "月份数或年数", required = true)
+    private Integer number;
 
 }

huimv-farm/src/main/java/vip/xiaonuo/purchase/param/PurchasePriceParam.java

@@ -36,4 +36,7 @@ public class PurchasePriceParam {
     @ApiModelProperty(value = "产品名称", required = true)
     private String material;
 
+    @ApiModelProperty(value = "月份数或年数", required = true)
+    private Integer number;
+
 }

huimv-farm/src/main/java/vip/xiaonuo/purchase/service/impl/PurchaseContractServiceImpl.java

@@ -20,6 +20,7 @@ import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -40,6 +41,7 @@ public class PurchaseContractServiceImpl extends ServiceImpl<PurchaseContractMap
     @Override
     public List<PurchaseContractVo> getList(PurchaseOrderParam orderParam) {
         String orgId = orderParam.getOrgId();
+        Integer number = orderParam.getNumber();
         QueryWrapper<PurchaseContract> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId).orderByAsc("create_time");
         queryWrapper.select(" IFNULL(sum(contract_money),'0') contractMoney,create_time createTime,IFNULL(count(*),'0') materialNumber");
@@ -47,6 +49,13 @@ public class PurchaseContractServiceImpl extends ServiceImpl<PurchaseContractMap
 
         List<PurchaseContractVo> list = new ArrayList<>();
         if (null == orderParam.getTimeType()||0==orderParam.getTimeType()) {
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.YEAR, -3);
+            } else {
+                calendar.add(Calendar.YEAR, -number);
+            }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
             if ("".equals(orderParam.getOrderType()) || null == orderParam.getOrderType()) {
                 queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y')");
             } else {
@@ -68,6 +77,13 @@ public class PurchaseContractServiceImpl extends ServiceImpl<PurchaseContractMap
             }
         } else {
 //            queryWrapper.ge("create_time",  DateUtil.beginOfYear(new Date()));
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.MONTH, -13);
+            } else {
+                calendar.add(Calendar.MONTH, -number);
+            }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
             if ("".equals(orderParam.getOrderType()) || null == orderParam.getOrderType()) {
                 queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y-%m')");
             } else {

huimv-farm/src/main/java/vip/xiaonuo/purchase/service/impl/PurchaseOrderServiceImpl.java

@@ -193,6 +193,7 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
     public List<PurchaseOrderMoneyVo> listOrderMoney(PurchaseOrderParam orderParam) {
         String orgId = orderParam.getOrgId();
         String time = orderParam.getTime();
+        Integer number = orderParam.getNumber();
         QueryWrapper<PurchaseOrder> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId).orderByAsc("create_time");
         queryWrapper.select(" IFNULL(sum(purchase_money),'0') purchaseMoney,create_time createTime,IFNULL(count(*),'0') invoiceNumber");
@@ -200,10 +201,13 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
         List<PurchaseOrderMoneyVo> list = new ArrayList<>();
 
         if ( null == orderParam.getTimeType() || 0==(orderParam.getTimeType())) {
-//            if (StringUtils.isNotBlank(time)) {
-//                String year = time.substring(0, 4);
-//                queryWrapper.between("create_time", year + "-01-01 00:00:00", year + "-12-31 23:59:59");
-//            }
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.YEAR, -3);
+            } else {
+                calendar.add(Calendar.YEAR, -number);
+            }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
             if ("".equals(orderParam.getOrderType()) || null == orderParam.getOrderType()) {
                 queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y')");
             } else {
@@ -224,8 +228,14 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
                 }
             }
         } else {
-//            DateTime dateTime = DateUtil.beginOfYear(new Date());
-//            queryWrapper.ge("create_time", dateTime);
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.MONTH, -13);
+            } else {
+                calendar.add(Calendar.MONTH, -number);
+            }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
+            queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y-%m')");
             if ("".equals(orderParam.getOrderType()) || null == orderParam.getOrderType()) {
                 queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y-%m')");
             } else {

huimv-farm/src/main/java/vip/xiaonuo/purchase/service/impl/PurchasePriceServiceImpl.java

@@ -34,6 +34,7 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
 
     @Override
     public List<PurchasePriceVo> getList(PurchasePriceParam priceParam) {
+        Integer number = priceParam.getNumber();
         QueryWrapper<PurchasePrice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(priceParam.getOrgId()), "org_id", priceParam.getOrgId());
         queryWrapper.eq(StringUtils.isNotBlank(priceParam.getMaterial()), "material", priceParam.getMaterial());
@@ -41,12 +42,14 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
         Integer timeType = priceParam.getTimeType();
         List<PurchasePriceVo> list = new ArrayList<>();
         if (null == timeType || 0 == timeType) {
-            if ("".equals(priceParam.getMaterial()) || null == priceParam.getMaterial()) {
-                queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y')");
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.YEAR, -3);
             } else {
-                queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y')" );
-//                queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y')" + "," + priceParam.getMaterial());
+                calendar.add(Calendar.YEAR, -number);
             }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
+            queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y')");
             List<PurchasePrice> prices = priceMapper.selectList(queryWrapper);
             if (prices.size() != 0) {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
@@ -58,18 +61,20 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
                 }
             }
         } else {
-            queryWrapper.ge("create_time", DateUtil.beginOfYear(new Date()));
-            if ("".equals(priceParam.getMaterial()) || null == priceParam.getMaterial()) {
-                queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y-%m')");
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.MONTH, -13);
             } else {
-                queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y-%m')");
+                calendar.add(Calendar.MONTH, -number);
             }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
+            queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y-%m')");
             QueryWrapper<PurchasePrice> queryWrapper1 = new QueryWrapper<>();
             queryWrapper1.eq(StringUtils.isNotBlank(priceParam.getOrgId()), "org_id", priceParam.getOrgId());
             queryWrapper1.select(" CONVERT(IFNULL(avg(price),'0'),decimal(10,2)) 'price'");
-            Calendar calendar = Calendar.getInstance();
-            calendar.add(Calendar.YEAR, -1);
-            int lastYear = calendar.get(Calendar.YEAR);
+            Calendar calendar1 = Calendar.getInstance();
+            calendar1.add(Calendar.YEAR, -1);
+            int lastYear = calendar1.get(Calendar.YEAR);
             queryWrapper1.between("create_time", lastYear + "-01-01 00:00:00", lastYear + "-12-31 23:59:59");
             PurchasePrice purchasePrice = priceMapper.selectOne(queryWrapper1);
             List<PurchasePrice> prices = priceMapper.selectList(queryWrapper);

huimv-farm/src/main/java/vip/xiaonuo/quality/controller/QualityReagentController.java

@@ -18,6 +18,7 @@ import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.quality.entity.QualityManufacturer;
 import vip.xiaonuo.quality.entity.QualityReagent;
+import vip.xiaonuo.quality.entity.QualityReagentOutStock;
 import vip.xiaonuo.quality.param.QualityFenxibaogaoIdParam;
 import vip.xiaonuo.quality.param.QualityManufacturerParam;
 import vip.xiaonuo.quality.param.QualityReagentParam;
@@ -48,7 +49,7 @@ public class QualityReagentController {
     @ApiOperationSupport(order = 1)
     @ApiOperation("质量试剂使用情况分析")
     @PostMapping("/quality-reagent/getList")
-    public CommonResult<List<QualityReagent>> getList(@RequestBody QualityReagentParam reagentParam) {
+    public CommonResult<List<QualityReagentOutStock>> getList(@RequestBody QualityReagentParam reagentParam) {
         return CommonResult.data(reagentService.getList(reagentParam));
     }
 

huimv-farm/src/main/java/vip/xiaonuo/quality/param/ChengPingZhiParam.java

@@ -46,4 +46,6 @@ public class ChengPingZhiParam {
 
     private String time;
 
+    @ApiModelProperty(value = "月份数或年数")
+    private Integer number;
 }

huimv-farm/src/main/java/vip/xiaonuo/quality/param/QualityReagentParam.java

@@ -35,4 +35,8 @@ public class QualityReagentParam {
 
     @ApiModelProperty(value = "试剂名称", required = true)
     private String produce;
+
+    @ApiModelProperty(value = "月份数或年数", required = true)
+    private Integer number;
+
 }

huimv-farm/src/main/java/vip/xiaonuo/quality/service/IQualityReagentService.java

@@ -3,6 +3,7 @@ package vip.xiaonuo.quality.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import vip.xiaonuo.quality.entity.QualityReagent;
 import com.baomidou.mybatisplus.extension.service.IService;
+import vip.xiaonuo.quality.entity.QualityReagentOutStock;
 import vip.xiaonuo.quality.param.QualityManufacturerParam;
 import vip.xiaonuo.quality.param.QualityReagentParam;
 import vip.xiaonuo.quality.param.vo.ShiJiParam;
@@ -19,7 +20,7 @@ import java.util.List;
  */
 public interface IQualityReagentService extends IService<QualityReagent> {
 
-    List<QualityReagent> getList(QualityReagentParam reagentParam);
+    List<QualityReagentOutStock> getList(QualityReagentParam reagentParam);
 
     Page<QualityReagent> listPage(QualityManufacturerParam manufacturerParam);
 

huimv-farm/src/main/java/vip/xiaonuo/quality/service/impl/QualityFenxibaogaoServiceImpl.java

@@ -38,6 +38,7 @@ import vip.xiaonuo.write.entity.WriteWarning;
 import vip.xiaonuo.write.mapper.WriteThresholdMapper;
 import vip.xiaonuo.write.mapper.WriteWarningMapper;
 
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -165,6 +166,7 @@ public class QualityFenxibaogaoServiceImpl extends ServiceImpl<QualityFenxibaoga
 
         String orgId = chengPingZhiParam.getOrgId();
         Integer type = chengPingZhiParam.getDateType();
+        Integer number = chengPingZhiParam.getNumber();
 
         QueryWrapper<QualityFenxibaogao> wrapper = new QueryWrapper<>();
 
@@ -176,8 +178,22 @@ public class QualityFenxibaogaoServiceImpl extends ServiceImpl<QualityFenxibaoga
                 .orderByAsc("ymonth").groupBy("ymonth");
         List<ChengPinQuXianVo> busAllParams;
         if (ObjectUtil.isEmpty(type) || 0 ==  type){
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.YEAR, -3);
+            } else {
+                calendar.add(Calendar.YEAR, -number);
+            }
+            wrapper.between("report_date", calendar.getTime(), new Date());
             busAllParams= qualityFenxibaogaoMapper.getChengPinQuXianYear(wrapper);
         }else {
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.MONTH, -13);
+            } else {
+                calendar.add(Calendar.MONTH, -number);
+            }
+            wrapper.between("report_date", calendar.getTime(), new Date());
             busAllParams = qualityFenxibaogaoMapper.getChengPinQuXianMonth(wrapper);
 
         }

huimv-farm/src/main/java/vip/xiaonuo/quality/service/impl/QualityReagentServiceImpl.java

@@ -1,14 +1,13 @@
 package vip.xiaonuo.quality.service.impl;
 
-import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
-import vip.xiaonuo.quality.entity.QualityFenxibaogao;
-import vip.xiaonuo.quality.entity.QualityManufacturer;
 import vip.xiaonuo.quality.entity.QualityReagent;
+import vip.xiaonuo.quality.entity.QualityReagentOutStock;
 import vip.xiaonuo.quality.mapper.QualityReagentMapper;
+import vip.xiaonuo.quality.mapper.QualityReagentOutStockMapper;
 import vip.xiaonuo.quality.param.QualityManufacturerParam;
 import vip.xiaonuo.quality.param.QualityReagentParam;
 import vip.xiaonuo.quality.param.vo.ShiJiParam;
@@ -16,6 +15,7 @@ import vip.xiaonuo.quality.service.IQualityReagentService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -32,23 +32,39 @@ public class QualityReagentServiceImpl extends ServiceImpl<QualityReagentMapper,
 
     @Autowired
     private QualityReagentMapper reagentMapper;
+    @Autowired
+    private QualityReagentOutStockMapper outStockMapper;
 
     @Override
-    public List<QualityReagent> getList(QualityReagentParam reagentParam) {
+    public List<QualityReagentOutStock> getList(QualityReagentParam reagentParam) {
         String orgId = reagentParam.getOrgId();
         String produce = reagentParam.getProduce();
         Integer timeType = reagentParam.getTimeType();
-        QueryWrapper<QualityReagent> queryWrapper = new QueryWrapper<>();
+        Integer number = reagentParam.getNumber();
+        QueryWrapper<QualityReagentOutStock> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId);
-        queryWrapper.eq(StringUtils.isNotBlank(produce), "reagent_name", produce);
+        queryWrapper.like(StringUtils.isNotBlank(produce), "reagent", produce);
         if (0 == timeType) {
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.YEAR, -3);
+            } else {
+                calendar.add(Calendar.YEAR, -number);
+            }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
             queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y')");
         } else {
-//            queryWrapper.ge("create_time", DateUtil.beginOfYear(new Date()));
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.MONTH, -13);
+            } else {
+                calendar.add(Calendar.MONTH, -number);
+            }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
             queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y-m')");
         }
         queryWrapper.orderByAsc("create_time");
-        return reagentMapper.selectList(queryWrapper);
+        return outStockMapper.selectList(queryWrapper);
     }
 
     @Override
@@ -65,10 +81,9 @@ public class QualityReagentServiceImpl extends ServiceImpl<QualityReagentMapper,
     public List<QualityReagent> getShiJi(ShiJiParam shiJiParam) {
         QueryWrapper<QualityReagent> wrapper = new QueryWrapper<>();
         wrapper.select("reagent_name ");
-        wrapper.eq(StringUtils.isNotBlank(shiJiParam.getOrgId()),"org_id",shiJiParam.getOrgId()).groupBy("reagent_name");
+        wrapper.eq(StringUtils.isNotBlank(shiJiParam.getOrgId()), "org_id", shiJiParam.getOrgId()).groupBy("reagent_name");
         List<QualityReagent> list = this.list(wrapper);
         return list;
     }
 
-
 }

huimv-farm/src/main/java/vip/xiaonuo/risk/param/RiskSaleParam.java

@@ -33,4 +33,7 @@ public class RiskSaleParam {
     @ApiModelProperty(value = "时间类型 0为本年 1为本月", required = true)
     private Integer timeType;
 
+
+    @ApiModelProperty(value = "月份数或年数", required = true)
+    private Integer number;
 }

huimv-farm/src/main/java/vip/xiaonuo/risk/param/RiskSupplierParam.java

@@ -36,4 +36,7 @@ public class RiskSupplierParam {
     @ApiModelProperty(value = "供应商", required = true)
     private String supplier;
 
+
+    @ApiModelProperty(value = "月份数或年数", required = true)
+    private Integer number;
 }

huimv-farm/src/main/java/vip/xiaonuo/risk/service/impl/RiskSaleServiceImpl.java

@@ -17,6 +17,7 @@ import vip.xiaonuo.sale.mapper.SaleDetailMapper;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -40,12 +41,27 @@ public class RiskSaleServiceImpl extends ServiceImpl<RiskSaleMapper, RiskSale> i
     public List<RiskSale> getList(RiskSaleParam riskSaleParam) {
         String orgId = riskSaleParam.getOrgId();
         Integer timeType = riskSaleParam.getTimeType();
+        Integer number = riskSaleParam.getNumber();
         QueryWrapper<SaleDetail> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId);
         queryWrapper.select(" IFNULL(sum(sale_money),'0') saleMoney,create_time createTime");
         if (1 == timeType) {
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.MONTH, -13);
+            } else {
+                calendar.add(Calendar.MONTH, -number);
+            }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
             queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y-%m')");
         } else {
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.YEAR, -3);
+            } else {
+                calendar.add(Calendar.YEAR, -number);
+            }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
             queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y')");
         }
         queryWrapper.orderByAsc("create_time");

huimv-farm/src/main/java/vip/xiaonuo/risk/service/impl/RiskSupplierServiceImpl.java

@@ -17,10 +17,7 @@ import vip.xiaonuo.risk.service.IRiskSupplierService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -43,13 +40,28 @@ public class RiskSupplierServiceImpl extends ServiceImpl<RiskSupplierMapper, Ris
         String orgId = riskSupplierParam.getOrgId();
         Integer timeType = riskSupplierParam.getTimeType();
         String supplier = riskSupplierParam.getSupplier();
+        Integer number = riskSupplierParam.getNumber();
         QueryWrapper<PurchaseOrder> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId);
         queryWrapper.select(" IFNULL(sum(purchase_money),'0') 'purchaseMoney',create_time createTime");
         queryWrapper.eq(StringUtils.isNotBlank(supplier), "supplier", supplier);
         if (1 == timeType) {
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.MONTH, -13);
+            } else {
+                calendar.add(Calendar.MONTH, -number);
+            }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
             queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y-%m')");
         } else {
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.YEAR, -3);
+            } else {
+                calendar.add(Calendar.YEAR, -number);
+            }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
             queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y')");
         }
         queryWrapper.orderByAsc("create_time");

huimv-farm/src/main/java/vip/xiaonuo/sale/param/SaleDeliverParam.java

@@ -33,5 +33,7 @@ public class SaleDeliverParam {
     @ApiModelProperty(value = "时间 0为年 1为月", required = true)
     private Integer timeType;
 
+    @ApiModelProperty(value = "月份数或年数", required = true)
+    private Integer number;
 
 }

huimv-farm/src/main/java/vip/xiaonuo/sale/param/SaleInvoiceParam.java

@@ -33,5 +33,7 @@ public class SaleInvoiceParam {
     @ApiModelProperty(value = "时间 0为年 1为月", required = true)
     private Integer timeType;
 
+    @ApiModelProperty(value = "月份数或年数", required = true)
+    private Integer number;
 
 }

huimv-farm/src/main/java/vip/xiaonuo/sale/param/SaleOrderParam.java

@@ -33,5 +33,7 @@ public class SaleOrderParam {
     @ApiModelProperty(value = "时间 0为年 1为月", required = true)
     private Integer timeType;
 
+    @ApiModelProperty(value = "月份数或年数", required = true)
+    private Integer number;
 
 }

huimv-farm/src/main/java/vip/xiaonuo/sale/param/SalePriceParam.java

@@ -37,4 +37,6 @@ public class SalePriceParam {
     @ApiModelProperty(value = "产品名称", required = true)
     private String produceName;
 
+    @ApiModelProperty(value = "月份数或年数", required = true)
+    private Integer number;
 }

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

@@ -13,6 +13,8 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -34,11 +36,26 @@ public class SaleDeliverServiceImpl extends ServiceImpl<SaleDeliverMapper, SaleD
         String orgId = deliverParam.getOrgId();
         Integer timeType = deliverParam.getTimeType();
         QueryWrapper<SaleDeliver> queryWrapper = new QueryWrapper<>();
+        Integer number = deliverParam.getNumber();
         queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId);
         queryWrapper.select(" CONVERT(IFNULL(sum(sale_deliver_number),'0'),decimal(10,2)) saleDeliverNumber,create_time createTime,IFNULL(sum(sale_deliver_money),'0') saleDeliverMoney");
         if (0 == timeType) {
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.YEAR, -3);
+            } else {
+                calendar.add(Calendar.YEAR, -number);
+            }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
             queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y')");
         } else {
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.MONTH, -13);
+            } else {
+                calendar.add(Calendar.MONTH, -number);
+            }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
             queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y-%m')");
         }
         queryWrapper.orderByAsc("create_time");

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

@@ -15,6 +15,8 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -35,12 +37,27 @@ public class SaleInvoiceServiceImpl extends ServiceImpl<SaleInvoiceMapper, SaleI
     public List<SaleInvoiceVo> getList(SaleInvoiceParam invoiceParam) {
         String orgId = invoiceParam.getOrgId();
         Integer timeType = invoiceParam.getTimeType();
+        Integer number = invoiceParam.getNumber();
         QueryWrapper<SaleInvoice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId);
         queryWrapper.select(" count(*) saleInvoiceOrder,create_time createTime,IFNULL(sum(sale_invoice_money),'0') saleInvoiceMoney");
         if (0 == timeType) {
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.YEAR, -3);
+            } else {
+                calendar.add(Calendar.YEAR, -number);
+            }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
             queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y')");
         } else {
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.MONTH, -13);
+            } else {
+                calendar.add(Calendar.MONTH, -number);
+            }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
             queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y-%m')");
         }
         queryWrapper.orderByAsc("create_time");

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

@@ -13,6 +13,8 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -34,11 +36,26 @@ public class SaleOrderServiceImpl extends ServiceImpl<SaleOrderMapper, SaleOrder
         String orgId = saleOrderParam.getOrgId();
         Integer timeType = saleOrderParam.getTimeType();
         QueryWrapper<SaleOrder> queryWrapper = new QueryWrapper<>();
+        Integer number = saleOrderParam.getNumber();
         queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId);
         queryWrapper.select(" CONVERT(IFNULL(sum(sale_number),'0'),decimal(10,2)) saleNumber,create_time createTime,IFNULL(sum(sale_money),'0') saleMoney");
         if (0 == timeType) {
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.YEAR, -3);
+            } else {
+                calendar.add(Calendar.YEAR, -number);
+            }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
             queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y')");
         } else {
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.MONTH, -13);
+            } else {
+                calendar.add(Calendar.MONTH, -number);
+            }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
             queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y-%m')");
         }
         queryWrapper.orderByAsc("create_time");

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

@@ -10,6 +10,8 @@ import vip.xiaonuo.sale.service.ISalePriceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -31,12 +33,27 @@ public class SalePriceServiceImpl extends ServiceImpl<SalePriceMapper, SalePrice
         String orgId = priceParam.getOrgId();
         String produceName = priceParam.getProduceName();
         Integer timeType = priceParam.getTimeType();
+        Integer number = priceParam.getNumber();
         QueryWrapper<SalePrice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId).eq(StringUtils.isNotBlank(produceName), "produce_name", produceName);
         queryWrapper.select(" convert(IFNULL(avg(price),'0'),decimal(10,2)) price,create_time createTime");
         if (0 == timeType) {
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.YEAR, -3);
+            } else {
+                calendar.add(Calendar.YEAR, -number);
+            }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
             queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y')");
         } else {
+            Calendar calendar = Calendar.getInstance();
+            if (null == number) {
+                calendar.add(Calendar.MONTH, -13);
+            } else {
+                calendar.add(Calendar.MONTH, -number);
+            }
+            queryWrapper.between("create_time", calendar.getTime(), new Date());
             queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y-%m')");
         }
         queryWrapper.orderByAsc("create_time");