From bb9e5d0e0653cde63c0899e0b69e945accadfab7 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 16 三月 2026 09:55:19 +0800
Subject: [PATCH] 报表数据
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java | 4 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java | 4 ++++
server/system_gateway/src/main/resources/bootstrap.yml | 2 +-
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetInfoVO.java | 3 +++
4 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/server/system_gateway/src/main/resources/bootstrap.yml b/server/system_gateway/src/main/resources/bootstrap.yml
index 3d2cb09..02ca26f 100644
--- a/server/system_gateway/src/main/resources/bootstrap.yml
+++ b/server/system_gateway/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: pro
+ active: dev
application:
name: system_gateway
# 瀹夊叏閰嶇疆
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java
index f8d889a..3aeab35 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java
@@ -151,6 +151,10 @@
@ApiModelProperty(value = "閰掔簿妫�娴嬪紑鍚細0=寮�鍚紱1=鍏抽棴", example = "1")
private Integer alcoholStatus;
+
+ @ApiModelProperty(value = "褰掕繕閽ュ寵鍙岄噸楠岃瘉 0鍚� 1鏄�", example = "1")
+ private Integer returnDoubleAuth;
+
@ApiModelProperty(value = "缁忕含搴︿俊鎭� 鍙傛暟鍊硷細缁忓害,绾害")
@TableField(exist = false)
private String jwd;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetInfoVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetInfoVO.java
index dca9101..57d3c67 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetInfoVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetInfoVO.java
@@ -67,6 +67,9 @@
@ApiModelProperty(value = "閰掔簿妫�娴嬪紑鍚細0=寮�鍚紱1=鍏抽棴", example = "1")
private Integer alcoholStatus;
+ @ApiModelProperty(value = "褰掕繕閽ュ寵鍙岄噸楠岃瘉 0鍚� 1鏄�", example = "1")
+ private Integer returnDoubleAuth;
+
@ApiModelProperty(value = "杞挱鍥惧湴鍧�", example = "1")
private List<String> bannerList;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java
index 98d9ae1..74ede31 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java
@@ -88,6 +88,8 @@
|| Objects.isNull(jkCabinet.getColumnNum())
|| jkCabinet.getColumnNum() <= Constants.ZERO
|| Objects.isNull(jkCabinet.getNoType())
+ || Objects.isNull(jkCabinet.getDoubleAuth())
+ || Objects.isNull(jkCabinet.getReturnDoubleAuth())
|| Objects.isNull(jkCabinet.getSortType())
|| (
Constants.equalsInteger(jkCabinet.getNoType(),Constants.ONE)
@@ -216,6 +218,8 @@
|| Objects.isNull(jkCabinet.getPort())
|| Objects.isNull(jkCabinet.getDoubleAuth())
|| Objects.isNull(jkCabinet.getAlcoholStatus())
+ || Objects.isNull(jkCabinet.getDoubleAuth())
+ || Objects.isNull(jkCabinet.getReturnDoubleAuth())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
--
Gitblit v1.9.3