储量验收-v2.0

unis-plugin/unis-plugin-biz/src/main/java/com/unis/statisticalReport.info/modular/grainReserveInspection/entity/GrainReserveInspection.java

@@ -203,4 +203,8 @@ public class GrainReserveInspection {
     @ApiModelProperty(value = "检验项目及依据", position = 30)
     @TableField(exist = false)
     private List<GrainReserveInspectionItem> granItem;
+
+    @ApiModelProperty(value = "库区名称", position = 31)
+    @TableField(exist = false)
+    private String orgName;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/statisticalReport.info/modular/grainReserveInspection/service/impl/GrainReserveInspectionServiceImpl.java

@@ -61,7 +61,7 @@ public class GrainReserveInspectionServiceImpl extends ServiceImpl<GrainReserveI
         if (ObjectUtils.isNotEmpty(param.getStorehouseName()))
             wrapper.eq("bs.storehouse_name", param.getStorehouseName());
         if (ObjectUtils.isNotEmpty(param.getWarehouseName()))
-            wrapper.eq("bs.storehouse_name", param.getWarehouseName());
+            wrapper.eq("bw.warehouse_name", param.getWarehouseName());
         wrapper.lambda().orderByDesc(GrainReserveInspection::getId);
         return grainReserveInspectionMapper.page(new Page<>(param.getCurrent(), param.getSize()), wrapper);
     }