供应商产能报表调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/controller/SupplierCapacityController.java

@@ -97,7 +97,10 @@ public class SupplierCapacityController extends JeecgController<SupplierCapacity
          queryWrapper.eq("p.cVenCodeType",supplierCapacityDto.getCVenCodeType());//供应商类型cVenCodeType
       }
       if(oConvertUtils.isNotEmpty(supplierCapacityDto.getItemNumber())){//款号
-         queryWrapper.eq("p.cVenCodeType",supplierCapacityDto.getItemNumber());//供应商类型cVenCodeType
+         queryWrapper.eq("p.itemnumber",supplierCapacityDto.getItemNumber());//供应商类型cVenCodeType
+      }
+      if(oConvertUtils.isNotEmpty(supplierCapacityDto.getCDepCode())){//部门
+         queryWrapper.eq("p.cDepCode",supplierCapacityDto.getCDepCode());//部门
       }
      /*if(supplierCapacityDto.getStartDate()!=null&&StringUtils.isNotBlank(supplierCapacityDto.getStartDate().toString())){
          //起始月份
@@ -157,7 +160,10 @@ public class SupplierCapacityController extends JeecgController<SupplierCapacity
          queryWrapper.eq("p.cVenCodeType",supplierCapacityDto.getCVenCodeType());//供应商类型cVenCodeType
       }
       if(oConvertUtils.isNotEmpty(supplierCapacityDto.getItemNumber())){//款号
-         queryWrapper.eq("p.cVenCodeType",supplierCapacityDto.getItemNumber());//供应商类型cVenCodeType
+         queryWrapper.eq("p.itemnumber",supplierCapacityDto.getItemNumber());//供应商类型cVenCodeType
+      }
+      if(oConvertUtils.isNotEmpty(supplierCapacityDto.getCDepCode())){//部门
+         queryWrapper.eq("p.cDepCode",supplierCapacityDto.getCDepCode());//部门
       }
       return super.export("合并导出", SupplierCapacityVo1.class,SupplierCapacityService.excel1(queryWrapper));
    }
@@ -191,7 +197,10 @@ public class SupplierCapacityController extends JeecgController<SupplierCapacity
          queryWrapper.eq("p.cVenCodeType",supplierCapacityDto.getCVenCodeType());//供应商类型cVenCodeType
       }
       if(oConvertUtils.isNotEmpty(supplierCapacityDto.getItemNumber())){//款号
-         queryWrapper.eq("p.cVenCodeType",supplierCapacityDto.getItemNumber());//供应商类型cVenCodeType
+         queryWrapper.eq("p.itemnumber",supplierCapacityDto.getItemNumber());//供应商类型cVenCodeType
+      }
+      if(oConvertUtils.isNotEmpty(supplierCapacityDto.getCDepCode())){//部门
+         queryWrapper.eq("p.cDepCode",supplierCapacityDto.getCDepCode());//部门
       }
       return super.export("月份部门合计导出", SupplierCapacityVo2.class,SupplierCapacityService.excel2(queryWrapper));
    }
@@ -225,7 +234,10 @@ public class SupplierCapacityController extends JeecgController<SupplierCapacity
          queryWrapper.eq("p.cVenCodeType",supplierCapacityDto.getCVenCodeType());//供应商类型cVenCodeType
       }
       if(oConvertUtils.isNotEmpty(supplierCapacityDto.getItemNumber())){//款号
-         queryWrapper.eq("p.cVenCodeType",supplierCapacityDto.getItemNumber());//供应商类型cVenCodeType
+         queryWrapper.eq("p.itemnumber",supplierCapacityDto.getItemNumber());//供应商类型cVenCodeType
+      }
+      if(oConvertUtils.isNotEmpty(supplierCapacityDto.getCDepCode())){//部门
+         queryWrapper.eq("p.cDepCode",supplierCapacityDto.getCDepCode());//部门
       }
       return super.export("月份供应商合计导出", SupplierCapacityVo3.class,SupplierCapacityService.excel3(queryWrapper));
    }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/dto/SupplierCapacityDto.java

@@ -33,6 +33,9 @@ public class SupplierCapacityDto {
     @ApiModelProperty(value = "款号")
     private java.lang.String itemNumber;
 
+    @ApiModelProperty(value = "部门")
+    private String cDepCode;//部门
+
     @ApiModelProperty(value = "供应商类型")
     private String cVenCodeType;//供应商类型
     /*@ApiModelProperty(value = "开始月份")