修复首页统计功能bug

imcs-bt-be/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionresource/ProductionResourceController.java

@@ -86,7 +86,9 @@ public class ProductionResourceController extends SuperController<ProductionTena
         ProductionResource model = BeanUtil.toBean(data, ProductionResource.class);
         QueryWrap<ProductionResource> wrap = this.handlerWrapper(null, params);
         LbqWrapper<ProductionResource> wrapper = wrap.lambda();
-        wrapper.like(ProductionResource::getName, model.getName()).like(ProductionResource::getStatus, model.getStatus()).eq(ProductionResource::getOnlineStatus, model.getOnlineStatus()).eq(ProductionResource::getPlaceId, model.getPlaceId()).orderByDesc(ProductionResource::getCreateTime);
+        wrapper.like(ProductionResource::getName, model.getName()).like(ProductionResource::getStatus, model.getStatus()).eq(ProductionResource::getOnlineStatus, model.getOnlineStatus()).eq(ProductionResource::getPlaceId, model.getPlaceId())
+                .eq(ProductionResource::getAreaId, model.getAreaId())
+                .orderByDesc(ProductionResource::getCreateTime);
         IPage<ProductionResource> iPage = baseService.pageList(page, wrapper);
 
         String date = DateUtil.dateToString(new Date());

imcs-bt-be/imcs-tenant-biz/src/main/java/com/github/zuihou/tenant/service/impl/ProductionresourceServiceImpl.java

@@ -300,11 +300,12 @@ public class ProductionresourceServiceImpl extends SuperCacheServiceImpl<Product
 
         String sql = "INSERT INTO "+tableName+"" +
                 "(id, tenant_id, productionline_id, box_id, type,  module_id, name, code, status, " +
-                "online_status, remark, create_time, create_user, resources_type,ip,port,place_id,org_id,adv_url,img_url)" +
+                "online_status, remark, create_time, create_user, resources_type,ip,port,place_id,org_id,adv_url,area_id, img_url)" +
                 "VALUES("+bean.getId()+", "+bean.getTenantId()+", "+bean.getProductionlineId()+", "+bean.getBoxId()+", '"+bean.getType().getKey()+"'," +
                 "  '"+bean.getModuleId()+"', '"+bean.getName()+"', '"+bean.getCode()+"', '"+bean.getStatus()+"', '"+1+"', " +
                 "'"+bean.getRemark()+"', '"+bean.getCreateTime()+"', "+bean.getCreateUser()+", '"+bean.getResourcesType()+"','"+ip+"'," +
-                "'"+port+"',"+ bean.getPlaceId() +","+bean.getOrgId()+",'"+bean.getAdvUrl()+"','"+ bean.getImgUrl()+ "')";
+                "'"+port+"',"+ bean.getPlaceId() +","+bean.getOrgId()+",'"+bean.getAdvUrl()+"','"+ bean.getAreaId() +"','"+ bean.getImgUrl()+ "')";
+
         baseMapper.createDynTable(sql);
     }
 

imcs-bt-be/imcs-tenant-entity/src/main/java/com/github/zuihou/tenant/dto/ProductionresourceSaveDTO.java

@@ -112,6 +112,9 @@ public class ProductionresourceSaveDTO implements Serializable {
     @ApiModelProperty(value = "场地")
     private Long placeId;
 
+    @ApiModelProperty(value = "县区")
+    private String areaId;
+
     @ApiModelProperty(value = "广告地址")
     private String advUrl;
 

imcs-bt-be/imcs-tenant-entity/src/main/java/com/github/zuihou/tenant/dto/ProductionresourceUpdateDTO.java

@@ -116,6 +116,9 @@ public class ProductionresourceUpdateDTO implements Serializable {
     @ApiModelProperty(value = "场地")
     private Long placeId;
 
+    @ApiModelProperty(value = "县区")
+    private String areaId;
+
     /**
      * 资产编号
      */

imcs-bt-be/imcs-tenant-entity/src/main/java/com/github/zuihou/tenant/entity/Productionresource.java

@@ -148,6 +148,14 @@ public class Productionresource extends Entity<Long> {
     @Excel(name = "场地Id")
     private Long placeId;
 
+    /**
+     * 场地Id
+     */
+    @ApiModelProperty(value = "县区Id")
+    @TableField("area_id")
+    @Excel(name = "县区Id")
+    private String areaId;
+
     /**
      * 资产编号
      */