diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/db/SmartCabinetEntity.java b/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/db/SmartCabinetEntity.java index 99e6433..66f9031 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/db/SmartCabinetEntity.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/db/SmartCabinetEntity.java @@ -83,6 +83,10 @@ public class SmartCabinetEntity extends BaseEntity { @TableField("return_deadline") private Integer returnDeadline; + @ApiModelProperty("企业微信id") + @TableField("corpid") + private String corpid; + @ApiModelProperty("已用格口数") @TableField(exist = false) private Integer usedCells; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/query/SearchSmartCabinetQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/query/SearchSmartCabinetQuery.java index 03a6fdc..d41f3f9 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/query/SearchSmartCabinetQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/query/SearchSmartCabinetQuery.java @@ -18,6 +18,7 @@ public class SearchSmartCabinetQuery extends AbstractPageQuery { private Date endTime; private Long mqttServerId; private Long shopId; + private String corpid; private Integer belongType; private Integer mode; @@ -32,6 +33,7 @@ public class SearchSmartCabinetQuery extends AbstractPageQuery { .eq(cabinetType != null, "sc.cabinet_type", cabinetType) .eq(mqttServerId!= null, "sc.mqtt_server_id", mqttServerId) .eq(shopId!= null, "sc.shop_id", shopId) + .eq(StrUtil.isNotEmpty(corpid), "sc.corpid", corpid) .eq(belongType!= null, "sc.belong_type", belongType) .eq(mode != null, "sc.mode", mode) .eq(balanceEnable != null, "sc.balance_enable", balanceEnable) diff --git a/sql/20251013_cabinet_corpid.sql b/sql/20251013_cabinet_corpid.sql new file mode 100644 index 0000000..cbc0d6c --- /dev/null +++ b/sql/20251013_cabinet_corpid.sql @@ -0,0 +1,2 @@ +-- 为smart_cabinet表添加corpid字段 +ALTER TABLE `smart_cabinet` ADD COLUMN `corpid` varchar(50) DEFAULT NULL COMMENT '企业微信id'; \ No newline at end of file